From cc0690569e35e2527646fe7eaa3c59c7487edaef Mon Sep 17 00:00:00 2001 From: Sravan Balaji Date: Tue, 14 Feb 2023 17:26:58 -0500 Subject: [PATCH] Submodule Updates - Update submodules - Change dracula fish theme using new method for updated fish shell --- .config/doom-emacs | 2 +- .config/emacs | 2 +- .config/fish/conf.d/dracula.fish | 33 --------- .config/fish/config.fish | 2 + .config/fish/themes/Dracula_Official.theme | 55 ++++++++++++++ .themes/dracula-fish | 2 +- .themes/dracula-gtk | 2 +- .themes/dracula-qbittorrent | 2 +- .themes/dracula-steam | 2 +- .vim/pack/themes/start/dracula | 2 +- README.org | 86 ++++++++++++++-------- 11 files changed, 121 insertions(+), 69 deletions(-) delete mode 100644 .config/fish/conf.d/dracula.fish create mode 100644 .config/fish/themes/Dracula_Official.theme diff --git a/.config/doom-emacs b/.config/doom-emacs index 9d4d5b7..e966249 160000 --- a/.config/doom-emacs +++ b/.config/doom-emacs @@ -1 +1 @@ -Subproject commit 9d4d5b756a8598c4b5c842e9f1f33148af2af8fd +Subproject commit e96624926d724aff98e862221422cd7124a99c19 diff --git a/.config/emacs b/.config/emacs index d722459..c2d700b 160000 --- a/.config/emacs +++ b/.config/emacs @@ -1 +1 @@ -Subproject commit d722459287566e8c91ae077bf3d65966ebece190 +Subproject commit c2d700b784c793cc82131ef86323801b8d6e67bb diff --git a/.config/fish/conf.d/dracula.fish b/.config/fish/conf.d/dracula.fish deleted file mode 100644 index e467e6d..0000000 --- a/.config/fish/conf.d/dracula.fish +++ /dev/null @@ -1,33 +0,0 @@ -# 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 -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_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 - -# Completion Pager Colors -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 diff --git a/.config/fish/config.fish b/.config/fish/config.fish index 737c4fc..10acf2d 100644 --- a/.config/fish/config.fish +++ b/.config/fish/config.fish @@ -1,3 +1,5 @@ +fish_config theme choose "Dracula_Official" + function fish_greeting clear pokemon-colorscripts -r diff --git a/.config/fish/themes/Dracula_Official.theme b/.config/fish/themes/Dracula_Official.theme new file mode 100644 index 0000000..6c1fd96 --- /dev/null +++ b/.config/fish/themes/Dracula_Official.theme @@ -0,0 +1,55 @@ +# Dracula Color Palette +# +# Foreground: f8f8f2 +# Selection: 44475a +# Comment: 6272a4 +# Red: ff5555 +# Orange: ffb86c +# Yellow: f1fa8c +# Green: 50fa7b +# Purple: bd93f9 +# Cyan: 8be9fd +# Pink: ff79c6 + +# Syntax Highlighting Colors +fish_color_normal f8f8f2 +fish_color_command 8be9fd +fish_color_keyword ff79c6 +fish_color_quote f1fa8c +fish_color_redirection f8f8f2 +fish_color_end ffb86c +fish_color_error ff5555 +fish_color_param bd93f9 +fish_color_comment 6272a4 +fish_color_selection --background=44475a +fish_color_search_match --background=44475a +fish_color_operator 50fa7b +fish_color_escape ff79c6 +fish_color_autosuggestion 6272a4 +fish_color_cancel ff5555 --reverse +fish_color_option ffb86c +fish_color_history_current --bold +fish_color_status ff5555 +fish_color_valid_path --underline + +# Default Prompt Colors +fish_color_cwd 50fa7b +fish_color_cwd_root red +fish_color_host bd93f9 +fish_color_host_remote bd93f9 +fish_color_user 8be9fd + +# Completion Pager Colors +fish_pager_color_progress 6272a4 +fish_pager_color_background +fish_pager_color_prefix 8be9fd +fish_pager_color_completion f8f8f2 +fish_pager_color_description 6272a4 +fish_pager_color_selected_background --background=44475a +fish_pager_color_selected_prefix 8be9fd +fish_pager_color_selected_completion f8f8f2 +fish_pager_color_selected_description 6272a4 +fish_pager_color_secondary_background +fish_pager_color_secondary_prefix 8be9fd +fish_pager_color_secondary_completion f8f8f2 +fish_pager_color_secondary_description 6272a4 diff --git a/.themes/dracula-fish b/.themes/dracula-fish index 610147c..0e51af5 160000 --- a/.themes/dracula-fish +++ b/.themes/dracula-fish @@ -1 +1 @@ -Subproject commit 610147cc384ff161fbabb9a9ebfd22b743f82b67 +Subproject commit 0e51af5e5346e5d24efabd43fb4631e2a8fd1b70 diff --git a/.themes/dracula-gtk b/.themes/dracula-gtk index 3a9f544..9840b6b 160000 --- a/.themes/dracula-gtk +++ b/.themes/dracula-gtk @@ -1 +1 @@ -Subproject commit 3a9f544855f163dc12f84a2bc0f103007128a679 +Subproject commit 9840b6b665fc771fb10aa304419bcf5a84d497dd diff --git a/.themes/dracula-qbittorrent b/.themes/dracula-qbittorrent index eccdfac..a9d64ac 160000 --- a/.themes/dracula-qbittorrent +++ b/.themes/dracula-qbittorrent @@ -1 +1 @@ -Subproject commit eccdfac871469203ca5dec76844c8672504d434b +Subproject commit a9d64acd1faf2d23f46a98b20eba6640805a0f62 diff --git a/.themes/dracula-steam b/.themes/dracula-steam index 102d655..a184151 160000 --- a/.themes/dracula-steam +++ b/.themes/dracula-steam @@ -1 +1 @@ -Subproject commit 102d655f38a193fd78a92b94a4b525e52aea74a5 +Subproject commit a1841516969a2cd222b862d748e0230a97a1c391 diff --git a/.vim/pack/themes/start/dracula b/.vim/pack/themes/start/dracula index b9f4f3a..eb577d4 160000 --- a/.vim/pack/themes/start/dracula +++ b/.vim/pack/themes/start/dracula @@ -1 +1 @@ -Subproject commit b9f4f3a169266031d3744335595eee02a6e396c6 +Subproject commit eb577d47b0cfc9191bf04c414b4042d5f1a980f8 diff --git a/README.org b/README.org index 18ea824..da36335 100644 --- a/README.org +++ b/README.org @@ -4515,6 +4515,12 @@ echo "zsh shell" *** Fish +**** Theme Selection + +#+BEGIN_SRC fish :tangle .config/fish/config.fish +fish_config theme choose "Dracula_Official" +#+END_SRC + **** Greeting #+BEGIN_SRC fish :tangle .config/fish/config.fish @@ -4600,40 +4606,62 @@ starship init fish | source **** Dracula Theme -#+BEGIN_SRC fish :tangle .config/fish/conf.d/dracula.fish +#+BEGIN_SRC fish :tangle .config/fish/themes/Dracula_Official.theme # 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 +# +# Foreground: f8f8f2 +# Selection: 44475a +# Comment: 6272a4 +# Red: ff5555 +# Orange: ffb86c +# Yellow: f1fa8c +# Green: 50fa7b +# Purple: bd93f9 +# Cyan: 8be9fd +# Pink: ff79c6 # Syntax Highlighting Colors -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_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 +fish_color_normal f8f8f2 +fish_color_command 8be9fd +fish_color_keyword ff79c6 +fish_color_quote f1fa8c +fish_color_redirection f8f8f2 +fish_color_end ffb86c +fish_color_error ff5555 +fish_color_param bd93f9 +fish_color_comment 6272a4 +fish_color_selection --background=44475a +fish_color_search_match --background=44475a +fish_color_operator 50fa7b +fish_color_escape ff79c6 +fish_color_autosuggestion 6272a4 +fish_color_cancel ff5555 --reverse +fish_color_option ffb86c +fish_color_history_current --bold +fish_color_status ff5555 +fish_color_valid_path --underline + +# Default Prompt Colors +fish_color_cwd 50fa7b +fish_color_cwd_root red +fish_color_host bd93f9 +fish_color_host_remote bd93f9 +fish_color_user 8be9fd # Completion Pager Colors -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 +fish_pager_color_progress 6272a4 +fish_pager_color_background +fish_pager_color_prefix 8be9fd +fish_pager_color_completion f8f8f2 +fish_pager_color_description 6272a4 +fish_pager_color_selected_background --background=44475a +fish_pager_color_selected_prefix 8be9fd +fish_pager_color_selected_completion f8f8f2 +fish_pager_color_selected_description 6272a4 +fish_pager_color_secondary_background +fish_pager_color_secondary_prefix 8be9fd +fish_pager_color_secondary_completion f8f8f2 +fish_pager_color_secondary_description 6272a4 #+END_SRC ** Terminal