diff options
| author | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:31:02 +0200 |
|---|---|---|
| committer | Katharina Fey <kookie@spacekookie.de> | 2020-06-04 20:31:02 +0200 |
| commit | cde1ebf6802e12b3ab4b85ae9d2b583c771adae1 (patch) | |
| tree | c74b551183dbcd038a6607949dabb533154129b0 /modules | |
| parent | 48a2759a0556cbaaecf3107f079d258191314812 (diff) | |
workstation: various hardware changes
The yubikey requires a new daemon to run. Not sure why, this should be removed
in the future
Diffstat (limited to 'modules')
| -rw-r--r-- | modules/workstation/hardware/yubikey/default.nix | 2 | ||||
| -rw-r--r-- | modules/workstation/networking/default.nix | 20 | ||||
| -rw-r--r-- | modules/workstation/sound/default.nix | 5 |
3 files changed, 17 insertions, 10 deletions
diff --git a/modules/workstation/hardware/yubikey/default.nix b/modules/workstation/hardware/yubikey/default.nix index 851f9acea39..cebb3b69d7c 100644 --- a/modules/workstation/hardware/yubikey/default.nix +++ b/modules/workstation/hardware/yubikey/default.nix @@ -2,6 +2,8 @@ { services.udev.packages = with pkgs; [ yubikey-personalization ]; + + services.pcscd.enable = true; # FIXME: Can I remove these? # Previously these rules were required to make diff --git a/modules/workstation/networking/default.nix b/modules/workstation/networking/default.nix index 7295a7377ff..2acd41c946d 100644 --- a/modules/workstation/networking/default.nix +++ b/modules/workstation/networking/default.nix @@ -7,17 +7,17 @@ networkmanager = { enable = true; - # Plausible MAC randomization - ethernet.macAddress = "random"; - wifi.macAddress = "random"; - extraConfig = '' - # Integrate networkmanager with resolvd - rc-manager="resolvconf"; + # # Plausible MAC randomization + # ethernet.macAddress = "random"; + # wifi.macAddress = "random"; + # extraConfig = '' + # # Integrate networkmanager with resolvd + # rc-manager="resolvconf"; - [connection-extra] - ethernet.generate-mac-address-mask=FE:FF:FF:00:00:00 - wifi.generate-mac-address-mask=FE:FF:FF:00:00:00 - ''; + # [connection-extra] + # ethernet.generate-mac-address-mask=FE:FF:FF:00:00:00 + # wifi.generate-mac-address-mask=FE:FF:FF:00:00:00 + # ''; }; firewall.enable = true; diff --git a/modules/workstation/sound/default.nix b/modules/workstation/sound/default.nix index 6b456b5136b..37932528c3c 100644 --- a/modules/workstation/sound/default.nix +++ b/modules/workstation/sound/default.nix @@ -2,6 +2,11 @@ { sound.enable = true; + + services.jack.jackd.enable = true; + + environment.systemPackages = [ pkgs.pasystray ]; + hardware.pulseaudio = let bt = config.hardware.bluetooth.enable; in |