From 675c4b85ac1fe1277d75a2e862391752a994e449 Mon Sep 17 00:00:00 2001
From: Weslei Juan Moser Pereira <wesleimsr@gmail.com>
Date: Tue, 3 Sep 2024 09:37:18 -0300
Subject: [PATCH] updates

---
 .aliases                           |  3 --
 .config/wezterm/wezterm.lua        | 13 ++++--
 .gitconfig                         |  7 ++--
 .tmux.conf                         |  2 +-
 .tmux/themes/catppuccin.conf.theme | 64 ------------------------------
 .tmux/themes/gruvbox.conf.theme    | 51 ------------------------
 .zshrc                             | 20 +---------
 7 files changed, 16 insertions(+), 144 deletions(-)
 delete mode 100644 .tmux/themes/catppuccin.conf.theme
 delete mode 100644 .tmux/themes/gruvbox.conf.theme

diff --git a/.aliases b/.aliases
index 23a98a4..eac95df 100644
--- a/.aliases
+++ b/.aliases
@@ -10,9 +10,6 @@ alias grep='rg'
 alias :q='exit'
 alias v="nvim ."
 alias nv="nvim"
-alias cat="bat --plain"
-alias ls="exa"
-alias tree="exa -T"
 alias todos="rg --column --line-number --ignore-case --color=always -e '(TODO|FIXME)'"
 
 alias oss="~/OSS"
diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua
index b0b91d4..f06c3fb 100644
--- a/.config/wezterm/wezterm.lua
+++ b/.config/wezterm/wezterm.lua
@@ -1,14 +1,21 @@
 local wezterm = require("wezterm")
 
+local theme = "dark"
+
 local config = {}
 
 if wezterm.config_builder then
 	config = wezterm.config_builder()
 end
 
-config.color_scheme = "Tokyo Night (Gogh)"
-config.font = wezterm.font("JetBrainsMono Nerd Font")
-config.font_size = 14
+if theme == "light" then
+	config.color_scheme = "One Light (Gogh)"
+else
+	config.color_scheme = "Gruvbox Dark (Gogh)"
+end
+
+config.font = wezterm.font("IosevkaTerm Nerd Font")
+config.font_size = 16
 config.hide_tab_bar_if_only_one_tab = true
 
 config.keys = {
diff --git a/.gitconfig b/.gitconfig
index 176cdad..31eb322 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -11,12 +11,12 @@
 [core]
 	editor = vim
 	excludesfile = ~/.globalgitignore
-    pager = delta
+  pager = delta
 
 [delta]
+  dark = false
     navigate = true
     features = line-numbers decorations
-
     file-modified-label = modified:
 
 [delta "decorations"]
@@ -33,7 +33,7 @@
 
 [diff]
 	tool = vimdiff
-    colorMoved = default
+  colorMoved = default
 
 [github]
 	user = wesleimp
@@ -46,6 +46,7 @@
 	smudge = git-lfs smudge -- %f
 	process = git-lfs filter-process
 	required = true
+
 [pull]
 	rebase = false
 [init]
diff --git a/.tmux.conf b/.tmux.conf
index 5f6ea34..29be1d4 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -25,7 +25,7 @@ set-option -g bell-action none
 set-window-option -g monitor-activity on
 set-window-option -g automatic-rename on
 
-set-option -g default-shell /usr/bin/zsh
+set-option -g default-shell /bin/zsh
 
 set -g @continuum-restore 'off'
 
diff --git a/.tmux/themes/catppuccin.conf.theme b/.tmux/themes/catppuccin.conf.theme
deleted file mode 100644
index 7817e22..0000000
--- a/.tmux/themes/catppuccin.conf.theme
+++ /dev/null
@@ -1,64 +0,0 @@
-thm_bg="#1e2030"
-thm_fg="#cad3f5"
-thm_black="#15121c"
-thm_gray="#332e41"
-thm_magenta="#c6aae8"
-thm_pink="#e5b4e2"
-thm_red="#e38c8f"
-thm_green="#a6da95"
-thm_yellow="#ebddaa"
-thm_blue="#8aadf4"
-thm_orange="#f9c096"
-thm_black4="#575268"
-
-# =====================================================
-# Style
-# =====================================================
-set-option -g status "on"
-
-# default statusbar color
-set-option -g status-style bg="${thm_bg}",fg="${thm_fg}" # bg=bg1, fg=fg1
-
-# default window title colors
-set-window-option -g window-status-style bg="${thm_yellow}",fg="${thm_bg}" # bg=yellow, fg=bg1
-
-# default window with an activity alert
-set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3
-
-# active window title colors
-set-window-option -g window-status-current-style bg=${thm_red},fg=colour237 # fg=bg1
-
-# pane border
-set-option -g pane-active-border-style fg=${thm_blue} #fg2
-set-option -g pane-border-style fg=${thm_gray} #bg1
-
-# message infos
-set-option -g message-style bg=${thm_gray},fg=${thm_fg} # bg=bg2, fg=fg1
-
-# writing commands inactive
-set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1
-
-# pane number display
-set-option -g display-panes-active-colour colour250 #fg2
-set-option -g display-panes-colour colour237 #bg1
-
-# clock
-set-window-option -g clock-mode-colour colour109 #blue
-
-# bell
-set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg
-
-## Theme settings mixed with colors (unfortunately, but there is no cleaner way)
-set-option -g status-justify "left"
-set-option -g status-left-style none
-set-option -g status-left-length "80"
-set-option -g status-right-style none
-set-option -g status-right-length "80"
-set-window-option -g window-status-separator " "
-
-set-option -g status-left "#[bg="${thm_blue}",fg="${thm_gray}",italics] #S #[bg="${thm_bg}",fg="${thm_fg}",nobold,noitalics,nounderscore] "
-set-option -g status-right "#[bg=${thm_bg},fg=${thm_fg} nobold, nounderscore, noitalics] #[bg=${thm_bg},fg=${thm_green}] %d/%m/%Y - %H:%M%p"
-
-set-window-option -g window-status-current-format "#[bg=${thm_green},fg=${thm_gray},bold,noitalics,nounderscore] #I:#[bg=${thm_green},fg=${thm_gray},bold]#W#{?window_zoomed_flag,*Z,} #[bg=${thm_bg},fg=${thm_fg},nobold,noitalics,nounderscore]"
-set-window-option -g window-status-format "#[bg=${thm_gray},fg=${thm_magenta},noitalics]#[bg=${thm_bg},fg=${thm_green}] #I:#[bg=${thm_bg},fg=${thm_green}]#W #[bg=${thm_bg},fg=${thm_fg},noitalics]"
-
diff --git a/.tmux/themes/gruvbox.conf.theme b/.tmux/themes/gruvbox.conf.theme
deleted file mode 100644
index 2dda425..0000000
--- a/.tmux/themes/gruvbox.conf.theme
+++ /dev/null
@@ -1,51 +0,0 @@
-# =====================================================
-# Style
-# =====================================================
-set-option -g status "on"
-
-# default statusbar color
-set-option -g status-style bg=colour237,fg=colour223 # bg=bg1, fg=fg1
-
-# default window title colors
-set-window-option -g window-status-style bg=colour214,fg=colour237 # bg=yellow, fg=bg1
-
-# default window with an activity alert
-set-window-option -g window-status-activity-style bg=colour237,fg=colour248 # bg=bg1, fg=fg3
-
-# active window title colors
-set-window-option -g window-status-current-style bg=red,fg=colour237 # fg=bg1
-
-# pane border
-set-option -g pane-active-border-style fg=colour214 #fg2
-set-option -g pane-border-style fg=colour239 #bg1
-
-# message infos
-set-option -g message-style bg=colour239,fg=colour223 # bg=bg2, fg=fg1
-
-# writing commands inactive
-set-option -g message-command-style bg=colour239,fg=colour223 # bg=fg3, fg=bg1
-
-# pane number display
-set-option -g display-panes-active-colour colour250 #fg2
-set-option -g display-panes-colour colour237 #bg1
-
-# clock
-set-window-option -g clock-mode-colour colour109 #blue
-
-# bell
-set-window-option -g window-status-bell-style bg=colour167,fg=colour235 # bg=red, fg=bg
-
-## Theme settings mixed with colors (unfortunately, but there is no cleaner way)
-set-option -g status-justify "left"
-set-option -g status-left-style none
-set-option -g status-left-length "80"
-set-option -g status-right-style none
-set-option -g status-right-length "80"
-set-window-option -g window-status-separator " "
-
-set-option -g status-left "#[bg=colour109,fg=colour237,italics] #S #[bg=colour237,fg=colour241,nobold,noitalics,nounderscore] "
-set-option -g status-right "#[bg=colour237,fg=colour239 nobold, nounderscore, noitalics] #[bg=colour239,fg=colour109] %d/%m/%Y - %H:%M%p #[bg=colour239,fg=colour248,nobold,noitalics,nounderscore]#[bg=colour248,fg=colour237]"
-
-set-window-option -g window-status-current-format "#[bg=colour214,fg=colour237,nobold,noitalics,nounderscore] #I #[bg=colour214,fg=colour239,bold]#W#{?window_zoomed_flag,*Z,} #[bg=colour237,fg=colour214,nobold,noitalics,nounderscore]"
-set-window-option -g window-status-format "#[bg=colour214,fg=colour237,noitalics]#[bg=colour239,fg=colour223] #I #[bg=colour239,fg=colour223]#W #[bg=colour237,fg=colour239,noitalics]"
-
diff --git a/.zshrc b/.zshrc
index 2aee1e7..ed4394d 100644
--- a/.zshrc
+++ b/.zshrc
@@ -1,24 +1,6 @@
 export ZSH=$HOME/.oh-my-zsh
 
-ZSH_THEME="spaceship"
-ZSH_DISABLE_COMPFIX="true"
-SPACESHIP_PROMPT_ORDER=(
-  user          # Username section
-  dir           # Current directory section
-  host          # Hostname section
-  git           # Git section (git_branch + git_status)
-  exec_time     # Execution time
-  line_sep      # Line break
-  vi_mode       # Vi-mode indicator
-  jobs          # Background jobs indicator
-  exit_code     # Exit code section
-  char          # Prompt character
-)
-SPACESHIP_USER_SHOW=always
-SPACESHIP_DIR_TRUNC_REPO=false
-SPACESHIP_DIR_TRUNC=0
-SPACESHIP_PROMPT_ADD_NEWLINE=false
-SPACESHIP_PROMPT_SEPARATE_LINE=false
+ZSH_THEME="muse"
 
 plugins=(
     git