4 files changed, 37 insertions, 10 deletions
diff --git a/lass/2configs/baseX.nix b/lass/2configs/baseX.nix
index 65e8f15a4..5cb7eb03f 100644
--- a/lass/2configs/baseX.nix
+++ b/lass/2configs/baseX.nix
@@ -106,15 +106,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;
 }
diff --git a/lass/2configs/copyq.nix b/lass/2configs/copyq.nix
index cd10313fc..56c091a6e 100644
--- a/lass/2configs/copyq.nix
+++ b/lass/2configs/copyq.nix
@@ -19,9 +19,9 @@ let
     ${pkgs.copyq}/bin/copyq config text_wrap true
   '';
 in {
-  systemd.services.copyq = {
-    wantedBy = [ "multi-user.target" ];
-    requires = [ "xserver.service" ];
+  systemd.user.services.copyq = {
+    wantedBy = [ "graphical-session.target" ];
+    requires = [ "xmonad.service" ];
     environment = {
       DISPLAY = ":${toString config.services.xserver.display}";
     };
@@ -35,7 +35,6 @@ in {
       Restart = "always";
       RestartSec = "15s";
       StartLimitBurst = 0;
-      User = "lass";
     };
   };
 }
diff --git a/lass/2configs/git.nix b/lass/2configs/git.nix
index 4a2199b39..59c0f5220 100644
--- a/lass/2configs/git.nix
+++ b/lass/2configs/git.nix
@@ -79,7 +79,7 @@ let
         nick = config.krebs.build.host.name;
         channel = "#xxx";
         server = "irc.r";
-        verbose = config.krebs.build.host.name == "prism";
+        verbose = false;
         # TODO define branches in some kind of option per repo
         branches = [ "master" "staging*" ];
       };
@@ -100,7 +100,7 @@ let
         nick = config.krebs.build.host.name;
         channel = "#xxx";
         server = "irc.r";
-        verbose = true;
+        verbose = false;
         # TODO define branches in some kind of option per repo
         branches = [ "master" "staging*" ];
       };
diff --git a/lass/2configs/zsh.nix b/lass/2configs/zsh.nix
index 728c0cc0d..7b0ef79f3 100644
--- a/lass/2configs/zsh.nix
+++ b/lass/2configs/zsh.nix
@@ -1,5 +1,6 @@
 { config, lib, pkgs, ... }:
 {
+  environment.systemPackages = [ pkgs.fzf ];
   programs.zsh = {
     enable = true;
     shellInit = ''
@@ -37,6 +38,10 @@
       zle -N edit-command-line
       bindkey "^X^E" edit-command-line
 
+      #fzf inclusion
+      source ${pkgs.fzf}/share/fzf/completion.zsh
+      source ${pkgs.fzf}/share/fzf/key-bindings.zsh
+
       #completion magic
       autoload -Uz compinit
       compinit
@@ -52,8 +57,6 @@
         sha256="05lh5w3bgj9h8d8lrbbwbzw8788709cnzzkl8yh7m1dawkpf6nlp";
       }}/LS_COLORS)
 
-      # export MANPAGER='sed -r "s/\x1B\[([0-9]{1,2}(;[0-9]{1,2})?)?[m|K]//g" | vim -R -c "set ft=man nonu nomod nolist" -'
-
       #beautiful colors
       alias ls='ls --color'
       # zstyle ':completion:*:default' list-colors ''${(s.:.)LS_COLORS}