diff options
| author | tv <tv@krebsco.de> | 2018-11-10 19:52:37 +0100 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2018-11-10 19:52:37 +0100 |
| commit | 5ea1c2fcbb5756ef99d5fade8a7cd9e33b04a0c6 (patch) | |
| tree | f6edbd9d1ff68773f413065a1f1c5dd71150be1a /makefu/2configs/hw | |
| parent | 9a801fa642a60a2c46240670b4e3ad66ea77d995 (diff) | |
| parent | 05b288604e7e653efb6035b9953aa849e6e6bc19 (diff) | |
Merge remote-tracking branch 'prism/master'
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/switch.nix | 10 |
3 files changed, 15 insertions, 3 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/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" + ''; +} |