...

2 files changed, 12 insertions, 60 deletions

diff --git a/accounts/gkleen@sif/default.nix b/accounts/gkleen@sif/default.nix
index 99c950a8..68d5540d 100644
--- a/accounts/gkleen@sif/default.nix
+++ b/accounts/gkleen@sif/default.nix
@@ -326,33 +326,6 @@ in {
           };
         };
 
-        kitty = {
-          enable = true;
-          font = {
-            package = pkgs.nerd-fonts.fira-mono;
-            name = "Fira Mono";
-            size = 10;
-          };
-          settings = {
-            scrollback_pager_history_size = 50;
-            # background_opacity = "0.9";
-            enable_audio_bell = false;
-            update_check_interval = 0;
-            strip_trailing_spaces = "smart";
-            focus_follows_mouse = true;
-            visual_bell_duration = "0.1";
-            visual_bell_color = "#26240d";
-            tab_bar_style = "powerline";
-            tab_powerline_style = "slanted";
-            # notify_on_cmd_finish = "invisible 120";
-          };
-          keybindings = {
-            "kitty_mod+n" = "new_os_window_with_cwd";
-            "kitty_mod+m" = "detach_window ask";
-            "kitty_mod+enter" = "new_window_with_cwd";
-            "kitty_mod+t" = "new_tab_with_cwd";
-          };
-        };
         alacritty = {
           enable = true;
           theme = "kitty";
@@ -364,6 +337,8 @@ in {
               };
               size = 10;
             };
+            hints.alphabet = "aoeuhtns";
+            terminal.shell.program = lib.getExe cfg.programs.zsh.package;
           };
         };
         fuzzel = {
diff --git a/accounts/gkleen@sif/niri.nix b/accounts/gkleen@sif/niri.nix
index 7fb5b0c6..5f10408d 100644
--- a/accounts/gkleen@sif/niri.nix
+++ b/accounts/gkleen@sif/niri.nix
@@ -656,9 +656,8 @@ in {
             (plain "default-column-width" [(sleaf "proportion" (2. / 3.))])
           ])
           (plain "window-rule" [
-            (sleaf "match" { app-id = "^kitty$"; })
             (sleaf "match" { app-id = "^Alacritty$"; })
-            (sleaf "match" { app-id = "^(kitty|Alacritty)-play$"; })
+            (sleaf "match" { app-id = "^Alacritty-play$"; })
             (plain "default-column-width" [(sleaf "proportion" (1. / 3.))])
           ])
 
@@ -679,7 +678,7 @@ in {
             (plain "default-column-width" [(sleaf "proportion" 1.)])
           ])
           (plain "window-rule" [
-            (sleaf "match" { app-id = "^(kitty|Alacritty)-play$"; })
+            (sleaf "match" { app-id = "^Alacritty-play$"; })
             (sleaf "open-on-workspace" "vid")
             (sleaf "open-focused" false)
           ])
@@ -757,21 +756,10 @@ in {
                   "Mod+Slash".action = show-hotkey-overlay;
 
                   "Mod+Return".action = spawn (spawnTerminal {});
-                  "Mod+Shift+Return".action =
-                    let
-                      nushellKitty = pkgs.symlinkJoin {
-                        name = "nushell-kitty";
-                        paths = [ config.programs.kitty.package ];
-                        buildInputs = [ pkgs.makeWrapper ];
-                        postBuild = ''
-                          wrapProgram $out/bin/kitty \
-                            --add-flags "--config ${pkgs.writeText "kitty.conf" ''
-                              include $HOME/${config.xdg.configFile."kitty/kitty.conf".target}
-                              shell ${lib.getExe config.programs.nushell.package}
-                            ''}"
-                        '';
-                      };
-                    in spawn (lib.getExe' nushellKitty "kitty");
+                  "Mod+Shift+Return".action = spawn (spawnTerminal {
+                    command = lib.getExe config.programs.nushell.package;
+                    extraArgs = ["-o" "terminal.shell.program=${lib.escapeShellArg (lib.getExe config.programs.nushell.package)}"];
+                  });
                   "Mod+Q".action = close-window;
                   "Mod+O".action = spawn (lib.getExe config.programs.fuzzel.package);
                   "Mod+Shift+O".action = spawn (lib.getExe config.programs.fuzzel.package) "--list-executables-in-path";
@@ -835,21 +823,10 @@ in {
                       notify-send "$QALC_RES"
                     '';
                   }));
-                  "Mod+Shift+U".action =
-                    let
-                      qalcKitty = pkgs.symlinkJoin {
-                        name = "qalc-kitty";
-                        paths = [ config.programs.kitty.package ];
-                        buildInputs = [ pkgs.makeWrapper ];
-                        postBuild = ''
-                          wrapProgram $out/bin/kitty \
-                            --add-flags "--config ${pkgs.writeText "kitty.conf" ''
-                              include $HOME/${config.xdg.configFile."kitty/kitty.conf".target}
-                              shell ${lib.getExe pkgs.libqalculate}
-                            ''}"
-                        '';
-                      };
-                    in spawn (lib.getExe' qalcKitty "kitty");
+                  "Mod+Shift+U".action = spawn (spawnTerminal {
+                    command = lib.getExe pkgs.libqalculate;
+                    extraArgs = ["-o" "terminal.shell.program=${lib.escapeShellArg (lib.getExe pkgs.libqalculate)}"];
+                  });
                   # "Mod+E".action = spawn (lib.getExe (pkgs.writeShellApplication {
                   #   name = "emoji-fuzzel";
                   #   runtimeInputs = with pkgs; [ config.programs.fuzzel.package wtype wl-clipboard-rs ];