From b38c627677c4e37eb1c78605cfaec22bd0d02527 Mon Sep 17 00:00:00 2001
From: Valentin Brandl <mail@vbrandl.net>
Date: Fri, 29 Dec 2023 12:10:36 +0100
Subject: [PATCH] Enable xsession

---
 home/i3.nix | 233 ++++++++++++++++++++++++++--------------------------
 1 file changed, 118 insertions(+), 115 deletions(-)

diff --git a/home/i3.nix b/home/i3.nix
index 4d0ab89..fff3574 100644
--- a/home/i3.nix
+++ b/home/i3.nix
@@ -30,34 +30,36 @@ in {
   home.packages = with pkgs; [
     i3lock-fancy-rapid
   ];
-  xsession.windowManager.i3 = {
+  xsession = {
     enable = true;
-    # package = pkgs.i3-gaps;
-    config = {
-      modifier = mod;
+    windowManager.i3 = {
+      enable = true;
+# package = pkgs.i3-gaps;
+      config = {
+        modifier = mod;
 
-      workspaceAutoBackAndForth = true;
+        workspaceAutoBackAndForth = true;
 
-      fonts = {
-        names = [ "NotoSans-Regular" "FontAwesome" ];
-        style = "Monospace";
-        size = 12.0;
-      };
+        fonts = {
+          names = [ "NotoSans-Regular" "FontAwesome" ];
+          style = "Monospace";
+          size = 12.0;
+        };
 
-      assigns = {
-        "${ws1}" = [
+        assigns = {
+          "${ws1}" = [
           { class = "^Firefox$"; }
           { class = "firefox"; }
           { class = "Firefox"; }
-        ];
-        "${ws4}" = [{ class="Pidgin"; }];
-        "${ws5}" = [{ class="Thunar"; }];
-        "${ws6}" = [{ class="libreoffice-startcenter"; }];
-        "${ws7}" = [{ class="Thunderbird"; }];
-      };
+          ];
+          "${ws4}" = [{ class="Pidgin"; }];
+          "${ws5}" = [{ class="Thunar"; }];
+          "${ws6}" = [{ class="libreoffice-startcenter"; }];
+          "${ws7}" = [{ class="Thunderbird"; }];
+        };
 
-      floating = {
-        criteria = [
+        floating = {
+          criteria = [
           { window_role = "pop-up"; }
           { window_role = "task_dialog"; }
           { title = "Preferences$"; }
@@ -66,106 +68,107 @@ in {
           { class = "KeePassXC"; }
           { class = "^Pavucontrol$"; }
           { class = "^Pinentry-gtk-2$"; }
-        ];
-      };
-
-      terminal = "alacritty";
-
-      keybindings = lib.mkOptionDefault {
-        "${mod}+Shift+q" = "kill";
-        "${mod}+h" = "focus left";
-        "${mod}+j" = "focus down";
-        "${mod}+k" = "focus up";
-        "${mod}+l" = "focus right";
-        "${mod}+Left" = "focus left";
-        "${mod}+Down" = "focus down";
-        "${mod}+Up" = "focus up";
-        "${mod}+Right" = "focus right";
-        "${mod}+Shift+h" = "move left";
-        "${mod}+Shift+j" = "move down";
-        "${mod}+Shift+k" = "move up";
-        "${mod}+Shift+l" = "move right";
-        "${mod}+Shift+Left" = "move left";
-        "${mod}+Shift+Down" = "move down";
-        "${mod}+Shift+Up" = "move up";
-        "${mod}+Shift+Right" = "move right";
-        "${mod}+b" = "split h";
-        "${mod}+v" = "split v";
-        "${mod}+s" = "layout stacking";
-        "${mod}+w" = "layout tabbed";
-        "${mod}+e" = "layout toggle split";
-        "${mod}+Shift+space" = "floating toggle";
-        "${mod}+space" = "focus mode_toggle";
-        "${mod}+a" = "focus parent";
-        "${mod}+d" = "exec rofi -show drun";
-        "${mod}+Tab" = "exec rofi -show window";
-
-        "${mod}+1" = "workspace ${ws1}";
-        "${mod}+2" = "workspace ${ws2}";
-        "${mod}+3" = "workspace ${ws3}";
-        "${mod}+4" = "workspace ${ws4}; layout tabbed";
-        "${mod}+5" = "workspace ${ws5}";
-        "${mod}+6" = "workspace ${ws6}";
-        "${mod}+7" = "workspace ${ws7}; layout tabbed";
-        "${mod}+8" = "workspace ${ws8}";
-        "${mod}+9" = "workspace ${ws9}";
-        "${mod}+0" = "workspace ${ws10}";
-        "${mod}+Shift+1" = "move container to workspace ${ws1}";
-        "${mod}+Shift+2" = "move container to workspace ${ws2}";
-        "${mod}+Shift+3" = "move container to workspace ${ws3}";
-        "${mod}+Shift+4" = "move container to workspace ${ws4}";
-        "${mod}+Shift+5" = "move container to workspace ${ws5}";
-        "${mod}+Shift+6" = "move container to workspace ${ws6}";
-        "${mod}+Shift+7" = "move container to workspace ${ws7}";
-        "${mod}+Shift+8" = "move container to workspace ${ws8}";
-        "${mod}+Shift+9" = "move container to workspace ${ws9}";
-        "${mod}+Shift+0" = "move container to workspace ${ws10}";
-
-        "${mod}+Shift+c" = "reload";
-        "${mod}+Shift+r" = "restart";
-        "${mod}+Shift+e" = "exec \"i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'\"";
-
-        "${mod}+r" = "mode \"resize\"";
-        "${mod}+x" = "mode \"${mode_system}\"";
-
-        "${mod}+Shift+x" = "exec i3lock-fancy-rapid 5 3";
-      };
-
-      modes = {
-        resize = {
-          h = "resize shrink width 10 px or 10 ppt";
-          j = "resize grow height 10 px or 10 ppt";
-          k = "resize shrink height 10 px or 10 ppt";
-          l = "resize grow width 10 px or 10 ppt";
-
-          Left = "resize shrink width 10 px or 10 ppt";
-          Down = "resize grow height 10 px or 10 ppt";
-          Up = "resize shrink height 10 px or 10 ppt";
-          Right = "resize grow width 10 px or 10 ppt";
-
-          Return = "mode \"default\"";
-          Escape = "mode \"default\"";
+          ];
         };
-        "${mode_system}" = {
-          l = "exec ~/bin/lock.sh, mode \"default\"";
-          s = "exec $Lock systemctl suspend, mode \"default\"";
-          p = "exec systemctl poweroff -i, mode \"default\"";
-          r = "exec systemctl reboot, mode \"default\"";
-          e = "exec i3-msg exit, mode \"default\"";
 
-          # back to normal: Enter or Escape or mod+x again
-          Return = "mode \"default\"";
-          Escape = "mode \"default\"";
-          "${mod}+x" = "mode \"default\"";
+        terminal = "alacritty";
+
+        keybindings = lib.mkOptionDefault {
+          "${mod}+Shift+q" = "kill";
+          "${mod}+h" = "focus left";
+          "${mod}+j" = "focus down";
+          "${mod}+k" = "focus up";
+          "${mod}+l" = "focus right";
+          "${mod}+Left" = "focus left";
+          "${mod}+Down" = "focus down";
+          "${mod}+Up" = "focus up";
+          "${mod}+Right" = "focus right";
+          "${mod}+Shift+h" = "move left";
+          "${mod}+Shift+j" = "move down";
+          "${mod}+Shift+k" = "move up";
+          "${mod}+Shift+l" = "move right";
+          "${mod}+Shift+Left" = "move left";
+          "${mod}+Shift+Down" = "move down";
+          "${mod}+Shift+Up" = "move up";
+          "${mod}+Shift+Right" = "move right";
+          "${mod}+b" = "split h";
+          "${mod}+v" = "split v";
+          "${mod}+s" = "layout stacking";
+          "${mod}+w" = "layout tabbed";
+          "${mod}+e" = "layout toggle split";
+          "${mod}+Shift+space" = "floating toggle";
+          "${mod}+space" = "focus mode_toggle";
+          "${mod}+a" = "focus parent";
+          "${mod}+d" = "exec rofi -show drun";
+          "${mod}+Tab" = "exec rofi -show window";
+
+          "${mod}+1" = "workspace ${ws1}";
+          "${mod}+2" = "workspace ${ws2}";
+          "${mod}+3" = "workspace ${ws3}";
+          "${mod}+4" = "workspace ${ws4}; layout tabbed";
+          "${mod}+5" = "workspace ${ws5}";
+          "${mod}+6" = "workspace ${ws6}";
+          "${mod}+7" = "workspace ${ws7}; layout tabbed";
+          "${mod}+8" = "workspace ${ws8}";
+          "${mod}+9" = "workspace ${ws9}";
+          "${mod}+0" = "workspace ${ws10}";
+          "${mod}+Shift+1" = "move container to workspace ${ws1}";
+          "${mod}+Shift+2" = "move container to workspace ${ws2}";
+          "${mod}+Shift+3" = "move container to workspace ${ws3}";
+          "${mod}+Shift+4" = "move container to workspace ${ws4}";
+          "${mod}+Shift+5" = "move container to workspace ${ws5}";
+          "${mod}+Shift+6" = "move container to workspace ${ws6}";
+          "${mod}+Shift+7" = "move container to workspace ${ws7}";
+          "${mod}+Shift+8" = "move container to workspace ${ws8}";
+          "${mod}+Shift+9" = "move container to workspace ${ws9}";
+          "${mod}+Shift+0" = "move container to workspace ${ws10}";
+
+          "${mod}+Shift+c" = "reload";
+          "${mod}+Shift+r" = "restart";
+          "${mod}+Shift+e" = "exec \"i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'\"";
+
+          "${mod}+r" = "mode \"resize\"";
+          "${mod}+x" = "mode \"${mode_system}\"";
+
+          "${mod}+Shift+x" = "exec i3lock-fancy-rapid 5 3";
+        };
+
+        modes = {
+          resize = {
+            h = "resize shrink width 10 px or 10 ppt";
+            j = "resize grow height 10 px or 10 ppt";
+            k = "resize shrink height 10 px or 10 ppt";
+            l = "resize grow width 10 px or 10 ppt";
+
+            Left = "resize shrink width 10 px or 10 ppt";
+            Down = "resize grow height 10 px or 10 ppt";
+            Up = "resize shrink height 10 px or 10 ppt";
+            Right = "resize grow width 10 px or 10 ppt";
+
+            Return = "mode \"default\"";
+            Escape = "mode \"default\"";
+          };
+          "${mode_system}" = {
+            l = "exec ~/bin/lock.sh, mode \"default\"";
+            s = "exec $Lock systemctl suspend, mode \"default\"";
+            p = "exec systemctl poweroff -i, mode \"default\"";
+            r = "exec systemctl reboot, mode \"default\"";
+            e = "exec i3-msg exit, mode \"default\"";
+
+# back to normal: Enter or Escape or mod+x again
+            Return = "mode \"default\"";
+            Escape = "mode \"default\"";
+            "${mod}+x" = "mode \"default\"";
+          };
+        };
+        window = {
+          hideEdgeBorders = "both";
+# disable titlebar
+          titlebar = false;
         };
       };
-      window = {
-        hideEdgeBorders = "both";
-        # disable titlebar
-        titlebar = false;
-      };
+
     };
-
   };
 }