From e25891255a142317e7a36e93abf515f40f60da50 Mon Sep 17 00:00:00 2001 From: Michael Thomson Date: Sun, 6 Apr 2025 18:27:36 -0400 Subject: [PATCH] update --- flake.lock | 42 ++++++++++++++++----------------- modules/home-manager/email.nix | 17 ++++++++++++- modules/home-manager/nixvim.nix | 32 ++++++++++++++++++++----- 3 files changed, 63 insertions(+), 28 deletions(-) diff --git a/flake.lock b/flake.lock index e87e305..e0ce52d 100644 --- a/flake.lock +++ b/flake.lock @@ -20,11 +20,11 @@ ] }, "locked": { - "lastModified": 1742213273, - "narHash": "sha256-0l0vDb4anfsBu1rOs94bC73Hub+xEivgBAo6QXl2MmU=", + "lastModified": 1743265529, + "narHash": "sha256-QbjP15/2N+VJl0b5jxrrTc+VOt39aU4XrDvtP0Lz5ik=", "owner": "hyprwm", "repo": "aquamarine", - "rev": "484b732195cc53f4536ce4bd59a5c6402b1e7ccf", + "rev": "1d2dbd72c2bbaceab031c592d4810f744741d203", "type": "github" }, "original": { @@ -57,11 +57,11 @@ ] }, "locked": { - "lastModified": 1741352980, - "narHash": "sha256-+u2UunDA4Cl5Fci3m7S643HzKmIDAe+fiXrLqYsR2fs=", + "lastModified": 1743550720, + "narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "f4330d22f1c5d2ba72d3d22df5597d123fdb60a9", + "rev": "c621e8422220273271f52058f618c94e405bb0f5", "type": "github" }, "original": { @@ -234,11 +234,11 @@ ] }, "locked": { - "lastModified": 1742861859, - "narHash": "sha256-lbdHyp2+NoyciCJBtBt3Cgm2dDvoHvTdCRMbmwJoUmk=", + "lastModified": 1743950622, + "narHash": "sha256-8qjDapcQeDqxQUIm5gA0x6XZtowV/14bOs3K0tCSMoU=", "owner": "hyprwm", "repo": "hyprland-plugins", - "rev": "1f332c09a2382cb23da0f69a6f504f8b33433831", + "rev": "be6b9875dd5c586fb401d294bb98c31973849651", "type": "github" }, "original": { @@ -259,11 +259,11 @@ ] }, "locked": { - "lastModified": 1738422629, - "narHash": "sha256-5v+bv75wJWvahyM2xcMTSNNxmV8a7hb01Eey5zYnBJw=", + "lastModified": 1743714874, + "narHash": "sha256-yt8F7NhMFCFHUHy/lNjH/pjZyIDFNk52Q4tivQ31WFo=", "owner": "hyprwm", "repo": "hyprland-protocols", - "rev": "755aef8dab49d0fc4663c715fa4ad221b2aedaed", + "rev": "3a5c2bda1c1a4e55cc1330c782547695a93f05b2", "type": "github" }, "original": { @@ -381,11 +381,11 @@ ] }, "locked": { - "lastModified": 1741534688, - "narHash": "sha256-EV3945SnjOCuRVbGRghsWx/9D89FyshnSO1Q6/TuQ14=", + "lastModified": 1743950287, + "narHash": "sha256-/6IAEWyb8gC/NKZElxiHChkouiUOrVYNq9YqG0Pzm4Y=", "owner": "hyprwm", "repo": "hyprutils", - "rev": "dd1f720cbc2dbb3c71167c9598045dd3261d27b3", + "rev": "f2dc70e448b994cef627a157ee340135bd68fbc6", "type": "github" }, "original": { @@ -536,11 +536,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1742669843, - "narHash": "sha256-G5n+FOXLXcRx+3hCJ6Rt6ZQyF1zqQ0DL0sWAMn2Nk0w=", + "lastModified": 1743827369, + "narHash": "sha256-rpqepOZ8Eo1zg+KJeWoq1HAOgoMCDloqv5r2EAa9TSA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1e5b653dff12029333a6546c11e108ede13052eb", + "rev": "42a1c966be226125b48c384171c44c651c236c22", "type": "github" }, "original": { @@ -684,11 +684,11 @@ ] }, "locked": { - "lastModified": 1742659553, - "narHash": "sha256-i/JCrr/jApVorI9GkSV5to+USrRCa0rWuQDH8JSlK2A=", + "lastModified": 1743683223, + "narHash": "sha256-LdXtHFvhEC3S64dphap1pkkzwjErbW65eH1VRerCUT0=", "owner": "NuschtOS", "repo": "search", - "rev": "508752835128a3977985a4d5225ff241f7756181", + "rev": "56a49ffef2908dad1e9a8adef1f18802bc760962", "type": "github" }, "original": { diff --git a/modules/home-manager/email.nix b/modules/home-manager/email.nix index 437c5bc..d7128e8 100644 --- a/modules/home-manager/email.nix +++ b/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:pipe -mb git am -3"; + # gp = ":term git push"; + # gl = ":term git log"; + # rt = ":reply -a -Tthanks"; + # }; + # }; extraConfig = { ui = { - sort = "arrival -r"; + sort = "-r arrival"; }; general = { unsafe-accounts-conf = true; diff --git a/modules/home-manager/nixvim.nix b/modules/home-manager/nixvim.nix index 164ee40..c0dca81 100644 --- a/modules/home-manager/nixvim.nix +++ b/modules/home-manager/nixvim.nix @@ -59,6 +59,32 @@ lib, }; keymaps = [ + #harpoon + { + mode = "n"; + key = "a"; + action.__raw = "function() require('harpoon.mark').add_file() end"; + } + { + mode = "n"; + key = "e"; + action.__raw = "function() require('harpoon.ui').toggle_quick_menu() end"; + } + { + mode = "n"; + key = "j"; + action.__raw = "function() require('harpoon.ui').nav_next() end"; + } + { + mode = "n"; + key = "k"; + action.__raw = "function() require('harpoon.ui').nav_prev() end"; + } + { + mode = "n"; + key = "j"; + action.__raw = "function() require'harpoon'.ui:nav_prev() end"; + } { mode = "n"; key = "fe"; @@ -350,12 +376,6 @@ lib, }; harpoon = { enable = true; - keymaps = { - addFile = "a"; - toggleQuickMenu = "e"; - navNext = "k"; - navPrev = "j"; - }; }; mini = { enable = true;