From ef56d4b1f44536f67db25da03c29449e32253dff Mon Sep 17 00:00:00 2001
From: Lucas Barbieri <lucasbarbieri.c@gmail.com>
Date: Tue, 23 Jul 2024 18:30:20 -0300
Subject: [PATCH] feat(laptop): add solarized colorscheme

---
 laptop/configs/tmux/.config/tmux/plugins/tpm  |  2 +-
 laptop/configs/tmux/.config/tmux/theme.conf   |  2 +-
 .../.config/tmux/themes/tmux-catppuccin.conf  | 25 ++++++++
 .../.config/tmux/themes/tmux-everforest.conf  |  4 ++
 .../tmux/{ => themes}/tmux-melange.conf       |  0
 .../tmux/{ => themes}/tmux-monochrome.conf    | 10 ++--
 .../.config/tmux/{ => themes}/tmux-red.conf   |  2 +-
 .../tmux/{ => themes}/tmux-solarized.conf     |  2 +-
 .../.config/tmux/{ => themes}/tmux-white.conf |  2 +-
 .../configs/tmux/.config/tmux/tmux-black.conf | 60 -------------------
 laptop/configs/tmux/.config/tmux/tmux.conf    | 13 ++--
 .../configs/tofi/.config/tofi/solarized.conf  |  3 +
 laptop/configs/tofi/.config/tofi/theme.conf   |  2 +-
 .../.config/wezterm/colors/solarized_jbx.toml | 21 +++++++
 .../wezterm/.config/wezterm/wezterm.lua       |  2 +-
 15 files changed, 71 insertions(+), 79 deletions(-)
 create mode 100644 laptop/configs/tmux/.config/tmux/themes/tmux-catppuccin.conf
 create mode 100644 laptop/configs/tmux/.config/tmux/themes/tmux-everforest.conf
 rename laptop/configs/tmux/.config/tmux/{ => themes}/tmux-melange.conf (100%)
 rename laptop/configs/tmux/.config/tmux/{ => themes}/tmux-monochrome.conf (81%)
 rename laptop/configs/tmux/.config/tmux/{ => themes}/tmux-red.conf (98%)
 rename laptop/configs/tmux/.config/tmux/{ => themes}/tmux-solarized.conf (96%)
 rename laptop/configs/tmux/.config/tmux/{ => themes}/tmux-white.conf (97%)
 delete mode 100644 laptop/configs/tmux/.config/tmux/tmux-black.conf
 create mode 100644 laptop/configs/tofi/.config/tofi/solarized.conf
 create mode 100644 laptop/configs/wezterm/.config/wezterm/colors/solarized_jbx.toml

diff --git a/laptop/configs/tmux/.config/tmux/plugins/tpm b/laptop/configs/tmux/.config/tmux/plugins/tpm
index fc412cb..99469c4 160000
--- a/laptop/configs/tmux/.config/tmux/plugins/tpm
+++ b/laptop/configs/tmux/.config/tmux/plugins/tpm
@@ -1 +1 @@
-Subproject commit fc412cbdf765175ea9f3380db6b9e1b1603a68a7
+Subproject commit 99469c4a9b1ccf77fade25842dc7bafbc8ce9946
diff --git a/laptop/configs/tmux/.config/tmux/theme.conf b/laptop/configs/tmux/.config/tmux/theme.conf
index e8f33ec..3e3a0c7 120000
--- a/laptop/configs/tmux/.config/tmux/theme.conf
+++ b/laptop/configs/tmux/.config/tmux/theme.conf
@@ -1 +1 @@
-/home/lucas/.config/tmux/tmux-monochrome.conf
\ No newline at end of file
+/home/lucas/.config/tmux/themes/tmux-monochrome.conf
\ No newline at end of file
diff --git a/laptop/configs/tmux/.config/tmux/themes/tmux-catppuccin.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-catppuccin.conf
new file mode 100644
index 0000000..804da57
--- /dev/null
+++ b/laptop/configs/tmux/.config/tmux/themes/tmux-catppuccin.conf
@@ -0,0 +1,25 @@
+set -g @plugin 'catppuccin/tmux'
+set -g @catppuccin_flavour 'mocha'
+
+set -g @catppuccin_window_left_separator ""
+set -g @catppuccin_window_right_separator " "
+set -g @catppuccin_window_middle_separator " █"
+set -g @catppuccin_window_number_position "right"
+
+set -g @catppuccin_window_default_fill "number"
+set -g @catppuccin_window_default_text "#W"
+
+set -g @catppuccin_window_current_fill "number"
+set -g @catppuccin_window_current_text "#W"
+
+set -g @catppuccin_status_modules_right ""
+set -g @catppuccin_status_left_separator  " "
+set -g @catppuccin_status_right_separator ""
+set -g @catppuccin_status_right_separator_inverse "no"
+set -g @catppuccin_status_fill "icon"
+set -g @catppuccin_status_connect_separator "no"
+
+set -g @catppuccin_directory_text "#{pane_current_path}"
+
+set -g status-position top
+
diff --git a/laptop/configs/tmux/.config/tmux/themes/tmux-everforest.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-everforest.conf
new file mode 100644
index 0000000..2d5d8e9
--- /dev/null
+++ b/laptop/configs/tmux/.config/tmux/themes/tmux-everforest.conf
@@ -0,0 +1,4 @@
+set -g @plugin 'bobcats/everforest-tmux'
+set -g @everforest_theme 'dark-hard'
+
+set -g status-right "#{playerctl_short} | #(whoami)@#h "
diff --git a/laptop/configs/tmux/.config/tmux/tmux-melange.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-melange.conf
similarity index 100%
rename from laptop/configs/tmux/.config/tmux/tmux-melange.conf
rename to laptop/configs/tmux/.config/tmux/themes/tmux-melange.conf
diff --git a/laptop/configs/tmux/.config/tmux/tmux-monochrome.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-monochrome.conf
similarity index 81%
rename from laptop/configs/tmux/.config/tmux/tmux-monochrome.conf
rename to laptop/configs/tmux/.config/tmux/themes/tmux-monochrome.conf
index 4a4f90f..3c072ea 100644
--- a/laptop/configs/tmux/.config/tmux/tmux-monochrome.conf
+++ b/laptop/configs/tmux/.config/tmux/themes/tmux-monochrome.conf
@@ -1,5 +1,5 @@
 # status bar
-set -g status-style fg=colour15,bg=colour235
+set -g status-style fg=colour15,bg=colour0
 # set-option -g status-attr default
 set-option -g status-position bottom
 set-option -g status-interval 60
@@ -9,11 +9,11 @@ set-option -g status-fg colour249
 # Left side of status bar
 set-option -g status-left-length 20
 # set-option -g status-left "#[fg=colour249,bg=colour235] #S #[fg=default,bg=default] "
-set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour4]   ,#[bg=colour234] #S }#[fg=default,bg=default] '
+set-option -g status-left '#{?client_prefix,#[fg=black]#[bg=colour241]   ,#[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=colour4] #I #[fg=colour249,bg=colour234] #W "
+set-option -g window-status-current-format "#[fg=black,bg=colour241] #I #[fg=colour249,bg=colour234] #W "
 set-option -g window-status-separator " "
 set-option -g status-justify left
 
@@ -25,11 +25,11 @@ 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=colour4]🌡 BER #[fg=colour249,bg=colour234] $WEATHER #[fg=colour249,bg=colour4]   #[fg=colour249,bg=colour234] #(whoami)@#h "
+# set-option -g status-right "#[fg=colour249,bg=colour241]🌡 BER #[fg=colour249,bg=colour234] $WEATHER #[fg=colour249,bg=colour241]   #[fg=colour249,bg=colour234] #(whoami)@#h "
 
 # pane border
 set -g pane-border-style fg=colour238,bg=colour235
-set -g pane-active-border-style fg=colour4,bg=colour236
+set -g pane-active-border-style fg=colour241,bg=colour236
 
 # Pane number indicator
 set-option -g display-panes-colour colour234
diff --git a/laptop/configs/tmux/.config/tmux/tmux-red.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-red.conf
similarity index 98%
rename from laptop/configs/tmux/.config/tmux/tmux-red.conf
rename to laptop/configs/tmux/.config/tmux/themes/tmux-red.conf
index e45432d..6e567d8 100644
--- a/laptop/configs/tmux/.config/tmux/tmux-red.conf
+++ b/laptop/configs/tmux/.config/tmux/themes/tmux-red.conf
@@ -7,7 +7,7 @@ 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-length 20
 # 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] '
 
diff --git a/laptop/configs/tmux/.config/tmux/tmux-solarized.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-solarized.conf
similarity index 96%
rename from laptop/configs/tmux/.config/tmux/tmux-solarized.conf
rename to laptop/configs/tmux/.config/tmux/themes/tmux-solarized.conf
index 33e97fa..14cc1e0 100644
--- a/laptop/configs/tmux/.config/tmux/tmux-solarized.conf
+++ b/laptop/configs/tmux/.config/tmux/themes/tmux-solarized.conf
@@ -19,7 +19,7 @@ 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 status-right "#{playerctl_short} | #(whoami)@#h | #(date +%H:%M) "
 set -g @short_length "50"
 
 # set -g @short_length "30"
diff --git a/laptop/configs/tmux/.config/tmux/tmux-white.conf b/laptop/configs/tmux/.config/tmux/themes/tmux-white.conf
similarity index 97%
rename from laptop/configs/tmux/.config/tmux/tmux-white.conf
rename to laptop/configs/tmux/.config/tmux/themes/tmux-white.conf
index 49a450a..64680ed 100644
--- a/laptop/configs/tmux/.config/tmux/tmux-white.conf
+++ b/laptop/configs/tmux/.config/tmux/themes/tmux-white.conf
@@ -8,7 +8,7 @@ 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-length 20
 #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] '
 
diff --git a/laptop/configs/tmux/.config/tmux/tmux-black.conf b/laptop/configs/tmux/.config/tmux/tmux-black.conf
deleted file mode 100644
index d66b814..0000000
--- a/laptop/configs/tmux/.config/tmux/tmux-black.conf
+++ /dev/null
@@ -1,60 +0,0 @@
-# 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=colour99]   ,#[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=colour99] #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=colour99]🌡 BER #[fg=colour249,bg=colour234] $WEATHER #[fg=colour249,bg=colour99]   #[fg=colour249,bg=colour234] #(whoami)@#h "
-
-# pane border
-set -g pane-border-style fg=colour238,bg=colour235
-    set -g pane-active-border-style fg=colour99,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/laptop/configs/tmux/.config/tmux/tmux.conf b/laptop/configs/tmux/.config/tmux/tmux.conf
index 0ebfa47..1d9eefe 100644
--- a/laptop/configs/tmux/.config/tmux/tmux.conf
+++ b/laptop/configs/tmux/.config/tmux/tmux.conf
@@ -4,6 +4,7 @@ bind-key C-a send-prefix
 
 set -g default-terminal "tmux-256color"
 set-option -sa terminal-overrides ",xterm-kitty:RGB"
+set-option -ga terminal-overrides ",xterm-256color:Tc"
 
 unbind C-o
 bind C-o display-popup -E "~/.cargo/bin/tms"
@@ -65,16 +66,14 @@ set -g @plugin 'tmux-plugins/tpm'
 set -g @plugin 'tmux-plugins/tmux-sensible'
 set -g @plugin 'richin13/tmux-plugin-playerctl'
 
-# set -g @plugin 'tmux-plugins/tmux-resurrect'
-# set -g @plugin 'tmux-plugins/tmux-continuum'
-# set -g @resurrect-capture-pane-contents 'on'
-# set -g @continuum-restore 'on'
-
-# set -g set-titles-string '#{pane_title}
-
 set-option -g set-titles on
 set-option -g set-titles-string "#S / #W"
 
+
 source ~/.config/tmux/theme.conf
 
+set -g visual-bell off
+set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm'  # undercurl support
+set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m'  # underscore colours - needs tmux-3.0
+set -g status-position top
 run '~/.config/tmux/plugins/tpm/tpm'
diff --git a/laptop/configs/tofi/.config/tofi/solarized.conf b/laptop/configs/tofi/.config/tofi/solarized.conf
new file mode 100644
index 0000000..cbbd8c6
--- /dev/null
+++ b/laptop/configs/tofi/.config/tofi/solarized.conf
@@ -0,0 +1,3 @@
+background-color = #002b36BB
+text-color = #839496
+selection-color = #859900
diff --git a/laptop/configs/tofi/.config/tofi/theme.conf b/laptop/configs/tofi/.config/tofi/theme.conf
index 85f5613..5ae5e5a 120000
--- a/laptop/configs/tofi/.config/tofi/theme.conf
+++ b/laptop/configs/tofi/.config/tofi/theme.conf
@@ -1 +1 @@
-/home/lucas/.config/tofi/monochrome.conf
\ No newline at end of file
+/home/lucas/.config/tofi/solarized.conf
\ No newline at end of file
diff --git a/laptop/configs/wezterm/.config/wezterm/colors/solarized_jbx.toml b/laptop/configs/wezterm/.config/wezterm/colors/solarized_jbx.toml
new file mode 100644
index 0000000..104da66
--- /dev/null
+++ b/laptop/configs/wezterm/.config/wezterm/colors/solarized_jbx.toml
@@ -0,0 +1,21 @@
+[colors]
+# The default text color
+foreground = "#839496"
+# The default background color
+background = "#002b36"
+# Overrides the cell background color when the current cell is occupied by the
+# cursor and the cursor style is set to Block
+cursor_bg = "#839496"
+# Overrides the text color when the current cell is occupied by the cursor
+cursor_fg = "#002b36"
+# Specifies the border color of the cursor when the cursor style is set to Block,
+# or the color of the vertical or horizontal bar when the cursor style is set to
+# Bar or Underline.
+cursor_border = "#268bd2"
+# the foreground color of selected text
+selection_fg = "#002b36"
+# the background color of selected text
+selection_bg = "#839496"
+
+ansi = ["#073642", "#dc322f", "#859900", "#b58900", "#268bd2", "#d33682", "#2aa198", "#eee8d5"]
+brights = ["#002b36", "#cb4b16", "#586e75", "#657b83", "#839496", "#6c71c4", "#93a1a1", "#fdf6e3"]
diff --git a/laptop/configs/wezterm/.config/wezterm/wezterm.lua b/laptop/configs/wezterm/.config/wezterm/wezterm.lua
index 950ca65..0660a0a 100644
--- a/laptop/configs/wezterm/.config/wezterm/wezterm.lua
+++ b/laptop/configs/wezterm/.config/wezterm/wezterm.lua
@@ -108,5 +108,5 @@ return {
 
     color_scheme_dirs = { "~/.config/wezterm/colors" },
 
-    color_scheme = "monochrome_glorb"
+    color_scheme = "solarized_jbx"
 }