diff options
Diffstat (limited to 'makefu/2configs/hw')
-rw-r--r-- | makefu/2configs/hw/bluetooth.nix | 5 | ||||
-rw-r--r-- | makefu/2configs/hw/network-manager.nix | 3 | ||||
-rw-r--r-- | makefu/2configs/hw/smartcard.nix | 7 | ||||
-rw-r--r-- | makefu/2configs/hw/switch.nix | 10 |
4 files changed, 20 insertions, 5 deletions
diff --git a/makefu/2configs/hw/bluetooth.nix b/makefu/2configs/hw/bluetooth.nix index 313ca0147..e556b43c0 100644 --- a/makefu/2configs/hw/bluetooth.nix +++ b/makefu/2configs/hw/bluetooth.nix @@ -1,9 +1,7 @@ { pkgs, ... }: { # bluetooth+pulse config # for blueman-applet - users.users.makefu.packages = [ - pkgs.blueman - ]; + users.users.makefu.packages = [ pkgs.blueman ]; hardware.pulseaudio = { enable = true; package = pkgs.pulseaudioFull; @@ -39,4 +37,5 @@ Enable=Source,Sink,Media,Socket ''; }; + services.dbus.packages = [ pkgs.blueman ]; } diff --git a/makefu/2configs/hw/network-manager.nix b/makefu/2configs/hw/network-manager.nix index ffc32e0cb..3b9d04549 100644 --- a/makefu/2configs/hw/network-manager.nix +++ b/makefu/2configs/hw/network-manager.nix @@ -27,4 +27,7 @@ powersave = true; scanRandMacAddress = true; }; + state = [ + "/etc/NetworkManager/system-connections" #NM stateful config files + ]; } diff --git a/makefu/2configs/hw/smartcard.nix b/makefu/2configs/hw/smartcard.nix index 1e9bca53b..b66b70098 100644 --- a/makefu/2configs/hw/smartcard.nix +++ b/makefu/2configs/hw/smartcard.nix @@ -2,12 +2,15 @@ { services.pcscd = { enable = true; - plugins = with pkgs; [ ifdnfc ccid ]; + plugins = with pkgs; + [ #ifdnfc + ccid + ]; }; environment.systemPackages = with pkgs; [ # need to run ifdnfc-activate before usage - ifdnfc + # ifdnfc # pcsc_scan pcsctools ]; diff --git a/makefu/2configs/hw/switch.nix b/makefu/2configs/hw/switch.nix new file mode 100644 index 000000000..d46e8cf3f --- /dev/null +++ b/makefu/2configs/hw/switch.nix @@ -0,0 +1,10 @@ +{ config, lib, pkgs, ... }: + +{ + + users.extraUsers.${config.krebs.build.user.name}.extraGroups = [ "plugdev" ]; + + services.udev.extraRules = '' + SUBSYSTEM=="usb", ATTR{idVendor}=="0955", MODE="0664", GROUP="plugdev" + ''; +} |