Move to env specific config to custom.fish

README.md

@@ -26,10 +26,6 @@ a sample file (located in *~/config/chezmoi/chezmoi.toml*)
   projectdir = "~/work"
   # deployment path for "d" command (java deploy)
   deploydir = "~/dist"
-  # deployment path to dev env with "deploy_dev" command
-  deploydir_dev = "~/dist_dev"
-  # deployment path to test env with "deploy_test" command
-  deploydir_test = "~/dist_test"
   # Java versions from sdkman
   java6_version = "6.0.119-zulu"
   java7_version = "7.0.342-zulu"
@@ -43,8 +39,6 @@ a sample file (located in *~/config/chezmoi/chezmoi.toml*)
   java_truststore_password = "secret"
   # docker compose bin
   docker_compose_command = "/usr/bin/docker compose"
-  # user path added to path
-  extra_user_path = ""
   # tmux favorite shortcuts CTRL-ALT-1, CTRL-ALT-2, CTRL-ALT-3, CTRL-ALT-4
   tmux_favorite1 = "cd my_favorite_path"
   tmux_favorite2 = "sudo su"

private_dot_config/private_fish/config.fish.tmpl

@@ -8,9 +8,9 @@ set -gx EDITOR nvim
 set -gx LANG fr_FR.UTF-8
 set -gx LC_ALL fr_FR.UTF-8
 set --universal fish_greeting
-alias rmi "rm --interactive --verbose"
-alias mvi "mv --interactive --verbose"
-alias cpi "cp --interactive --verbose"
+abbr -a rm "rm --interactive --verbose"
+abbr -a mv "mv --interactive --verbose"
+abbr -a cp "cp --interactive --verbose"
 
 # nix
 if test -e $HOME/.nix-profile/etc/profile.d/nix.sh
@@ -22,7 +22,6 @@ if test -e $HOME/.nix-profile/etc/profile.d/nix.sh
 end
 
 fish_add_path "$HOME/.local/bin"
-fish_add_path "{{ .extra_user_path }}"
 abbr -a vi nvim
 abbr -a v nvim
 abbr -a s subl .
@@ -62,8 +61,6 @@ function mbump
     end
 end
 alias d "python3 ~/.local/bin/deploy.py {{ .deploydir }}"
-alias deploy_dev "python3 ~/.local/bin/deploy.py {{ .deploydir_dev }}"
-alias deploy_test "python3 ~/.local/bin/deploy.py {{ .deploydir_test }}"
 
 # sdkman 
 if test -f "$__fish_sdkman_init"
@@ -92,6 +89,11 @@ set -x FAVORITE_COMMAND2 "{{ .tmux_favorite2 }}"
 set -x FAVORITE_COMMAND3 "{{ .tmux_favorite3 }}"
 set -x FAVORITE_COMMAND4 "{{ .tmux_favorite4 }}"
 
+# extend with specific config
+if test -e "$HOME/.config/fish/custom.fish"
+    source "$HOME/.config/fish/custom.fish"
+end
+
 if status is-interactive
     # Commands to run in interactive sessions can go here
 end