remove puffer-fish, fix autopair for fish

2 files changed, 12 insertions, 10 deletions

diff --git a/users/seth/shell/default.nix b/users/seth/shell/default.nix
index f637e03..0811779 100644
--- a/users/seth/shell/default.nix
+++ b/users/seth/shell/default.nix
@@ -42,7 +42,7 @@
     sessionVariables = {
       EDITOR = "nvim";
       VISUAL = "$EDITOR";
-      GPG_TTY = "$TTY";
+      GPG_TTY = "$(tty)";
       CARGO_HOME = "${config.xdg.dataHome}/cargo";
       RUSTUP_HOME = "${config.xdg.dataHome}/rustup";
       LESSHISTFILE = "${config.xdg.stateHome}/less/history";
diff --git a/users/seth/shell/fish.nix b/users/seth/shell/fish.nix
index 4be0322..f900349 100644
--- a/users/seth/shell/fish.nix
+++ b/users/seth/shell/fish.nix
@@ -23,22 +23,24 @@
       if test -e $nixfile
       	source $nixfile
       end
+
       fish_config theme choose "Catppuccin Mocha"
       nix-your-shell fish | source
+
+      abbr -a !! --position anywhere --function last_history_item
     '';
+    functions = {
+      last_history_item.body = "echo $history[1]";
+    };
+
     plugins = [
       {
         name = "autopair-fish";
-        src = pkgs.fishPlugins.autopair-fish;
-      }
-
-      {
-        name = "puffer-fish";
         src = pkgs.fetchFromGitHub {
-          owner = "nickeb96";
-          repo = "puffer-fish";
-          rev = "fd0a9c95da59512beffddb3df95e64221f894631";
-          sha256 = "sha256-aij48yQHeAKCoAD43rGhqW8X/qmEGGkg8B4jSeqjVU0=";
+          owner = "jorgebucaran";
+          repo = "autopair.fish";
+          rev = "4d1752ff5b39819ab58d7337c69220342e9de0e2";
+          sha256 = "sha256-qt3t1iKRRNuiLWiVoiAYOu+9E7jsyECyIqZJ/oRIT1A=";
         };
       }
     ];