From 03bcb52a40ee65f3d8221ad0456d5ff45b3839a7 Mon Sep 17 00:00:00 2001 From: Mysy00 Date: Tue, 1 Dec 2020 00:52:54 +0100 Subject: [PATCH 1/2] Add fish shell template --- pywal/export.py | 1 + pywal/templates/colors.fish | 25 +++++++++++++++++++++++++ 2 files changed, 26 insertions(+) create mode 100644 pywal/templates/colors.fish diff --git a/pywal/export.py b/pywal/export.py index 47ea4d2..e7e315f 100644 --- a/pywal/export.py +++ b/pywal/export.py @@ -102,6 +102,7 @@ def get_export_type(export_type): "rofi": "colors-rofi.Xresources", "scss": "colors.scss", "shell": "colors.sh", + "fishshell": "colors.fish", "speedcrunch": "colors-speedcrunch.json", "sway": "colors-sway", "tty": "colors-tty.sh", diff --git a/pywal/templates/colors.fish b/pywal/templates/colors.fish new file mode 100644 index 0000000..28214da --- /dev/null +++ b/pywal/templates/colors.fish @@ -0,0 +1,25 @@ +set fish_color_normal normal +set fish_color_command {color1.strip} +set fish_color_param {color5.strip} +set fish_color_redirection $fish_color_param +set fish_color_comment {color8.strip} +set fish_color_error ff0000 +set fish_color_escape {color5.strip} +set fish_color_operator $fish_color_escape +set fish_color_end {color2.strip} +set fish_color_quote {color2.strip} +set fish_color_autosuggestion 555 brblack +set fish_color_user brgreen +set fish_color_host $fish_color_normal +set fish_color_valid_path --underline +set fish_color_cwd green +set fish_color_cwd_root red +set fish_color_match --background=brblue +set fish_color_search_match bryellow --background=brblack +set fish_color_selection white --bold --background=brblack +set fish_color_cancel -r +set fish_pager_color_prefix white --bold --underline +set fish_pager_color_completion +set fish_pager_color_description $fish_color_quote yellow +set fish_pager_color_progress brwhite --background=cyan +set fish_color_history_current --bold From 372692ada60bd3fe351409e09e3d543fc396de41 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Miko=C5=82aj=20Szczepa=C5=84ski?= Date: Fri, 16 Dec 2022 23:55:50 +0100 Subject: [PATCH 2/2] Add more color support, make it dynamic --- pywal/templates/colors.fish | 67 +++++++++++++++++++++++-------------- 1 file changed, 42 insertions(+), 25 deletions(-) diff --git a/pywal/templates/colors.fish b/pywal/templates/colors.fish index 28214da..a11bdc7 100644 --- a/pywal/templates/colors.fish +++ b/pywal/templates/colors.fish @@ -1,25 +1,42 @@ -set fish_color_normal normal -set fish_color_command {color1.strip} -set fish_color_param {color5.strip} -set fish_color_redirection $fish_color_param -set fish_color_comment {color8.strip} -set fish_color_error ff0000 -set fish_color_escape {color5.strip} -set fish_color_operator $fish_color_escape -set fish_color_end {color2.strip} -set fish_color_quote {color2.strip} -set fish_color_autosuggestion 555 brblack -set fish_color_user brgreen -set fish_color_host $fish_color_normal -set fish_color_valid_path --underline -set fish_color_cwd green -set fish_color_cwd_root red -set fish_color_match --background=brblue -set fish_color_search_match bryellow --background=brblack -set fish_color_selection white --bold --background=brblack -set fish_color_cancel -r -set fish_pager_color_prefix white --bold --underline -set fish_pager_color_completion -set fish_pager_color_description $fish_color_quote yellow -set fish_pager_color_progress brwhite --background=cyan -set fish_color_history_current --bold +# Fish variables +# Generated by 'wal' +set -U wallpaper "{wallpaper}" + +# Special +set -U background '{background}' +set -U foreground '{foreground}' +set -U cursor '{cursor}' + +# Colors +set -U color0 '{color0}' +set -U color1 '{color1}' +set -U color2 '{color2}' +set -U color3 '{color3}' +set -U color4 '{color4}' +set -U color5 '{color5}' +set -U color6 '{color6}' +set -U color7 '{color7}' +set -U color8 '{color8}' +set -U color9 '{color9}' +set -U color10 '{color10}' +set -U color11 '{color11}' +set -U color12 '{color12}' +set -U color13 '{color13}' +set -U color14 '{color14}' +set -U color15 '{color15}' + +# Shell colors +set -U fish_color_normal normal +set -U fish_color_command {color1.strip} +set -U fish_color_param {color5.strip} +set -U fish_pager_color_completion +set -U fish_pager_color_description $fish_color_quote yellow +set -U fish_pager_color_progress brwhite --background=cyan +set -U fish_color_history_current --bold + +# FZF colors +set -gx FZF_DEFAULT_OPTS " + $FZF_DEFAULT_OPTS + --color fg:7,bg:0,hl:1,fg+:232,bg+:1,hl+:255 + --color info:7,prompt:2,spinner:1,pointer:232,marker:1 +"