From 14e587afc697c501c5a122c05488d76d03b00a51 Mon Sep 17 00:00:00 2001 From: Zam Kokott Date: Thu, 2 Apr 2026 12:39:21 +0000 Subject: update to use fish with template --- dot_config/fish/config.fish | 51 --------------------------------- dot_config/fish/config.fish.tmpl | 62 ++++++++++++++++++++++++++++++++++++++++ 2 files changed, 62 insertions(+), 51 deletions(-) delete mode 100644 dot_config/fish/config.fish create mode 100644 dot_config/fish/config.fish.tmpl (limited to 'dot_config/fish') diff --git a/dot_config/fish/config.fish b/dot_config/fish/config.fish deleted file mode 100644 index 6e83a73..0000000 --- a/dot_config/fish/config.fish +++ /dev/null @@ -1,51 +0,0 @@ -# source /usr/share/cachyos-fish-config/cachyos-config.fish - -function fish_greeting - fastfetch -end - -# Add ~/.local/bin to PATH -if test -d ~/.local/bin - if not contains -- ~/.local/bin $PATH - set -p PATH ~/.local/bin - end -end - -# Add depot_tools to PATH -if test -d ~/Applications/depot_tools - if not contains -- ~/Applications/depot_tools $PATH - set -p PATH ~/Applications/depot_tools - end -end - -# Fish command history -function history - builtin history --show-time='%F %T ' -end - -# Copy DIR1 DIR2 -function copy - set count (count $argv | tr -d \n) - if test "$count" = 2; and test -d "$argv[1]" - set from (echo $argv[1] | trim-right /) - set to (echo $argv[2]) - command cp -r $from $to - else - command cp $argv - end -end - -set -U fish_complete_path $fish_complete_path /nix/var/nix/profiles/default/share/fish/vendor_completions.d -set -Ux EDITOR nvim -set -U fish_history_max 1000 - -alias vim='nvim' -alias cd='z' -alias ls='eza --icons=always --color=always' -alias untar='tar -zxvf ' -alias grep='grep --color=auto' -alias cleanup='sudo pacman -Rns (pacman -Qtdq)' - -direnv hook fish | source -zoxide init fish | source -starship init fish | source diff --git a/dot_config/fish/config.fish.tmpl b/dot_config/fish/config.fish.tmpl new file mode 100644 index 0000000..284e9dd --- /dev/null +++ b/dot_config/fish/config.fish.tmpl @@ -0,0 +1,62 @@ +# source /usr/share/cachyos-fish-config/cachyos-config.fish + +function fish_greeting + {{- if eq .chezmoi.hostname "ubuntu" }} + if test -z "$TMUX" + tmux new -As default + end + {{- else }} + fastfetch + {{- end }} +end + +# Add ~/.local/bin to PATH +if test -d ~/.local/bin + if not contains -- ~/.local/bin $PATH + set -p PATH ~/.local/bin + end +end + +# Add depot_tools to PATH +if test -d ~/Applications/depot_tools + if not contains -- ~/Applications/depot_tools $PATH + set -p PATH ~/Applications/depot_tools + end +end + +# Fish command history +function history + builtin history --show-time='%F %T ' +end + +# Copy DIR1 DIR2 +function copy + set count (count $argv | tr -d \n) + if test "$count" = 2; and test -d "$argv[1]" + set from (echo $argv[1] | trim-right /) + set to (echo $argv[2]) + command cp -r $from $to + else + command cp $argv + end +end + +set -U fish_complete_path $fish_complete_path /nix/var/nix/profiles/default/share/fish/vendor_completions.d +set -Ux EDITOR nvim +set -U fish_history_max 1000 + +{{ if eq .chezmoi.hostname "ubuntu" }} + fish_add_path /opt/nvim-linux-x86_64/bin +{{ end }} + +alias vim='nvim' +alias cd='z' +alias ls='eza --icons=always --color=always' +alias untar='tar -zxvf ' +alias grep='grep --color=auto' +alias cleanup='sudo pacman -Rns (pacman -Qtdq)' + +chezmoi completion fish | source +direnv hook fish | source +zoxide init fish | source +starship init fish | source -- cgit 1.3.1