4 files changed, 17 insertions, 8 deletions
diff --git a/home/nipsy/common/optional/desktops/i3/default.nix b/home/nipsy/common/optional/desktops/i3/default.nix
index 2f2b7a0..3371011 100644
--- a/home/nipsy/common/optional/desktops/i3/default.nix
+++ b/home/nipsy/common/optional/desktops/i3/default.nix
@@ -83,14 +83,6 @@
       defaultWorkspace = "workspace number 1";
       modifier = "Mod4";
       keybindings = lib.mkOptionDefault {
-        lib.mkMerge [
-          (lib.mkIf ((builtins.match "^(kaitain|richese)$" config.networking.hostName) != null) {
-            "${modifier}+Return" = "exec st";
-          })
-          (lib.mkIf (config.networking.hostName == "ginaz") {
-            "${modifier}+Return" = "exec ghostty";
-          })
-        ];
         "${modifier}+Shift+e" = "exec ${pkgs.i3}/bin/i3-msg exit";
         "${modifier}+Shift+v" = ''mode "VNC"'';
       };
diff --git a/home/nipsy/ginaz.nix b/home/nipsy/ginaz.nix
index fb3ac3b..918a988 100644
--- a/home/nipsy/ginaz.nix
+++ b/home/nipsy/ginaz.nix
@@ -34,5 +34,10 @@
       xrandr --output eDP --primary --scale 0.5
       xinput set-prop "ELAN06FA:00 04F3:3202 Touchpad" "libinput Middle Emulation Enabled" 0
     '';
+    windowManager.i3.config.keybindings = let
+      modifier = config.xsession.windowManager.i3.config.modifier;
+    in lib.mkOptionDefault {
+      "${modifier}+Return" = "exec ghostty";
+    };
   };
 }
diff --git a/home/nipsy/kaitain.nix b/home/nipsy/kaitain.nix
index 0cc9556..cffa32f 100644
--- a/home/nipsy/kaitain.nix
+++ b/home/nipsy/kaitain.nix
@@ -24,4 +24,10 @@
       application/pdf; pdftotext '%s' -; copiousoutput; description=Adobe Portable Document Format
     '';
   };
+
+  xsession.windowManager.i3.config.keybindings = let
+    modifier = config.xsession.windowManager.i3.config.modifier;
+  in lib.mkOptionDefault {
+    "${modifier}+Return" = "exec st";
+  };
 }
diff --git a/home/nipsy/richese.nix b/home/nipsy/richese.nix
index 386b9aa..7f73858 100644
--- a/home/nipsy/richese.nix
+++ b/home/nipsy/richese.nix
@@ -19,4 +19,10 @@
       pipelining=True
     '';
   };
+
+  xsession.windowManager.i3.config.keybindings = let
+    modifier = config.xsession.windowManager.i3.config.modifier;
+  in lib.mkOptionDefault {
+    "${modifier}+Return" = "exec st";
+  };
 }