Merge remote-tracking branch 'prism/master'

1 files changed, 30 insertions, 2 deletions

diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 59ea0ecb7..5ca024574 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -53,6 +53,7 @@ in {
 
   time.timeZone = "Europe/Berlin";
 
+  programs.ssh.agentTimeout = "10m";
   programs.ssh.startAgent = true;
   services.openssh.forwardX11 = true;
 
@@ -85,6 +86,8 @@ in {
     screengrab
     slock
     sxiv
+    timewarrior
+    taskwarrior
     termite
     xclip
     xorg.xbacklight
@@ -104,15 +107,40 @@ in {
     xlibs.fontschumachermisc
   ];
 
-  lass.xserver.enable = true;
+  #lass.xserver.enable = true;
   services.xserver = {
+    enable = true;
     layout = "us";
+    display = mkForce 0;
     xkbModel = "evdev";
     xkbVariant = "altgr-intl";
     xkbOptions = "caps:backspace";
+    displayManager.lightdm.enable = true;
+    windowManager.default = "xmonad";
+    windowManager.session = [{
+      name = "xmonad";
+      start = ''
+        ${pkgs.xorg.xhost}/bin/xhost +LOCAL:
+        ${pkgs.coreutils}/bin/sleep infinity
+      '';
+    }];
+  };
+
+  systemd.user.services.xmonad = {
+    wantedBy = [ "graphical-session.target" ];
+    environment = {
+      DISPLAY = ":${toString config.services.xserver.display}";
+      RXVT_SOCKET = "%t/urxvtd-socket";
+      XMONAD_DATA_DIR = "/tmp";
+    };
+    serviceConfig = {
+      SyslogIdentifier = "xmonad";
+      ExecStart = "${pkgs.xmonad-lass}/bin/xmonad";
+      ExecStop = "${pkgs.xmonad-lass}/bin/xmonad --shutdown";
+    };
+    restartIfChanged = false;
   };
 
-  services.urxvtd.enable = true;
   krebs.xresources.enable = true;
   lass.screenlock.enable = true;
 }