diff options
| author | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
|---|---|---|
| committer | tv <tv@krebsco.de> | 2016-06-30 16:31:05 +0200 |
| commit | d81b068113325fb7604089c3647c365a41804978 (patch) | |
| tree | 4c43ad2142825ac7c0a7045e5c48a039b25f6786 /lass/2configs/baseX.nix | |
| parent | 1542f9bbee823025f703e6abf3836905cee416fd (diff) | |
| parent | f12578c66f8b7b829c0dec5255f358778c0d3366 (diff) | |
Merge remote-tracking branch 'prism/master'
Diffstat (limited to 'lass/2configs/baseX.nix')
| -rw-r--r-- | lass/2configs/baseX.nix | 13 |
1 files changed, 8 insertions, 5 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix index 16f7502ac..6d26ff89a 100644 --- a/lass/2configs/baseX.nix +++ b/lass/2configs/baseX.nix @@ -8,7 +8,13 @@ in { #./urxvt.nix ./xserver ./mpv.nix + #./pulse.nix + ./power-action.nix ]; + hardware.pulseaudio = { + enable = true; + systemWide = true; + }; users.extraUsers.mainUser.extraGroups = [ "audio" ]; @@ -16,11 +22,6 @@ in { virtualisation.libvirtd.enable = true; - hardware.pulseaudio = { - enable = true; - systemWide = true; - }; - programs.ssh.startAgent = false; security.setuidPrograms = [ "slock" ]; @@ -32,6 +33,7 @@ in { environment.systemPackages = with pkgs; [ + acpi dmenu gitAndTools.qgit lm_sensors @@ -44,6 +46,7 @@ in { sxiv xclip xorg.xbacklight + xorg.xhost xsel zathura |