summaryrefslogtreecommitdiffstats
path: root/lass/2configs/baseX.nix
diff options
context:
space:
mode:
authorjeschli <jeschli@gmail.com>2018-02-25 16:47:44 +0100
committerjeschli <jeschli@gmail.com>2018-02-25 16:47:44 +0100
commite5b89294d763a2ec2c289f08e4050f7776deacfd (patch)
tree75f1aff22efee3241d2967e3f5f05efd39845868 /lass/2configs/baseX.nix
parent52b846c98b21f19c2a138361191439c487fc87cc (diff)
parent23a7012581e11e73f1dd9ceb5683c7384836a318 (diff)
Merge branch 'master' of prism.r:stockholm into staging/jeschli
Diffstat (limited to 'lass/2configs/baseX.nix')
-rw-r--r--lass/2configs/baseX.nix4
1 files changed, 3 insertions, 1 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 61a006a52..2b7a5c924 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -10,6 +10,7 @@ in {
./livestream.nix
./dns-stuff.nix
./urxvt.nix
+ ./network-manager.nix
{
hardware.pulseaudio = {
enable = true;
@@ -121,13 +122,14 @@ in {
name = "xmonad";
start = ''
${pkgs.xorg.xhost}/bin/xhost +LOCAL:
+ ${pkgs.systemd}/bin/systemctl --user start xmonad
exec ${pkgs.coreutils}/bin/sleep infinity
'';
}];
};
systemd.user.services.xmonad = {
- wantedBy = [ "graphical-session.target" ];
+ #wantedBy = [ "graphical-session.target" ];
environment = {
DISPLAY = ":${toString config.services.xserver.display}";
RXVT_SOCKET = "%t/urxvtd-socket";