4 files changed, 20 insertions, 17 deletions
diff --git a/user/settings/development/golang.nix b/user/settings/development/golang.nix
index c0f92209..34a74896 100644
--- a/user/settings/development/golang.nix
+++ b/user/settings/development/golang.nix
@@ -15,6 +15,13 @@
   home.sessionPath = [
     "$HOME/go/bin"
   ];
+  home.shellAliases = {
+    gom = "go mod";
+    gomt = "go mod tidy";
+    gomd = "go mod download";
+    gog = "go get";
+    gogu = "go get -u";
+  };
   home.sessionVariables.GOTOOLCHAIN = "local"; # use installed go tools
   programs.emacs.extraPackages = epkgs: (with epkgs; [
     go-eldoc
@@ -24,8 +31,4 @@
   programs.neovim.plugins = with pkgs.vimPlugins; [
     coc-go
   ];
-  programs.fish.shellAbbrs = {
-    gmt = "go mod tidy";
-    gmd = "go mod download";
-  };
 }
diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix
index 26071562..cec5ee59 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -124,7 +124,7 @@ in
         goto-chg
         helpful
         jinx
-        just-mode
+        just-ts-mode
         justl
         kind-icon
         lua-mode
diff --git a/user/settings/fish.nix b/user/settings/fish.nix
index cfefa9ff..91d87505 100644
--- a/user/settings/fish.nix
+++ b/user/settings/fish.nix
@@ -40,7 +40,13 @@
       set --export FZF_DEFAULT_OPTS '--cycle --layout=reverse --border --height=90% --preview-window=wrap --marker="*"'
       fzf_configure_bindings --directory=\cx\cf
 
-      set --universal hydro_multiline true
+      set --global hydro_multiline true
+      set --global hydro_color_pwd 00AFFF
+      set --global hydro_color_git 5FD700
+      set --global hydro_color_start FF00FF
+      set --global hydro_color_error D70000
+      set --global hydro_color_prompt 5FAF00
+      set --global hydro_color_duration 87875F
     '';
     shellAliases = {
       hist-freq-lines = lib.mkForce "history | sort | uniq -c | sort -gr | head -n100 | less";
diff --git a/user/settings/user-interface.nix b/user/settings/user-interface.nix
index 5e1337ba..e46abb98 100644
--- a/user/settings/user-interface.nix
+++ b/user/settings/user-interface.nix
@@ -28,17 +28,11 @@ in
     [
       inter
       input-fonts
-      # see https://github.com/NixOS/nixpkgs/blob/nixos-unstable/pkgs/data/fonts/nerdfonts/shas.nix
-      (nerdfonts.override {
-        fonts = [
-          "JetBrainsMono"
-          "IBMPlexMono"
-          "ZedMono"
-          "Recursive"
-          "NerdFontsSymbolsOnly"
-        ];
-      })
-    ]
+    ] ++ (with pkgs.nerd-fonts; [
+      blex-mono
+      jetbrains-mono
+      recursive-mono
+    ])
     ++ lib.optionals (!stdenv.isDarwin) (with pkgs; [
       (discord.override { withOpenASAR = true; })