diff --git a/desktop/configs/neofetch/config.conf b/desktop/configs/neofetch/config.conf index 199d70c..b721456 100644 --- a/desktop/configs/neofetch/config.conf +++ b/desktop/configs/neofetch/config.conf @@ -13,7 +13,7 @@ print_info() { info " ​ ​ ${cl4}██ kernel" kernel info " ​ ​ ${cl1}██ wm" wm info " ​ ​ ${cl7}██ uptime" uptime - info " ​ ​ ${cl3}██ packages" packages + info " ​ ​ ${cl11}██ packages" packages info cols } @@ -63,6 +63,10 @@ cyan="\033[1;36m" reset="\033[0m" bgyellow="\033[1;43;33m" bgwhite="\033[1;47;37m" + +F_BOLD="\033[1m" +C_GREY3="\033[38;5;232m" + cl0="${reset}" cl1="${magenta}" cl2="${green}" @@ -74,6 +78,7 @@ cl7="${cyan}" cl8="${black}" cl9="${bgyellow}" cl10="${bgwhite}" +cl11="${F_BOLD}${C_GREY3}" block_width=4 block_height=1 @@ -90,8 +95,8 @@ memory_display="on" battery_display="on" disk_display="on" -image_backend="kitty" -image_source="$HOME/pics/material" +image_backend="iterm2" +image_source="$HOME/pics/rh.jpg" image_size="300px" image_loop="off" diff --git a/desktop/configs/scripts/swww.sh b/desktop/configs/scripts/swww.sh index eb4226c..ed397b9 100755 --- a/desktop/configs/scripts/swww.sh +++ b/desktop/configs/scripts/swww.sh @@ -5,5 +5,12 @@ SWWW_TRANSITION="grow" swww-daemon & -sleep 0.5 && swww img -o DP-3 ~/pics/wallpapers/a\ carnival.jpg -swww img -o HDMI-A-1 ~/pics/wallpapers/the\ true\ old\ god.jpg +current_theme=$(readlink ~/.config/tmux/theme.conf) + +if [[ $current_theme == *tmux-white.conf ]]; then + swww img -o DP-3 ~/pics/wallpapers/HOLY.png + swww img -o HDMI-A-1 ~/pics/wallpapers/okw\ tf.jpg +else + swww img -o DP-3 ~/pics/wallpapers/a\ carnival.jpg + swww img -o HDMI-A-1 ~/pics/wallpapers/the\ true\ old\ god.jpg +fi diff --git a/desktop/configs/tmux/theme.conf b/desktop/configs/tmux/theme.conf new file mode 120000 index 0000000..d2b8604 --- /dev/null +++ b/desktop/configs/tmux/theme.conf @@ -0,0 +1 @@ +/yang/.config/tmux/tmux-white.conf \ No newline at end of file diff --git a/desktop/configs/tmux/tmux-red.conf b/desktop/configs/tmux/tmux-red.conf new file mode 100644 index 0000000..e45432d --- /dev/null +++ b/desktop/configs/tmux/tmux-red.conf @@ -0,0 +1,60 @@ +# status bar +set -g status-style fg=colour208,bg=colour232 +# set-option -g status-attr default +set-option -g status-position bottom +set-option -g status-interval 60 +set-option -g status-bg default +set-option -g status-fg colour249 + +# Left side of status bar +set-option -g status-left-length 10 +# set-option -g status-left "#[fg=colour249,bg=colour235] #S #[fg=default,bg=default] " +set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour88]  ,#[bg=colour234] #S }#[fg=default,bg=default] ' + +# Window status +set-option -g window-status-format "#[fg=colour249,bg=colour234] #I #[fg=colour249,bg=colour234] #W " +set-option -g window-status-current-format "#[fg=black,bg=colour88] #I #[fg=colour249,bg=colour234] #W " +set-option -g window-status-separator " " +set-option -g status-justify left + +# Right side of status bar +set-option -g status-right-length 200 +set -g status-right "#{playerctl_short} | #(whoami)@#h " +set -g @short_length "50" + +# set -g @short_length "30" +# set -g @short_append_chars "..." +# WEATHER='#(curl -s wttr.in/Berlin\?format\="%%t+%%C+%%w+%%m")' +# set-option -g status-right "#[fg=colour249,bg=colour88]🌡 BER #[fg=colour249,bg=colour234] $WEATHER #[fg=colour249,bg=colour88]  #[fg=colour249,bg=colour234] #(whoami)@#h " + +# pane border +set -g pane-border-style fg=colour238,bg=colour235 +set -g pane-active-border-style fg=colour88,bg=colour236 + +# Pane number indicator +set-option -g display-panes-colour colour234 +set-option -g display-panes-active-colour colour249 + +# Clock mode +# set-option -g clock-mode-colour colour249 +# set-option -g clock-mode-style 24 + +# Message +set -g message-style fg=default,bg=default + +# Activity +set-option -g monitor-activity on +set-option -g monitor-silence 0 +set-option -g monitor-bell on +set-option -g activity-action other +set-option -g visual-activity off + +# Window numbering +set-option -g base-index 1 +set-option -g pane-base-index 1 +set-option -g renumber-windows on + +# select default layout +set-option -g main-pane-width 65 +set-option -g main-pane-height 65 + diff --git a/desktop/configs/tmux/tmux-white.conf b/desktop/configs/tmux/tmux-white.conf new file mode 100644 index 0000000..49a450a --- /dev/null +++ b/desktop/configs/tmux/tmux-white.conf @@ -0,0 +1,51 @@ + +# status bar +set -g status-style fg=colour208,bg=white +# set-option -g status-attr default +set-option -g status-position bottom +set-option -g status-interval 60 +set-option -g status-bg default +set-option -g status-fg black + +# Left side of status bar +set-option -g status-left-length 10 +#set-option -g status-left "#[fg=brightblack,bg=colour255] #S #[fg=default,bg=default] " +set-option -g status-left '#{?client_prefix,#[bg=colour195]  ,#[bg=colour195] #S }#[fg=default,bg=default] ' + +# Window status +set-option -g window-status-format "#[fg=black,bg=white] #I #[fg=black,bg=white] #W " +set-option -g window-status-current-format "#[fg=brightblack,bg=colour195] #I #[fg=brightblack,bg=colour195] #W " +set-option -g window-status-separator " " +set-option -g status-justify left + +# Right side of status bar +set-option -g status-right-length 200 +set -g status-right "#{playerctl_short} | #(whoami)@#h " +set -g @short_length "50" + +# pane border +set -g pane-border-style fg=colour238,bg=colour235 +set -g pane-active-border-style fg=colour195,bg=colour236 + +# Pane number indicator +set-option -g display-panes-colour colour255 +set-option -g display-panes-active-colour brightblack + +# Message +set -g message-style fg=default,bg=default + +# Activity +set-option -g monitor-activity on +set-option -g monitor-silence 0 +set-option -g monitor-bell on +set-option -g activity-action other +set-option -g visual-activity on + +# Window numbering +set-option -g base-index 1 +set-option -g pane-base-index 1 +set-option -g renumber-windows on + +# select default layout +set-option -g main-pane-width 65 +set-option -g main-pane-height 65 diff --git a/desktop/configs/tmux/tmux.conf b/desktop/configs/tmux/tmux.conf index 921ad2e..8b556de 100644 --- a/desktop/configs/tmux/tmux.conf +++ b/desktop/configs/tmux/tmux.conf @@ -36,6 +36,9 @@ set-window-option -g mode-keys vi bind-key -T copy-mode-vi 'v' send -X begin-selection bind-key -T copy-mode-vi 'y' send -X copy-selection +set -ga update-environment 'KITTY_LISTEN_ON' +set -gq allow-passthrough on + unbind -T copy-mode-vi MouseDragEnd1Pane is_vim="ps -o state= -o comm= -t '#{pane_tty}' \ @@ -72,72 +75,6 @@ set -g @plugin 'richin13/tmux-plugin-playerctl' set-option -g set-titles on set-option -g set-titles-string "#S / #W" -# set -g @colors-solarized 'dark' -# set -g status off - - -# set bg -# set -g window-style 'fg=colour247,bg=colour2103' -# set -g window-active-style 'fg=colour244,bg=colour234' - -# status bar -set -g status-style fg=colour208,bg=colour237 -# set-option -g status-attr default -set-option -g status-position bottom -set-option -g status-interval 60 -set-option -g status-bg default -set-option -g status-fg white - -# Left side of status bar -set-option -g status-left-length 10 -#set-option -g status-left "#[fg=brightwhite,bg=colour234] #S #[fg=default,bg=default] " -set-option -g status-left '#{?client_prefix,#[bg=colour103]  ,#[bg=colour234] #S }#[fg=default,bg=default] ' - -# Window status -set-option -g window-status-format "#[fg=white,bg=colour234] #I #[fg=white,bg=colour234] #W " -set-option -g window-status-current-format "#[fg=brightwhite,bg=colour103] #I #[fg=brightwhite,bg=colour234] #W " -set-option -g window-status-separator " " -set-option -g status-justify left - -# Right side of status bar -set-option -g status-right-length 200 -set -g status-right "#{playerctl_short} | #(whoami)@#h " -set -g @short_length "50" - -# set -g @short_length "30" -# set -g @short_append_chars "..." -# WEATHER='#(curl -s wttr.in/Berlin\?format\="%%t+%%C+%%w+%%m")' -# set-option -g status-right "#[fg=brightwhite,bg=colour103]🌡 BER #[fg=brightwhite,bg=colour234] $WEATHER #[fg=brightwhite,bg=colour103]  #[fg=brightwhite,bg=colour234] #(whoami)@#h " - -# pane border -set -g pane-border-style fg=colour238,bg=colour235 -set -g pane-active-border-style fg=colour103,bg=colour236 - -# Pane number indicator -set-option -g display-panes-colour colour234 -set-option -g display-panes-active-colour brightwhite - -# Clock mode -# set-option -g clock-mode-colour white -# set-option -g clock-mode-style 24 - -# Message -set -g message-style fg=default,bg=default - -# Activity -set-option -g monitor-activity on -set-option -g monitor-silence 0 -set-option -g monitor-bell on -set-option -g activity-action other -set-option -g visual-activity on - -# Window numbering -set-option -g base-index 1 -set-option -g pane-base-index 1 -set-option -g renumber-windows on - -# select default layout -set-option -g main-pane-width 65 -set-option -g main-pane-height 65 +source ~/.config/tmux/theme.conf run '~/.config/tmux/plugins/tpm/tpm' diff --git a/desktop/configs/wezterm/wezterm.lua b/desktop/configs/wezterm/wezterm.lua index fbb6c85..3986603 100644 --- a/desktop/configs/wezterm/wezterm.lua +++ b/desktop/configs/wezterm/wezterm.lua @@ -103,5 +103,7 @@ return { window_frame = { active_titlebar_bg = "#45475a", font = font_with_fallback(font_name, { bold = true }) }, -- color_scheme_dirs = { "~/.config/wezterm/colors" }, - color_scheme = "Fahrenheit", + + -- color_scheme = "Solarized Light (Gogh)", + color_scheme = "Solarized Light (Gogh)", }