Decommissioning omf

szinn · Oct 21, 2023 · 0b1cc57 · 0b1cc57
1 parent 08967ca
commit 0b1cc57
Show file tree

Hide file tree

Showing 9 changed files with 20 additions and 58 deletions.
diff --git a/home/.chezmoiscripts/run_after_10-update-omf.sh.tmpl b/home/.chezmoiscripts/run_after_10-update-omf.sh.tmpl
diff --git a/home/.chezmoiscripts/run_once_before_10-install-omf-plugins.sh b/home/.chezmoiscripts/run_once_before_10-install-omf-plugins.sh
diff --git a/home/.chezmoiscripts/run_once_before_20-install-omf.sh b/home/.chezmoiscripts/run_once_before_20-install-omf.sh
diff --git a/home/dot_config/private_fish/conf.d/01-omf.fish b/home/dot_config/private_fish/conf.d/01-omf.fish
diff --git a/home/dot_config/private_fish/conf.d/10-env.fish b/home/dot_config/private_fish/conf.d/10-env.fish
@@ -1,14 +1,19 @@
 # Configure environment
 set -gx EDITOR "nvim"
-set -Ux GOPATH (go env GOPATH)
 set -gx HOMEBREW_NO_ANALYTICS 1
 set -gx HOMEBREW_NO_AUTO_UPDATE 1
 set -gx HOMEBREW_NO_ENV_HINTS 1
 set -gx HOMEBREW_NO_INSTALL_CLEANUP 1
 set -gx LESSHISTFILE -
 set -gx PAGER less
-set -gx SOPS_AGE_KEY_FILE $XDG_CONFIG_HOME/sops/age/keys.txt
-set -Ux FZF_DEFAULT_COMMAND "fd -H -E '.git'"
+
+if command -sq sops
+  set -gx SOPS_AGE_KEY_FILE $XDG_CONFIG_HOME/sops/age/keys.txt
+end
+
+if command -sq fd
+  set -Ux FZF_DEFAULT_COMMAND "fd -H -E '.git'"
+end
 
 if command -sq rg
   set -gx RIPGREP_CONFIG_PATH "$XDG_CONFIG_HOME/ripgrep/config"

diff --git a/home/dot_config/private_fish/conf.d/11-asdf.fish b/home/dot_config/private_fish/conf.d/11-asdf.fish
diff --git a/home/dot_config/private_fish/conf.d/20-homebrew.fish.tmpl b/home/dot_config/private_fish/conf.d/20-homebrew.fish.tmpl
@@ -13,16 +13,12 @@ for package in gnu-sed findutils coreutils grep make
     fish_add_path "$HOMEBREW_PREFIX/opt/$package/libexec/gnubin"
   end
 end
-for package in m4
+for package in m4 curl postgresql@16
   if test -d "$HOMEBREW_PREFIX/opt/$package/bin"
     fish_add_path "$HOMEBREW_PREFIX/opt/$package/bin"
   end
 end
 
-if test -d "$HOMEBREW_PREFIX/opt/curl/bin"
-    fish_add_path "$HOMEBREW_PREFIX/opt/curl/bin"
-end
-
 if test -d "$HOMEBREW_PREFIX/share/fish/completions"
   set -gx fish_complete_path $fish_complete_path "$HOMEBREW_PREFIX/share/fish/completions"
 end

diff --git a/home/dot_config/private_fish/conf.d/21-go.fish b/home/dot_config/private_fish/conf.d/21-go.fish
@@ -0,0 +1,3 @@
+if type -q go
+  set -Ux GOPATH (go env GOPATH)
+end
diff --git a/home/dot_config/private_fish/conf.d/21-rust.fish b/home/dot_config/private_fish/conf.d/21-rust.fish
@@ -0,0 +1,8 @@
+set -l rustup_path $HOME/.cargo/bin
+
+if [ $CARGO_HOME ]
+  set rustup_path $CARGO_HOME/bin
+end
+
+contains -- $rustup_path $PATH
+  or set -gx PATH $rustup_path $PATH