update

modules/home-manager/email.nix

@@ -22,9 +22,24 @@
   programs = {
     aerc = {
       enable = true;
+      templates = {
+        thanks = ''
+          Thanks!
+
+          {{exec "{ git remote get-url --push origin; git reflog -2 origin/master --pretty=format:%h | xargs printf '%s\n' | tac; } | xargs printf 'To %s\n   %s..%s  master -> master'" ""}}
+        '';
+      };
+      # extraBinds = {
+      #   messages = {
+      #     ga = ":flag<Enter>:pipe -mb git am -3<Enter>";
+      #     gp = ":term git push<Enter>";
+      #     gl = ":term git log<Enter>";
+      #     rt = ":reply -a -Tthanks<Enter>";
+      #   };
+      # };
       extraConfig = {
         ui = {
-          sort = "arrival -r";
+          sort = "-r arrival";
         };
         general = {
           unsafe-accounts-conf = true;

modules/home-manager/nixvim.nix

@@ -59,6 +59,32 @@ lib,
     };
 
     keymaps = [
+      #harpoon
+      {
+        mode = "n";
+        key = "<leader>a";
+        action.__raw = "function() require('harpoon.mark').add_file() end";
+      }
+      {
+        mode = "n";
+        key = "<leader>e";
+        action.__raw = "function() require('harpoon.ui').toggle_quick_menu() end";
+      }
+      {
+        mode = "n";
+        key = "<leader>j";
+        action.__raw = "function() require('harpoon.ui').nav_next() end";
+      }
+      {
+        mode = "n";
+        key = "<leader>k";
+        action.__raw = "function() require('harpoon.ui').nav_prev() end";
+      }
+      {
+        mode = "n";
+        key = "<leader>j";
+        action.__raw = "function() require'harpoon'.ui:nav_prev() end";
+      }
       {
         mode = "n";
         key = "<leader>fe";
@@ -350,12 +376,6 @@ lib,
       };
       harpoon = {
         enable = true;
-        keymaps = {
-          addFile = "<leader>a";
-          toggleQuickMenu = "<leader>e";
-          navNext = "<leader>k";
-          navPrev = "<leader>j";
-        };
       };
       mini = {
         enable = true;