random rice

home-manager/shared/programs/shell/fish/default.nix

@@ -1,4 +1,4 @@
-{pkgs, host, ...}: {
+{pkgs, ...}: {
   programs.fish = {
     enable = true;
     interactiveShellInit = ''
@@ -6,17 +6,21 @@
       set show_startup_tips false
     '';
     shellInit = "
-      fish_add_path /usr/local/go/bin
       fish_add_path ~/go/bin
       fish_add_path ~/.local/bin
       set -gx MANPAGER 'nvim +Man!'
       set -gx EDITOR 'nvim'
-      set -gx _JAVA_AWT_WM_NONREPARENTING 1
-      set -gx NIX_FLAKE '/home/e/dev/nix'
+      set -gx NH_FLAKE '/home/e/dev/nix'
     ";
     plugins = [
-      {name = "fzf"; inherit (pkgs.fishPlugins.fzf-fish) src;}
-      {name = "puffer"; inherit (pkgs.fishPlugins.puffer) src;}
+      {
+        name = "fzf";
+        inherit (pkgs.fishPlugins.fzf-fish) src;
+      }
+      {
+        name = "puffer";
+        inherit (pkgs.fishPlugins.puffer) src;
+      }
     ];
     functions = import ./functions.nix;
     shellAbbrs = {
@@ -25,14 +29,11 @@
     };
     shellAliases = {
       ":q" = "exit";
-      hms = "home-manager switch --flake $NIX_FLAKE#${host.username}";
-      rbs = "sudo nixos-rebuild switch --flake $NIX_FLAKE#${host.hostName}";
       mpv = "mpv --no-keepaspect-window";
       cat = "bat -pp";
       tcd = "cd $(mktemp -d)";
       docker = "nerdctl";
       vimdiff = "nvim -d";
-      ls = "eza";
     };
   };
 }

home-manager/shared/programs/shell/fish/functions.nix

@@ -16,19 +16,29 @@
       end
     '';
   };
+  nix-prefetch-hash = {
+    body = ''
+      nix-hash --type sha256 --to-base64 (nix-prefetch-url $argv)
+    '';
+  };
   fish_jj_prompt = {
     body = ''
       if not command -sq jj
           return 1
       end
-
+      if not command -sq timeout
+          return 1
+      end
+      if set -q FISH_JJ
+          return 0
+      end
       if not jj root &>/dev/null
           return 1
       end
 
       # Generate prompt
       set -l info "$(
-          jj log --ignore-working-copy --no-graph --color=always --revisions=@ --template "
+          timeout 5 jj log --ignore-working-copy --no-graph --color=always --revisions=@ --template "
               separate(
                   ' ',
                   self.change_id().shortest(),