From 94358c267e38709621f7c760b2663001b0b2e79e Mon Sep 17 00:00:00 2001 From: DustVoice Date: Tue, 6 Sep 2022 16:49:08 +0200 Subject: [PATCH] Correct mistakes; Add dracula theme to fish; #Consider using fisher as a plugin manager --- .config/fish/conf.d/dracula.fish | 50 ++++++++++++++++++++++ .config/fish/functions/dmenu_fish.fish | 2 +- .config/fish/functions/hyperv-forward.fish | 5 +-- 3 files changed, 53 insertions(+), 4 deletions(-) create mode 100644 .config/fish/conf.d/dracula.fish diff --git a/.config/fish/conf.d/dracula.fish b/.config/fish/conf.d/dracula.fish new file mode 100644 index 0000000..90a5132 --- /dev/null +++ b/.config/fish/conf.d/dracula.fish @@ -0,0 +1,50 @@ +# Dracula Color Palette +set -l foreground f8f8f2 +set -l selection 44475a +set -l comment 6272a4 +set -l red ff5555 +set -l orange ffb86c +set -l yellow f1fa8c +set -l green 50fa7b +set -l purple bd93f9 +set -l cyan 8be9fd +set -l pink ff79c6 + +# Syntax Highlighting Colors +set -gx fish_color_normal $foreground +set -gx fish_color_command $cyan +set -gx fish_color_keyword $pink +set -gx fish_color_quote $yellow +set -gx fish_color_redirection $foreground +set -gx fish_color_end $orange +set -gx fish_color_error $red +set -gx fish_color_param $purple +set -gx fish_color_comment $comment +set -gx fish_color_selection --background=$selection +set -gx fish_color_search_match --background=$selection +set -gx fish_color_operator $green +set -gx fish_color_escape $pink +set -gx fish_color_autosuggestion $comment +set -gx fish_color_cancel $red --reverse +set -gx fish_color_option $orange + +# Default Prompt Colors +set -gx fish_color_cwd $green +set -gx fish_color_host $purple +set -gx fish_color_host_remote $purple +set -gx fish_color_user $cyan + +# Completion Pager Colors +set -gx fish_pager_color_progress $comment +set -gx fish_pager_color_background +set -gx fish_pager_color_prefix $cyan +set -gx fish_pager_color_completion $foreground +set -gx fish_pager_color_description $comment +set -gx fish_pager_color_selected_background --background=$selection +set -gx fish_pager_color_selected_prefix $cyan +set -gx fish_pager_color_selected_completion $foreground +set -gx fish_pager_color_selected_description $comment +set -gx fish_pager_color_secondary_background +set -gx fish_pager_color_secondary_prefix $cyan +set -gx fish_pager_color_secondary_completion $foreground +set -gx fish_pager_color_secondary_description $comment diff --git a/.config/fish/functions/dmenu_fish.fish b/.config/fish/functions/dmenu_fish.fish index 7e43595..51e729d 100644 --- a/.config/fish/functions/dmenu_fish.fish +++ b/.config/fish/functions/dmenu_fish.fish @@ -3,5 +3,5 @@ function dmenu_fish --description 'Open fish agnostic dmenu' set commands $(string join \n $fns $(dmenu_path) | sort | dmenu -i -fn "$(get-font)" -nb "#282a36" -nf "#f8f8f2" -sb "#44475a" -sf "#f8f8f2") - eval $command_to_run & + fish -c "$command_to_run" & end diff --git a/.config/fish/functions/hyperv-forward.fish b/.config/fish/functions/hyperv-forward.fish index fa3fe1e..6b07041 100644 --- a/.config/fish/functions/hyperv-forward.fish +++ b/.config/fish/functions/hyperv-forward.fish @@ -6,7 +6,7 @@ function hyperv-gpg-agent rm $socket_path end - setsid socat UNIX-LISTEN:$socket_path,fork tcp-connect:$host_ip:59545 & + screen -dmS gpg-socat socat UNIX-LISTEN:$socket_path,fork tcp-connect:$host_ip:59545 end function hyperv-ssh-agent @@ -16,8 +16,7 @@ function hyperv-ssh-agent if test -e $socket_path rm $socket_path end - - setsid socat UNIX-LISTEN:$socket_path,fork tcp-connect:$host_ip:59546 & + screen -dmS ssh-socat socat UNIX-LISTEN:$socket_path,fork tcp-connect:$host_ip:59546 end function hyperv-forward --description 'Setup hyperv-agent forwarding'