age + other various changes

3 files changed, 56 insertions, 47 deletions

diff --git a/modules/desktop/hjem/programs/research.nix b/modules/desktop/hjem/programs/research.nix
index 1d31479..1646e0c 100644
--- a/modules/desktop/hjem/programs/research.nix
+++ b/modules/desktop/hjem/programs/research.nix
@@ -24,50 +24,53 @@ in
         };
       };
 
-      ".config/zathura/zathurarc".text = lib.mkIf (config.collinux.theme == "adwaita") ''
-        set font "Iosevka Nerd Font 11.5"
+      ".config/zathura/zathurarc".text =
+        if (config.collinux.theme == "adwaita")
+        then ''
+          set font "Iosevka Nerd Font 11.5"
 
-        set recolor 'true'
-        set recolor-keephue 'false'
-        set recolor-reverse-video 'false'
+          set recolor 'true'
+          set recolor-keephue 'false'
+          set recolor-reverse-video 'false'
 
-        # flipped to make dark mode
-        set recolor-lightcolor rgba(0,0,0,0)
-        set recolor-darkcolor '#DEDDDA'
+          # flipped to make dark mode
+          set recolor-lightcolor rgba(0,0,0,0)
+          set recolor-darkcolor '#DEDDDA'
 
-        set completion-fg '#DEDDDA'
-        set completion-bg '#303030'
-        set completion-group-fg '#33B2A4'
-        set completion-group-bg '#303030'
-        set completion-highlight-fg '#303030'
-        set completion-highlight-bg '#DEDDDA'
+          set completion-fg '#DEDDDA'
+          set completion-bg '#303030'
+          set completion-group-fg '#33B2A4'
+          set completion-group-bg '#303030'
+          set completion-highlight-fg '#303030'
+          set completion-highlight-bg '#DEDDDA'
 
-        set default-fg '#DEDDDA'
-        set default-bg rgba(29,29,29,0.6)
+          set default-fg '#DEDDDA'
+          set default-bg rgba(29,29,29,0.6)
 
-        set inputbar-fg '#DEDDDA'
-        set inputbar-bg '#303030'
+          set inputbar-fg '#DEDDDA'
+          set inputbar-bg '#303030'
 
-        set notification-fg '#DEDDDA'
-        set notification-bg '#303030'
-        set notification-error-fg '#DEDDDA'
-        set notification-error-bg '#E01B24'
-        set notification-warning-fg '#DEDDDA'
-        set notification-warning-bg '#E01B24'
+          set notification-fg '#DEDDDA'
+          set notification-bg '#303030'
+          set notification-error-fg '#DEDDDA'
+          set notification-error-bg '#E01B24'
+          set notification-warning-fg '#DEDDDA'
+          set notification-warning-bg '#E01B24'
 
-        set statusbar-fg '#DEDDDA'
-        set statusbar-bg '#303030'
+          set statusbar-fg '#DEDDDA'
+          set statusbar-bg '#303030'
 
-        set highlight-color '#33B2A4'
-        set highlight-active-color '#33B2A4'
+          set highlight-color '#33B2A4'
+          set highlight-active-color '#33B2A4'
 
-        set render-loading-fg '#DEDDDA'
-        set render-loading-bg '#303030'
+          set render-loading-fg '#DEDDDA'
+          set render-loading-bg '#303030'
 
-        set index-fg '#DEDDDA'
-        set index-bg '#303030'
-        set index-active-fg '#303030'
-        set index-active-bg '#DEDDDA'
-      '';
+          set index-fg '#DEDDDA'
+          set index-bg '#303030'
+          set index-active-fg '#303030'
+          set index-active-bg '#DEDDDA'
+        ''
+        else "";
     };
   }
diff --git a/modules/desktop/hjem/wm/fuzzel.nix b/modules/desktop/hjem/wm/fuzzel.nix
index ab11d6b..7d61255 100644
--- a/modules/desktop/hjem/wm/fuzzel.nix
+++ b/modules/desktop/hjem/wm/fuzzel.nix
@@ -30,8 +30,8 @@
       input = base05;
       match = base13;
       placeholder = base03;
-      text = base04;
-      prompt = base04;
+      text = base01;
+      prompt = base01;
 
       selection = "${base01}5a";
       selection-match = base13;
diff --git a/modules/desktop/hjem/wm/niri.nix b/modules/desktop/hjem/wm/niri.nix
index 4449f82..c6826af 100644
--- a/modules/desktop/hjem/wm/niri.nix
+++ b/modules/desktop/hjem/wm/niri.nix
@@ -23,6 +23,12 @@ in
 
       input {
         focus-follows-mouse
+
+        keyboard {
+          xkb {
+            options "caps:none"
+          }
+        }
       }
 
       hotkey-overlay {
@@ -31,13 +37,13 @@ in
       }
 
       binds {
-        Mod+Q { close-window; }
-
-        Mod+Space { spawn "fuzzel"; }
-        Mod+Return { spawn "foot"; }
-        Mod+B { spawn "firefox"; }
+        Mod+Space repeat=false { spawn "fuzzel"; }
+        Mod+Return repeat=false { spawn "foot"; }
+        Mod+B repeat=false { spawn "firefox"; }
 
-        Mod+m { maximize-column; }
+        Mod+Q repeat=false { close-window; }
+        Mod+S repeat=false { screenshot; }
+        Mod+M repeat=false { maximize-column; }
 
         XF86MonBrightnessUp { spawn "~/.config/util.lua" "brightness" "5%+"; }
         XF86MonBrightnessDown { spawn "~/.config/util.lua" "brightness" "5%-"; }
@@ -73,10 +79,10 @@ in
         }
 
         struts {
-          left 16
-          right 16
-          top 16
-          bottom 16
+          left 0
+          right 0
+          top 0
+          bottom 0
         }
 
         background-color "transparent"