Commit c093190
Changed files (5)
.config
.wraith
scripts
.config/matugen/templates/terminal-sequences
@@ -0,0 +1,26 @@
+]4;0;{{colors.surface.dark.hex}}
+\]4;8;{{colors.surface_container_high.dark.hex}}
+\]4;1;{{colors.error.dark.hex | auto_lightness: 15 }}
+\]4;9;{{colors.error.dark.hex | auto_lightness: 10 }}
+\]4;2;{{colors.tertiary.dark.hex | auto_lightness: 25 }}
+\]4;10;{{colors.tertiary.dark.hex | auto_lightness: 10 }}
+\]4;3;{{colors.tertiary.dark.hex | auto_lightness: 20 }}
+\]4;11;{{colors.tertiary_fixed.dark.hex | auto_lightness: 10 }}
+\]4;4;{{colors.secondary.dark.hex | auto_lightness: 25 }}
+\]4;12;{{colors.secondary.dark.hex | auto_lightness: 10 }}
+\]4;5;{{colors.secondary.dark.hex | auto_lightness: 20 }}
+\]4;13;{{colors.secondary_fixed.dark.hex| auto_lightness: 10 }}
+\]4;6;{{colors.primary.dark.hex | auto_lightness: 10 }}
+\]4;14;{{colors.primary.dark.hex | auto_lightness: -5 }}
+\]4;7;{{colors.on_surface_variant.dark.hex}}
+\]4;15;{{colors.on_surface.dark.hex}}
+\]11;{{colors.surface.dark.hex}}
+\]19;{{colors.surface.dark.hex}}
+\]4;232;{{colors.surface.dark.hex}}
+\]4;257;{{colors.surface.dark.hex}}
+\]708;{{colors.surface.dark.hex}}
+\]10;{{colors.on_surface.dark.hex}}
+\]17;{{colors.on_surface.dark.hex}}
+\]4;256;{{colors.on_surface.dark.hex}}
+\]12;{{colors.on_surface.dark.hex}}
+\]13;{{colors.on_surface.dark.hex}}
.config/matugen/config.toml
@@ -18,3 +18,18 @@ output_path = '~/.config/rofi/colors.rasi'
input_path = "~/.config/matugen/templates/colors.css"
output_path = "~/.config/swaync/colors.css"
post_hook = "swaync-client -rs"
+
+[templates.ghostty]
+input_path = '~/.config/matugen/templates/ghostty'
+output_path = '~/.config/ghostty/themes/Matugen'
+post_hook = 'pkill -SIGUSR2 ghostty'
+
+[templates.tmux]
+input_path = '~/.config/matugen/templates/tmux-colors.conf'
+output_path = '~/.config/tmux/generated.conf'
+post_hook = 'tmux source-file ~/.config/tmux/tmux.conf'
+
+[templates.terminal-sequences]
+input_path = '~/.config/matugen/templates/terminal-sequences'
+output_path = "~/.cache/terminal-sequences"
+post_hook = "sed -i '/]11;/d' ~/.cache/terminal-sequences && cat ~/.cache/terminal-sequences > /dev/pts/[0-9]*"
.config/tmux/tmux.conf
@@ -44,46 +44,44 @@ set -g mode-keys vi
set -g automatic-rename on
set -g automatic-rename-format "#(~/.wraith/scripts/tmux-window-name.sh '#{pane_current_command}' '#{pane_current_path}' '#{pane_title}' '#{HOME}')"
-# Catppuccin theme settings
-set -g @catppuccin_flavor "mocha"
-set -g @catppuccin_status_background "#1e1e2e"
-set -g @catppuccin_window_status_style "rounded"
-
-set -g @catppuccin_window_number_position "left"
-set -g @catppuccin_window_text " #W"
-set -g @catppuccin_window_current_fill "number"
-set -g @catppuccin_window_current_text " "
-
-set -g @catppuccin_status_left_separator ""
-set -g @catppuccin_status_right_separator ""
-set -g @catppuccin_status_right_separator_inverse "no"
-set -g @catppuccin_status_left_separator_inverse "no"
-set -g @catppuccin_status_fill "icon"
-set -g @catppuccin_status_connect_separator "no"
-
-set -g @catppuccin_date_time_icon " "
-set -g @catppuccin_date_time_text " %I:%M %p"
-
-# PLUGINS
+# Load generated theme configuration
+source-file ~/.config/tmux/generated.conf
+
+# Status Bar Appearance
+set -g window-style 'bg=default'
+set -g window-active-style 'bg=default'
+set -g status-bg default
+set -g status-style bg=default
+
+set -g window-status-format "#[fg=#{E:@thm_text_variant}]#[fg=#{E:@thm_surface},bg=#{E:@thm_text_variant}]#I #[fg=#{E:@thm_primary},bg=#{E:@thm_surface}] #W#[fg=#{E:@thm_surface},bg=default]"
+set -g window-status-current-format "#[fg=#{E:@thm_primary}]#[fg=#{E:@thm_surface},bg=#{E:@thm_primary}]#I #[fg=#{E:@thm_primary},bg=#{E:@thm_surface}] #[fg=#{E:@thm_surface},bg=default]"
+
+# Status Bar Length
+set -g status-left-length 40
+set -g status-right-length 40
+
+# Status Left Modules
+set -g status-left ""
+set -ag status-left "#{?client_prefix,#[bg=default]#[fg=@thm_fg] ⌨ ,}"
+set -ag status-left "#{?#{==:#{pane_mode},copy-mode},#[bg=default]#[fg=@thm_fg] ,}"
+
+# Status Right Modules:wraith
+set -g status-right "#(~/.wraith/scripts/tmux-git-status.sh '#{pane_current_path}') "
+set -ag status-right "#[fg=#{E:@thm_primary}]#[fg=#{E:@thm_surface},bg=#{E:@thm_primary}] #[fg=#{E:@thm_primary},bg=#{E:@thm_surface}] %I:%M %p#[fg=#{E:@thm_surface},bg=default]"
+
+# Plugins
set -g @plugin 'tmux-plugins/tpm'
-set -g @plugin 'catppuccin/tmux'
set -g @plugin 'tmux-plugins/tmux-resurrect'
-# set -g @plugin 'tmux-plugins/tmux-continuum'
+#set -g @plugin 'catppuccin/tmux'
+# tmux-resurrect Settings
set -g @resurrect-strategy-nvim 'session' # Restore neovim sessions
set -g @resurrect-capture-pane-contents 'on' # Restore pane contents (scrollback)
set -g @resurrect-save-shell-history 'on' # Save shell history
-# Auto install tpm before running
+# Auto install TPM if not present
if "test ! -d ~/.config/tmux/plugins/tpm" \
"run 'git clone https://github.com/tmux-plugins/tpm ~/.config/tmux/plugins/tpm && ~/.config/tmux/plugins/tpm/bin/install_plugins'"
run '~/.config/tmux/plugins/tpm/tpm'
-set -g status-left-length 100
-set -g status-right-length 100
-set -g status-left ""
-set -ag status-left "#{?client_prefix,#[bg=#1e1e2e]#[fg=#cdd6f4] ⌨ ,}"
-set -ag status-left "#{?#{==:#{pane_mode},copy-mode},#[bg=#1e1e2e]#[fg=#cdd6f4] ,}"
-set -g status-right "#(~/.wraith/scripts/tmux-git-status.sh '#{pane_current_path}') "
-set -ag status-right "#{E:@catppuccin_status_date_time}
.config/zsh/init.zsh
@@ -9,11 +9,13 @@ zstyle ':completion:*' special-dirs true
zstyle ':completion:*' use-cache on
zstyle ':completion:*' cache-path ~/.cache/zsh_cache
+# ANSI colors from matugen
+[[ -f ~/.cache/terminal-sequences ]] && (cat ~/.cache/terminal-sequences &)
+
# Prompts
autoload -U colors && colors
PROMPT='%{${fg_bold[blue]}%}%{$fg_bold[green]%}%{$fg[cyan]%}%c%{$fg_bold[red]%} ➜%{$fg_bold[blue]%} % %{$reset_color%}'
-
eval "$($HOME/.local/bin/mise activate zsh)"
eval "$(zoxide init --cmd cd zsh)"
eval "$(keychain -q --ssh-agent-socket $HOME/.ssh/agent.sock --eval github homelab aur)"
.wraith/scripts/tmux-git-status.sh
@@ -1,6 +1,10 @@
#!/bin/bash
CURRENT_DIR="$1"
+fg=$(tmux show -gv @thm_fg)
+bg=$(tmux show -gv @thm_bg)
+surface=$(tmux show -gv @thm_surface)
+primary=$(tmux show -gv @thm_primary)
# Check if we're in a git repo
cd "$CURRENT_DIR" || exit 1
@@ -17,22 +21,22 @@ STAGED=$(git diff --cached --numstat 2>/dev/null | wc -l | tr -d ' ')
MODIFIED=$(git diff --numstat 2>/dev/null | wc -l | tr -d ' ')
UNTRACKED=$(git ls-files --others --exclude-standard 2>/dev/null | wc -l | tr -d ' ')
-OUTPUT="#[fg=#fab387]#[fg=#181825,bg=#fab387]#[fg=#11111b,bg=#fab387] #[fg=#fab387,bg=#292a3b]#[fg=#cdd6f4,bg=#292a3b] ${BRANCH}"
+OUTPUT="#[fg=$primary]#[fg=#11111b,bg=$primary] #[fg=$fg,bg=$surface] ${BRANCH}"
if [ "$STAGED" -gt 0 ] || [ "$MODIFIED" -gt 0 ] || [ "$UNTRACKED" -gt 0 ]; then
if [ "$STAGED" -gt 0 ]; then
- OUTPUT+=" #[fg=#a6e3a1,bg=#292a3b]S:${STAGED}"
+ OUTPUT+="#[fg=#a6e3a1,bg=$surface] S:${STAGED}"
fi
if [ "$MODIFIED" -gt 0 ]; then
- OUTPUT+=" #[fg=#f9e2af,bg=#292a3b]M:${MODIFIED}"
+ OUTPUT+="#[fg=#f9e2af,bg=$surface] M:${MODIFIED}"
fi
if [ "$UNTRACKED" -gt 0 ]; then
- OUTPUT+=" #[fg=#89b4fa,bg=#292a3b]U:${UNTRACKED}"
+ OUTPUT+="#[fg=#89b4fa,bg=$surface] U:${UNTRACKED}"
fi
fi
-OUTPUT+="#[fg=#292a3b,bg=#181825]"
+OUTPUT+="#[fg=$surface,bg=default]"
echo "$OUTPUT"