diff --git a/config/fish/conf.d/aliases.fish b/config/fish/conf.d/aliases.fish index 1d170df..bd75e7e 100644 --- a/config/fish/conf.d/aliases.fish +++ b/config/fish/conf.d/aliases.fish @@ -7,16 +7,13 @@ alias du "du -h" alias chmox "chmod +x" alias ":q" exit -alias g git -alias d docker -alias dcm "docker compose" - alias ... "cd ../.." alias .3 "cd ../../.." alias killbt "rfkill block bluetooth" alias unkillbt "rfkill unblock bluetooth" +alias g git if type -q hledger; alias f hledger; end if type -q jj; alias j jj; end if type -q todo.sh; alias t todo.sh; end diff --git a/config/fish/conf.d/colors.fish b/config/fish/conf.d/colors.fish new file mode 100644 index 0000000..9747583 --- /dev/null +++ b/config/fish/conf.d/colors.fish @@ -0,0 +1,34 @@ +status is-interactive; or exit + +set -l foreground c0caf5 +set -l selection 283457 +set -l comment 565f89 +set -l red f7768e +set -l orange ff9e64 +set -l yellow e0af68 +set -l green 9ece6a +set -l purple 9d7cd8 +set -l cyan 7dcfff +set -l pink bb9af7 + +set -g fish_color_normal $foreground +set -g fish_color_command $cyan +set -g fish_color_keyword $pink +set -g fish_color_quote $yellow +set -g fish_color_redirection $foreground +set -g fish_color_end $orange +set -g fish_color_option $pink +set -g fish_color_error $red +set -g fish_color_param $purple +set -g fish_color_comment $comment +set -g fish_color_selection --background=$selection +set -g fish_color_search_match --background=$selection +set -g fish_color_operator $green +set -g fish_color_escape $pink +set -g fish_color_autosuggestion $comment + +set -g fish_pager_color_progress $comment +set -g fish_pager_color_prefix $cyan +set -g fish_pager_color_completion $foreground +set -g fish_pager_color_description $comment +set -g fish_pager_color_selected_background --background=$selection diff --git a/config/fish/functions/sortw.fish b/config/fish/functions/sortw.fish index df1125c..acae2e4 100644 --- a/config/fish/functions/sortw.fish +++ b/config/fish/functions/sortw.fish @@ -1,8 +1,10 @@ -function sortw -d "Wrapper around sort to save file after sorting" +function sortw -d "Wrapper around sort that saves file after sorting" if test (count $argv) -eq 0 - echo "No file provided" - return 1 - else + sort + else if test (count $argv) -eq 1 command sort $argv[1] -o $argv[1] + else + echo "I don't know what to do, too many arguments" + return 2 end end