From a59f2b7c2e462bd3c3b38978ecdb70d2e2511725 Mon Sep 17 00:00:00 2001
From: Emmet <emmet@librephoenix.com>
Date: Sun, 22 Jun 2025 12:16:54 -0500
Subject: [PATCH] some yazi fixes

---
 modules/user/editor/default.nix |  2 +-
 modules/user/terminal/kitty.nix |  5 ++++
 modules/user/yazi/default.nix   | 53 +++++++++++++++++++++++++++++++++
 3 files changed, 59 insertions(+), 1 deletion(-)

diff --git a/modules/user/editor/default.nix b/modules/user/editor/default.nix
index b80abd62..c6ac1c59 100644
--- a/modules/user/editor/default.nix
+++ b/modules/user/editor/default.nix
@@ -24,7 +24,7 @@ in {
     home.packages = with pkgs;
       lib.optionals (editor == "kate") [ kdePackages.kate];
     userSettings.spawnEditor = lib.mkMerge [
-      (lib.mkIf (editor == "emacs") "emacsclient -c -a 'emacs'")
+      (lib.mkIf (editor == "emacs") "emacsclient -c -n -a 'emacs'")
       (lib.mkIf (editor == "neovide") "neovide -- --listen /tmp/nvimsocket")
       (lib.mkIf (editor == "vscodium") "codium -n")
       (lib.mkIf (builtins.elem editor [ "vim" "nvim" "nano" "micro" ]) ("exec " + term + " -e " + editor))
diff --git a/modules/user/terminal/kitty.nix b/modules/user/terminal/kitty.nix
index 93d6a3e2..3e67ee81 100644
--- a/modules/user/terminal/kitty.nix
+++ b/modules/user/terminal/kitty.nix
@@ -15,6 +15,11 @@ in {
     programs.kitty.settings = {
       background_opacity = lib.mkForce "0.85";
       modify_font = "cell_width 90%";
+      confirm_os_window_close = 0;
+    };
+    programs.kitty.keybindings = {
+      "ctrl+equal" = "change_font_size all +2.0";
+      "ctrl+minus" = "change_font_size all -2.0";
     };
   };
 }
diff --git a/modules/user/yazi/default.nix b/modules/user/yazi/default.nix
index bacdc273..e3eda20b 100644
--- a/modules/user/yazi/default.nix
+++ b/modules/user/yazi/default.nix
@@ -16,7 +16,60 @@ in {
       keymap.manager.prepend_keymap = 
         [
           { run = "shell ' \"$@\"' --cursor=0 --interactive"; on = [ "@" ]; }
+          { run = "hidden toggle"; on = [ "<C-h>" ]; }
+          { run = "yank"; on = [ "y" "y" ]; }
+          { run = "copy path"; on = [ "y" "p" ]; }
+          { run = "copy dirname"; on = [ "y" "d" ]; }
+          { run = "copy filename"; on = [ "y" "n" ]; }
+          { run = "copy name_without_ext"; on = [ "y" "N" ]; }
+          { run = "yank --cut"; on = [ "d" "d" ]; }
+          { run = "remove --force"; on = [ "d" "D" ]; }
+          { run = "paste"; on = [ "p" "p" ]; }
+          { run = "paste --force"; on = [ "p" "P" ]; }
+          { run = "cd --interactive"; on = [ "c" "d" ]; }
+          { run = "sort mtime --reverse=no"; on = [ "o" "m" ]; }
+          { run = "sort mtime --reverse=yes"; on = [ "o" "M" ]; }
+          { run = "sort natural --reverse=no"; on = [ "o" "b" ]; }
+          { run = "sort natural --reverse=yes"; on = [ "o" "B" ]; }
+          { run = "sort alphabetical --reverse=no"; on = [ "o" "a" ]; }
+          { run = "sort alphabetical --reverse=yes"; on = [ "o" "A" ]; }
+          { run = "sort extension --reverse=no"; on = [ "o" "e" ]; }
+          { run = "sort extension --reverse=yes"; on = [ "o" "E" ]; }
+          { run = "sort size --reverse=no"; on = [ "o" "s" ]; }
+          { run = "sort size --reverse=yes"; on = [ "o" "S" ]; }
+          { run = "tab_create --current"; on = [ "t" ]; }
+          { run = "close"; on = [ "x" ]; }
+          { run = "tab_switch 1 --relative"; on = [ "J" ]; }
+          { run = "tab_switch 1 --relative"; on = [ "<C-Tab>" ]; }
+          { run = "tab_switch -1 --relative"; on = [ "K" ]; }
+          { run = "tab_switch -1 --relative"; on = [ "<C-BackTab>" ]; }
+          { run = "undo"; on = [ "u" ]; }
+          { run = "redo"; on = [ "<C-r>" ]; }
         ];
+      plugins = {
+        full-border = pkgs.yaziPlugins.full-border;
+        git = pkgs.yaziPlugins.git;
+        sudo = pkgs.yaziPlugins.sudo;
+        piper = pkgs.yaziPlugins.piper;
+      };
+      initLua = ''
+        require("full-border"):setup()
+        require("git"):setup()
+      '';
+      settings = {
+        "plugin.prepend_fetchers" = [
+          {
+            id = "git";
+            name = "*";
+            run = "git";
+          }
+          {
+            id = "git";
+            name = "*/";
+            run = "git";
+          }
+        ];
+      };
     };
   };
 }