6 files changed, 25 insertions, 11 deletions
diff --git a/user/settings/base.nix b/user/settings/base.nix
index 837f5e3f..f29d43aa 100644
--- a/user/settings/base.nix
+++ b/user/settings/base.nix
@@ -13,6 +13,7 @@
     html.enable = true;
   };
   home.preferXdgDirectories = true;
+  nix.settings.use-xdg-base-directories = true;
   home.sessionVariables =
     let
       conf = config.xdg.configHome;
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 cc9deab6..26071562 100644
--- a/user/settings/emacs.nix
+++ b/user/settings/emacs.nix
@@ -197,12 +197,11 @@ in
     };
     extraConfig = ''
       (with-eval-after-load 'editorconfig
-        (defvar editorconfig-exec-path "${pkgs.editorconfig-core-c}/bin/editorconfig"))
+        (setq editorconfig-exec-path "${pkgs.editorconfig-core-c}/bin/editorconfig"))
     '' + lib.optionalString stdenv.isDarwin ''
-      (with-eval-after-load 'files
-        (defvar insert-directory-program "${pkgs.coreutils-prefixed}/bin/gls"))
       (with-eval-after-load 'dired
-        (defvar dired-use-ls-dired t))
+        (setq insert-directory-program "${pkgs.coreutils-prefixed}/bin/gls"
+              dired-use-ls-dired t))
     '';
   };
   home.packages = with pkgs; [
diff --git a/user/settings/fish.nix b/user/settings/fish.nix
index a487418c..cfefa9ff 100644
--- a/user/settings/fish.nix
+++ b/user/settings/fish.nix
@@ -9,10 +9,18 @@
         fromNixpkgs = pkg: { name = pkg.name; src = pkg.src; };
       in
       with pkgs.fishPlugins; [
-        (fromNixpkgs tide)
         (fromNixpkgs fzf-fish)
         (fromNixpkgs autopair)
         {
+          name = "fishplugin-hydro";
+          src = pkgs.fetchFromGitHub {
+            owner = "alanpearce";
+            repo = "hydro";
+            hash = "sha256-QYq4sU41/iKvDUczWLYRGqDQpVASF/+6brJJ8IxypjE=";
+            rev = "7a8c468ba0dc88a5f8a9c0b8635020bfc3619323";
+          };
+        }
+        {
           name = "ghq";
           src = pkgs.fetchFromGitHub {
             owner = "decors";
@@ -31,6 +39,8 @@
       set FZF_CTRL_T_COMMAND
       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
     '';
     shellAliases = {
       hist-freq-lines = lib.mkForce "history | sort | uniq -c | sort -gr | head -n100 | less";
diff --git a/user/settings/nix.nix b/user/settings/nix.nix
index 87db3d56..6eabeae8 100644
--- a/user/settings/nix.nix
+++ b/user/settings/nix.nix
@@ -15,6 +15,8 @@ in
   };
 
   home.packages = with pkgs; [
+    age
+    agenix
     cached-nix-shell
     nil
     nix-prefetch-scripts
diff --git a/user/settings/shell.nix b/user/settings/shell.nix
index 18cab4ab..c33e808e 100644
--- a/user/settings/shell.nix
+++ b/user/settings/shell.nix
@@ -122,11 +122,11 @@ in
       hox = "home-manager expire-generations '-30 days'";
 
       lw = "lorri watch";
-      lw1 = "lorri watch --once";
       lwo = "lorri watch --once";
 
       nsh = "nix shell";
       nb = "nix build";
+      nd = "nix develop";
       nl = "nix log"; # shadows `coreutils.nl`, but I've never used that yet
       nr = "nix run";
       nf = "nix flake";
@@ -136,7 +136,6 @@ in
       nfu = "nix flake update";
       nfl = "nix flake lock";
       nfsh = "nix shell";
-      ndev = "nix develop";
       nlg = "nix-env --list-generations";
       snlg = "sudo nix-env --list-generations --profile /nix/var/nix/profiles/system";
       ngc = "nix-collect-garbage --delete-older-than 30d";