From 72f0e41648bb7cc1917f678d2aceb67a9b425b6f Mon Sep 17 00:00:00 2001 From: tiago Date: Thu, 14 Mar 2024 22:36:48 +0000 Subject: [PATCH] more theme related things --- .config/fish/fish_variables | 42 +++++++++++++++++++ .../fish/themes/gruvbox-material-dark.theme | 4 +- .config/i3/config | 8 +++- .../nvim/lua/tsousa/plugins/colorscheme.lua | 2 +- .config/rofi/config.rasi | 2 +- .config/tmux/tmux.conf | 2 +- .local/share/scripts/theme-selector.sh | 8 ++-- 7 files changed, 57 insertions(+), 11 deletions(-) create mode 100644 .config/fish/fish_variables diff --git a/.config/fish/fish_variables b/.config/fish/fish_variables new file mode 100644 index 0000000..966aa68 --- /dev/null +++ b/.config/fish/fish_variables @@ -0,0 +1,42 @@ +# This file contains fish universal variable definitions. +# VERSION: 3.0 +SETUVAR __fish_initialized:3400 +SETUVAR fish_color_autosuggestion:8F3F71 +SETUVAR fish_color_cancel:\x1d +SETUVAR fish_color_command:89B482 +SETUVAR fish_color_comment:D3869B +SETUVAR fish_color_cwd:\x1d +SETUVAR fish_color_cwd_root:red +SETUVAR fish_color_end:E78A4E +SETUVAR fish_color_error:EA6962 +SETUVAR fish_color_escape:7DAEA3 +SETUVAR fish_color_gray:6e738d +SETUVAR fish_color_history_current:\x2d\x2dbold +SETUVAR fish_color_host:\x1d +SETUVAR fish_color_host_remote:\x1d +SETUVAR fish_color_keyword:7DAEA3 +SETUVAR fish_color_normal:D4BE98 +SETUVAR fish_color_operator:A9B665 +SETUVAR fish_color_option:\x1d +SETUVAR fish_color_param:D3869B +SETUVAR fish_color_quote:D8A657 +SETUVAR fish_color_redirection:D4BE98 +SETUVAR fish_color_search_match:\x2d\x2dbackground\x3d504945 +SETUVAR fish_color_selection:\x2d\x2dbackground\x3d504945 +SETUVAR fish_color_status:ed8796 +SETUVAR fish_color_user:\x1d +SETUVAR fish_color_valid_path:\x2d\x2dunderline +SETUVAR fish_pager_color_background:\x1d +SETUVAR fish_pager_color_completion:D4BE98 +SETUVAR fish_pager_color_description:8F3F71 +SETUVAR fish_pager_color_prefix:89B482 +SETUVAR fish_pager_color_progress:8F3F71 +SETUVAR fish_pager_color_secondary_background:\x1d +SETUVAR fish_pager_color_secondary_completion:\x1d +SETUVAR fish_pager_color_secondary_description:\x1d +SETUVAR fish_pager_color_secondary_prefix:\x1d +SETUVAR fish_pager_color_selected_background:\x1d +SETUVAR fish_pager_color_selected_completion:\x1d +SETUVAR fish_pager_color_selected_description:\x1d +SETUVAR fish_pager_color_selected_prefix:\x1d +SETUVAR fish_user_paths:/opt/google\x2dcloud\x2dcli/bin\x1e/home/tsousa/\x2econfig/emacs/bin\x1e/home/tsousa/\x2ecargo/bin\x1e/home/tsousa/\x2erustup/toolchains/stable\x2dx86_64\x2dunknown\x2dlinux\x2dgnu/bin\x1e/home/tsousa/\x2elocal/share/nvim/mason/bin diff --git a/.config/fish/themes/gruvbox-material-dark.theme b/.config/fish/themes/gruvbox-material-dark.theme index f6cbf71..bd31e28 100644 --- a/.config/fish/themes/gruvbox-material-dark.theme +++ b/.config/fish/themes/gruvbox-material-dark.theme @@ -4,9 +4,9 @@ fish_color_keyword 7DAEA3 fish_color_quote D8A657 fish_color_redirection D4BE98 fish_color_end E78A4E -fish_color_error red +fish_color_error EA6962 fish_color_param D3869B -fish_color_comment purple +fish_color_comment D3869B fish_color_selection --background=504945 fish_color_search_match --background=504945 fish_color_operator A9B665 diff --git a/.config/i3/config b/.config/i3/config index 941d87f..dacc103 100644 --- a/.config/i3/config +++ b/.config/i3/config @@ -12,6 +12,7 @@ set $mod Mod1 set $mod2 Mod4 set $browser firefox set $terminal st +set $theme_selector $HOME/.local/share/scripts/theme-selector.sh # Font for window titles. Will also be used by the bar unless a different font # is used in the bar {} block below. @@ -81,6 +82,9 @@ bindsym $mod+d exec --no-startup-id rofi -show drun # start power menu (rofi) bindsym $mod+p exec --no-startup-id $HOME/.config/rofi/applets/bin/powermenu.sh +# theme selector +bindsym $mod+Shift+t exec --no-startup-id $theme_selector + # launch a browser bindsym $mod+b exec --no-startup-id $browser # change focus @@ -118,7 +122,7 @@ bindsym $mod+f fullscreen toggle # change container layout (stacked, tabbed, toggle split) bindsym $mod+s layout stacking -bindsym $mod+w layout tabbed +bindsym $mod+t layout tabbed bindsym $mod+e layout toggle split # toggle tiling / floating @@ -191,7 +195,7 @@ set_from_resource $black i3wm.color0 #181926 set_from_resource $border i3wm.border #ED8796 # target title bg fg indicator border -client.focused $white $bg $fg $lightyellow $border +client.focused $white $fg $bg $lightyellow $border client.focused_inactive $white $bg $fg $lightyellow $black client.unfocused $white $bg $fg $lightyellow $black client.urgent $red $bg $fg $white $red diff --git a/.config/nvim/lua/tsousa/plugins/colorscheme.lua b/.config/nvim/lua/tsousa/plugins/colorscheme.lua index 4d68081..4fc8244 100644 --- a/.config/nvim/lua/tsousa/plugins/colorscheme.lua +++ b/.config/nvim/lua/tsousa/plugins/colorscheme.lua @@ -1,4 +1,4 @@ -local color = "catppuccin" +local color = "gruvbox-material" local background = "dark" local transparency = false function SetColor() diff --git a/.config/rofi/config.rasi b/.config/rofi/config.rasi index 248b7fd..e8136a0 100644 --- a/.config/rofi/config.rasi +++ b/.config/rofi/config.rasi @@ -98,7 +98,7 @@ configuration { } /*****----- Global Properties -----*****/ -@import "~/.config/rofi/colors/catppuccin-dark.rasi" +@import "~/.config/rofi/colors/gruvbox-material-dark.rasi" * { border-colour: var(foreground); diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index b6dc075..ff1dae3 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -4,7 +4,7 @@ set -ag terminal-overrides ",*:RGB" unbind C-b set-option -g prefix C-a bind-key C-a send-prefix -set -g status-style 'bg=#24273A fg=#CAD3F5' +set -g status-style 'bg=#282828 fg=#D4BE98' set-option -g status-position top set-option -g status-right "" set -g status-left-length 20 diff --git a/.local/share/scripts/theme-selector.sh b/.local/share/scripts/theme-selector.sh index e5c2921..852f003 100755 --- a/.local/share/scripts/theme-selector.sh +++ b/.local/share/scripts/theme-selector.sh @@ -9,8 +9,8 @@ theme_options=( ) # rofi script to get what theme to use -chosen=$(printf '%s\n' "${theme_options[@]}" | rofi -dmenu -p "Theme") -if [[ -z $chosen ]]; then +chosen=$(printf '%s\n' "${theme_options[@]}" | rofi -dmenu -p "Theme" -theme-str "configuration {show-icons:false;}") +if [[ $chosen == "-" ]]; then exit 1 fi theme=$(echo "${chosen}" | rev | cut -d- -f2- | rev) @@ -45,9 +45,9 @@ tmux source "$HOME/.config/tmux/tmux.conf" # change dunst # change fish -fish_config theme choose "$chosen" +fish -c "echo 'y' | fish_config theme save '${chosen}'" -# maybe change gtk theme?? +# maybe change gtk theme?? and discord?? # recompile i3 i3-msg restart