From a364800cf5b1780b2336b686e734d86e7967cddd Mon Sep 17 00:00:00 2001 From: "kujiu (@uberwald)" Date: Fri, 8 Sep 2023 15:52:05 +0200 Subject: [PATCH] Fix poezio + term type --- common/.config/fish/fish_variables | 44 +++++++++---------- .../.config/fish/functions/fish_prompt.fish | 1 - .../.config/fish/functions/update-homes.fish | 14 ++++-- common/.config/tmux/tmux.conf | 2 +- desktop/.config/neomutt/colors.conf | 6 +++ desktop/.config/poezio/poezio.cfg | 11 ++--- update-homes-secrets-example.fish | 3 ++ 7 files changed, 49 insertions(+), 32 deletions(-) diff --git a/common/.config/fish/fish_variables b/common/.config/fish/fish_variables index 0570da8..d1fffb4 100644 --- a/common/.config/fish/fish_variables +++ b/common/.config/fish/fish_variables @@ -50,25 +50,25 @@ SETUVAR fish_pager_color_selected_background:\x2d\x2dbackground\x3d2b3b51 SETUVAR fish_pager_color_selected_completion: SETUVAR fish_pager_color_selected_description: SETUVAR fish_pager_color_selected_prefix: -SETUVAR nightfox_black 393b44 -SETUVAR nightfox_red c94f6d -SETUVAR nightfox_green 81b29a -SETUVAR nightfox_yellow dbc074 -SETUVAR nightfox_blue 719cd6 -SETUVAR nightfox_magenta 9d79d6 -SETUVAR nightfox_cyan 63cdcf -SETUVAR nightfox_white dfdfe0 -SETUVAR nightfox_orange f4a261 -SETUVAR nightfox_pink d67ad2 -SETUVAR nightfox_comment 738091 -SETUVAR nightfox_bg0 131a24 -SETUVAR nightfox_bg1 192330 -SETUVAR nightfox_bg2 212e3f -SETUVAR nightfox_bg3 29394f -SETUVAR nightfox_bg4 39506d -SETUVAR nightfox_fg0 d6d6d7 -SETUVAR nightfox_fg1 cdcecf -SETUVAR nightfox_fg2 aeafb0 -SETUVAR nightfox_fg3 71839b -SETUVAR nightfox_sel0 2b3b51 -SETUVAR nightfox_sel1 3c5372 +SETUVAR nightfox_bg0:131a24 +SETUVAR nightfox_bg1:192330 +SETUVAR nightfox_bg2:212e3f +SETUVAR nightfox_bg3:29394f +SETUVAR nightfox_bg4:39506d +SETUVAR nightfox_black:393b44 +SETUVAR nightfox_blue:719cd6 +SETUVAR nightfox_comment:738091 +SETUVAR nightfox_cyan:63cdcf +SETUVAR nightfox_fg0:d6d6d7 +SETUVAR nightfox_fg1:cdcecf +SETUVAR nightfox_fg2:aeafb0 +SETUVAR nightfox_fg3:71839b +SETUVAR nightfox_green:81b29a +SETUVAR nightfox_magenta:9d79d6 +SETUVAR nightfox_orange:f4a261 +SETUVAR nightfox_pink:d67ad2 +SETUVAR nightfox_red:c94f6d +SETUVAR nightfox_sel0:2b3b51 +SETUVAR nightfox_sel1:3c5372 +SETUVAR nightfox_white:dfdfe0 +SETUVAR nightfox_yellow:dbc074 diff --git a/common/.config/fish/functions/fish_prompt.fish b/common/.config/fish/functions/fish_prompt.fish index c3b46f6..6a778e7 100755 --- a/common/.config/fish/functions/fish_prompt.fish +++ b/common/.config/fish/functions/fish_prompt.fish @@ -3,7 +3,6 @@ # description: based on Astronaut of Radu Potop and on Disco of Fabian Homborg, colors from Nightfox by EdenEast function fish_prompt --description 'Write out the prompt' - set_nightfox_vars set -f color_venv $nightfox_fg3 set -f color_bind normal set -f color_text $nightfox_bg0 diff --git a/common/.config/fish/functions/update-homes.fish b/common/.config/fish/functions/update-homes.fish index b39a075..a21af27 100755 --- a/common/.config/fish/functions/update-homes.fish +++ b/common/.config/fish/functions/update-homes.fish @@ -87,11 +87,18 @@ function update-homes -d "Update homes configuration" popd rm -rf ~/.cache/nvimpager-git + echo + echo + echo (set_color 719cd6)"*** Install fundle plugins ***"(set_color normal) + echo + fundle install + fundle update + echo echo echo (set_color 719cd6)"*** Install virtualfish ***"(set_color normal) echo - pip install --user --break-system-packages virtualfish + pip install --user --upgrade --break-system-packages virtualfish vf install compat_aliases projects environment end @@ -115,14 +122,14 @@ function update-homes -d "Update homes configuration" echo echo (set_color 719cd6)"*** Install poezio-omemo and epr ***"(set_color normal) echo - pip install --user --break-system-packages -U poezio-omemo epr-reader + pip install --user --upgrade --break-system-packages -U poezio-omemo epr-reader echo echo echo (set_color 719cd6)"*** Install poezio plugins ***"(set_color normal) echo rm -rf ~/.local/share/poezio/plugins - mkdir -p ~/.local/share/poezio + mkdir -p ~/.local/share/poezio/logs set -l poezio_version $(poezio --version | cut -d " " -f 2) rm -rf ~/.cache/poezio-git @@ -184,6 +191,7 @@ function update-homes -d "Update homes configuration" pushd $homes_path rsync --exclude=".*.swp" -av ./common/ ~/ popd + set_nightfox_vars end if test -d $homes_private_path/common pushd $homes_private_path diff --git a/common/.config/tmux/tmux.conf b/common/.config/tmux/tmux.conf index 5532a82..1884dae 100644 --- a/common/.config/tmux/tmux.conf +++ b/common/.config/tmux/tmux.conf @@ -16,7 +16,7 @@ set -g status-position top bind-key a send-prefix set -g display-time 1000 -set -g default-terminal tmux-256color +set -g default-terminal xterm-direct set -g mode-keys vi set -g status-keys vi set-option -g allow-rename off diff --git a/desktop/.config/neomutt/colors.conf b/desktop/.config/neomutt/colors.conf index 78b961b..58ace4a 100644 --- a/desktop/.config/neomutt/colors.conf +++ b/desktop/.config/neomutt/colors.conf @@ -1,3 +1,9 @@ +# Nightfox +# name: Nightfox +# license: MIT +# palette author: EdenEast +# initial author: EdenEast +# adapted by: Kujiu # Neonwolf Color Scheme for NeoMutt # Source: https://codeberg.org/h3xx/mutt-colors-neonwolf/raw/branch/main/mutt-colors-neonwolf-256.muttrc # Based mostly on the colors from the badwolf lightline theme diff --git a/desktop/.config/poezio/poezio.cfg b/desktop/.config/poezio/poezio.cfg index a5cc837..1751ebf 100644 --- a/desktop/.config/poezio/poezio.cfg +++ b/desktop/.config/poezio/poezio.cfg @@ -262,7 +262,7 @@ hide_user_list = true # If log_dir is not set, logs will be saved in $XDG_DATA_HOME/poezio/logs, # i.e. in ~/.local/share/poezio/logs/. So, you should specify the directory # you want to use instead. This directory will be created if it doesn't exist -#log_dir = +log_dir = REPLACEDATADIR/logs # Log the errors poezio encounters in log_dir/errors.log # A false value disables this option. @@ -271,11 +271,11 @@ hide_user_list = true # If plugins_dir is not set, plugins will be loaded from the plugins/ dir in the # poezio directory, then $XDG_DATA_HOME/poezio/plugins. # You can specify another directory to use. It will be created if it doesn't exist -#plugins_dir = +plugins_dir = REPLACEDATADIR/plugins # If plugins_conf_dir is not set, plugin configs will be loaded from # $XDG_CONFIG_HOME/poezio/plugins. You can specify another directory here. -#plugins_conf_dir = +plugins_conf_dir = REPLACECONFDIR/plugins # the full path to the photo (avatar) you want to use # it should be less than 16Ko @@ -283,6 +283,7 @@ hide_user_list = true # poezio's startup a little. Uncomment if you want the default avatar #photo = ../data/poezio_80.png +photo = REPLACEDATADIR/avatar.jpg # If you want to show all the tabs in the Tab bar, even those # with no activity, set to true. Else, set to false @@ -380,7 +381,7 @@ roster_show_offline = true # i.e. in ~/.local/share/poezio/themes/. So you should specify the directory you # want to use instead. This directory will be created at startup if it doesn't # exist -#themes_dir = +themes_dir = REPLACEDATADIR/themes # The name of the theme file that will be used. The file should be located # in the theme_dir directory. @@ -451,7 +452,7 @@ enable_avatars = true # The directory where the images will be saved; if unset, # defaults to $XDG_CACHE_HOME/poezio/images. -#tmp_image_dir = +tmp_image_dir = REPLACECACHEDIR/images # If set to true, use the nickname broadcasted by the user if none has been # set manually. diff --git a/update-homes-secrets-example.fish b/update-homes-secrets-example.fish index bd83052..16ea196 100755 --- a/update-homes-secrets-example.fish +++ b/update-homes-secrets-example.fish @@ -44,6 +44,9 @@ function update-homes-secrets -d "Update secrets for configuration of homes" sed -i "s/REPLACE_JID/template@example.com/g" ~/.config/poezio/poezio.cfg sed -i "s/KEYRING_ID/xmpp:template@example.com/g" ~/.config/poezio/poezio.cfg sed -i "s/KEYRING_USER/template@example.com/g" ~/.config/poezio/poezio.cfg + sed -i "s/REPLACEDATADIR/.local\/share\/poezio/g" ~/.config/poezio/poezio.cfg + sed -i "s/REPLACECONFDIR/.config\/poezio/g" ~/.config/poezio/poezio.cfg + sed -i "s/REPLACECACHEDIR/.cache\/poezio/g" ~/.config/poezio/poezio.cfg echo echo