Switch to tmux catpuccin theme

dot_tmux.conf.tmpl

@@ -71,24 +71,33 @@ setw -g aggressive-resize on
 set -g default-command {{ .shell }}
 set -g default-shell {{ .shell }}
 
-# status bar
 set-option -g status-position top
-set -g status-bg 'colour235'
+set -g @catppuccin_window_left_separator ""
-set -g status-fg 'colour223'
+set -g @catppuccin_window_right_separator " "
-set -g status-justify 'centre'
+set -g @catppuccin_window_middle_separator " █"
-set -g status-left-length '100'
+set -g @catppuccin_window_number_position "right"
-set -g status 'on'
+
-set -g status-right-length '100'
+set -g @catppuccin_window_default_fill "number"
-set -g status-left '#[fg=colour232,bg=colour154] #S #[fg=colour222,bg=colour238] #W #[fg=colour8,bg=colour237] #(whoami) '
+set -g @catppuccin_window_default_text "#W"
-set -g status-right '#[fg=colour8,bg=colour237] %H:%M %a %d #[fg=colour222,bg=colour238] #h #[fg=colour232,bg=colour154] {{ .status }} '
+
-setw -g window-status-format '#[default] #I #W '
+set -g @catppuccin_window_current_fill "number"
-setw -g window-status-current-format '#[fg=colour222,bg=colour238] #I  #W  #F '
+set -g @catppuccin_window_current_text "#W"
+
+set -g @catppuccin_status_modules_right "directory user host session"
+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}"
 
 # List of plugins
 set -g @plugin 'tmux-plugins/tmux-pain-control'
 set -g @plugin 'tmux-plugins/tmux-logging'
 set -g @plugin 'olimorris/tmux-pomodoro-plus'
 set -g @plugin "jlipps/tmux-safekill"
+set -g @plugin 'catppuccin/tmux'
 {{- if eq .chezmoi.os "openbsd" }}
 set -g @plugin 'tmux-plugins/tmux-battery'
 {{- end }}

dot_zshrc.tmpl

@@ -1,4 +1,4 @@
-eval $(keychain --eval --agents ssh id_rsa)
+eval $(keychain --eval --agents ssh id_ed25519)
 [ -f ~/.keychain/$HOSTNAME-sh ] && . ~/.keychain/$HOSTNAME-sh 2>/dev/null
 
 if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]; then
@@ -6,7 +6,6 @@ if [[ -r "${XDG_CACHE_HOME:-$HOME/.cache}/p10k-instant-prompt-${(%):-%n}.zsh" ]]
 fi
 
 ZSH=$HOME/.oh-my-zsh
-ZSH_THEME="powerlevel10k/powerlevel10k"
 
 ZSH_DISABLE_COMPFIX="true"
 # CASE_SENSITIVE="true"
@@ -23,67 +22,29 @@ zle -N zle-line-init
 zle -N zle-keymap-select
 export KEYTIMEOUT=1
 
-function ll {
-  cd "$(llama "$@")"
-}
-
 plugins={{ .plugins }}
 
 source $ZSH/oh-my-zsh.sh
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
 
 export PATH=/usr/local/bin:/usr/local/sbin:$PATH
 export LC_ALL=en_US.UTF-8
 export LANG=en_US.UTF-8
 export EDITOR='nvim'
 export GOPATH=$HOME/go
-export GPG_TTY=$TTY
 
-
+{{ if eq .chezmoi.os "darwin" }}
-{{- if eq .chezmoi.os "openbsd" }}
+source /opt/homebrew/share/powerlevel10k/powerlevel10k.zsh-theme
-export PORTSDIR_PATH=/usr/ports/:/usr/ports/openbsd-wip
-export PATH="$HOME/dev/src/ltex-ls-15.2.0/bin:$HOME/local/bin:$HOME/perl5/bin:$HOME/gems/bin:$HOME/.cargo/bin:$HOME/.yarn/bin:$PATH"
-export PERL5LIB=$HOME/perl5/lib/perl5
-export PERL_LOCAL_LIB_ROOT=$HOME/perl5
-export PERL_MB_OPT='--install_base "/home/jan/perl5"'
-export PERL_MM_OPT='INSTALL_BASE=/home/jan/perl5'
-export JAVA_HOME=/usr/local/jdk-11/
-export PMIX_MCA_gds='hash'
-
-alias top='htop'
-alias ctags='uctags'
-alias make='gmake'
-alias tar='gtar'
-alias man='manpager.sh'
-alias mutt='neomutt'
-alias dvim='doas nvim'
-alias ic='doas ifconfig'
-alias pq='doas pkg_info -Q'
-alias pa='doas pkg_add'
-alias pd='doas pkg_delete'
-alias lpr='/usr/local/bin/lpr'
-alias gpget='gopass -c'
-alias ruby='ruby30'
-alias gem='gem30'
-alias bundle='bundle30'
-alias mnt-net='doas mount_nfs -3 -a 4 -T -r 32768 -o noatime,nodev,noexec 192.168.178.10:/volume1/Data /mnt/nfs'
-alias umnt-net='doas umount /mnt/nfs'
-alias mnt-usb='doas mount /dev/sd1i /mnt/usb'
-alias umnt-usb='doas umount /mnt/usb'
-alias mnt-secret='doas mount dev/sd1c /mnt/encrypted_usb'
-alias umnt-secret='doas unmount /mnt/encrypted_usb'
-alias bkp-home='doas restic -r /mnt/nfs/BSD/restic-repo  --verbose backup --one-file-system /home/jan --exclude /home/jan/data'
-alias bkp-etc='doas restic -r /mnt/nfs/BSD/restic-repo  --verbose backup /etc'
-alias bkp-list='doas restic -r /mnt/nfs/BSD/restic-repo  snapshots'
-{{- else }}
 source $HOME/perl5/perlbrew/etc/bashrc
-export PATH=$HOME/local/bin:$GOPATH/bin:$PATH
 {{- if eq .chezmoi.arch "arm64" }}
 export PATH=/opt/homebrew/bin:$PATH
-{{- else }}
+{{ end }}
-export PATH=/usr/local/opt/sqlite/bin:/usr/local/opt/ruby/bin:/usr/local/opt/mariadb@10.4/bin:$PATH
+{{ end }}
-{{- end }}
+
-{{- end }}
+alias ld='eza -lD'
+alias lf='eza -lF --color=always | grep -v /'
+alias lh='eza -dl .* --group-directories-first'
+alias ll='eza -al --group-directories-first'
+alias ls='eza -alF --color=always --sort=size | grep -v /'
+alias lt='eza -al --sort=modified'
 
-# To customize prompt, run `p10k configure` or edit ~/.p10k.zsh.
 [[ ! -f ~/.p10k.zsh ]] || source ~/.p10k.zsh