From a8fbf84c59c9380b8bcb212023e9990df4145dbd Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Tue, 9 Sep 2025 08:19:53 -0400 Subject: [PATCH 1/3] Update zshrc to separate mac and linux config. Update ghostty configuration --- config/ghostty/config | 6 ++++++ config/ghostty/themes/my-dark | 2 +- home/.zshrc | 32 ++++++++++++++++++++------------ 3 files changed, 27 insertions(+), 13 deletions(-) diff --git a/config/ghostty/config b/config/ghostty/config index 3de8d03..9a11707 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -1,5 +1,10 @@ # --- Basics font-family = "IosevkaTermSlab Nerd Font Propo" +font-style = "Regular" + +# Optional: make bold map to bright colors like iTerm2 + +bold-color = "#fefefe" font-size = 13 # Disable programming ligatures (same as your HarfBuzz flags) @@ -15,6 +20,7 @@ theme = my-dark # Font-size keybindings (match Ctrl+Shift+j/k from WezTerm) keybind = all:ctrl+shift+k=increase_font_size:1 keybind = all:ctrl+shift+j=decrease_font_size:1 +background-opacity = 1.0 # Optional: make the split divider visible (newer Ghostty) # split-divider-color = #444444 diff --git a/config/ghostty/themes/my-dark b/config/ghostty/themes/my-dark index 40cae74..1fc0bd5 100644 --- a/config/ghostty/themes/my-dark +++ b/config/ghostty/themes/my-dark @@ -1,5 +1,5 @@ # Colors = your WezTerm dark palette -foreground = #8e8e8e +foreground = #BBBBBB background = #191919 cursor-color = #BBBBBB cursor-text = #191919 diff --git a/home/.zshrc b/home/.zshrc index 0957bc1..2dd2689 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -14,7 +14,6 @@ bindkey -v zstyle :compinstall filename '/home/aselimov/.zshrc' export LS_COLORS='di=1;37:ln=35:so=32:pi=33:ex=1;32:bd=34;46:cd=34;43:su=30;41:sg=30;46:tw=30;42:ow=30;43' -alias ls="ls --classify --group-directories-first --color" #~/bin/daily_scripture.sh autoload -Uz compinit @@ -34,18 +33,7 @@ alias clip2png="xclip -selection clipboard -target image/png -out" function addbin(){ ln -s $PWD/$1 /home/aselimov/bin } -eval "$(starship init zsh)" -zstyle -e ':completion:*:hosts' hosts 'reply=( - ${=${${(f)"$(cat {/etc/ssh_,~/ar.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//,/ } - ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}} -)' -source "/home/aselimov/.config/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh" -source "/home/aselimov/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" -source "/home/aselimov/.config/zsh/zsh-history-substring-search/zsh-history-substring-search.zsh" - -bindkey '^[[A' history-substring-search-up -bindkey '^[[B' history-substring-search-down export XKB_DEFAULT_OPTIONS="caps:escape" export PASSWORD_STORE_CHARACTER_SET='a-zA-Z0-9+\-$!*_=' @@ -65,3 +53,23 @@ export PYENV_ROOT="$HOME/.pyenv" [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" eval "$(pyenv init - zsh)" +# Settings that need to swap between Mac and Linux +if [ "$(uname)" = "Darwin" ]; then + export PATH="$PATH:/opt/homebrew/bin" + alias ls="gls --classify --group-directories-first --color" +else + alias ls="ls --classify --group-directories-first --color" +fi + +eval "$(starship init zsh)" +zstyle -e ':completion:*:hosts' hosts 'reply=( + ${=${${(f)"$(cat {/etc/ssh_,~/ar.ssh/known_}hosts(|2)(N) 2>/dev/null)"}%%[#| ]*}//,/ } + ${=${${${${(@M)${(f)"$(cat ~/.ssh/config 2>/dev/null)"}:#Host *}#Host }:#*\**}:#*\?*}} +)' + +source "$HOME/.config/zsh/zsh-autosuggestions/zsh-autosuggestions.zsh" +source "$HOME/.config/zsh/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh" +source "$HOME/.config/zsh/zsh-history-substring-search/zsh-history-substring-search.zsh" + +bindkey '^[[A' history-substring-search-up +bindkey '^[[B' history-substring-search-down From a1a000db62a3e51d5223f20c2904f30b11fd5222 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Tue, 9 Sep 2025 08:23:53 -0400 Subject: [PATCH 2/3] Update theme names --- config/ghostty/config | 15 +++------------ .../ghostty/themes/{my-dark => zenwritten-dark} | 0 .../ghostty/themes/{my-light => zenwritten-light} | 0 3 files changed, 3 insertions(+), 12 deletions(-) rename config/ghostty/themes/{my-dark => zenwritten-dark} (100%) rename config/ghostty/themes/{my-light => zenwritten-light} (100%) diff --git a/config/ghostty/config b/config/ghostty/config index 9a11707..a1ca7c2 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -1,26 +1,17 @@ # --- Basics font-family = "IosevkaTermSlab Nerd Font Propo" font-style = "Regular" - -# Optional: make bold map to bright colors like iTerm2 - -bold-color = "#fefefe" font-size = 13 - -# Disable programming ligatures (same as your HarfBuzz flags) -# (-liga, -clig, -calt match your calt=0, clig=0, liga=0) -font-feature = -liga,-clig,-calt - -# Ghostty has no custom tab bar (uses native macOS tabs), so nothing to disable. +bold-color = "#fefefe" +background-opacity = 1.0 # Auto light/dark theme pair that matches your two palettes below #theme = dark:my-dark,light:my-light -theme = my-dark +theme = zenwritten-dark # Font-size keybindings (match Ctrl+Shift+j/k from WezTerm) keybind = all:ctrl+shift+k=increase_font_size:1 keybind = all:ctrl+shift+j=decrease_font_size:1 -background-opacity = 1.0 # Optional: make the split divider visible (newer Ghostty) # split-divider-color = #444444 diff --git a/config/ghostty/themes/my-dark b/config/ghostty/themes/zenwritten-dark similarity index 100% rename from config/ghostty/themes/my-dark rename to config/ghostty/themes/zenwritten-dark diff --git a/config/ghostty/themes/my-light b/config/ghostty/themes/zenwritten-light similarity index 100% rename from config/ghostty/themes/my-light rename to config/ghostty/themes/zenwritten-light From 10af352f4140dab542cd383922640a63f5363ce4 Mon Sep 17 00:00:00 2001 From: Alex Selimov Date: Tue, 9 Sep 2025 08:34:13 -0400 Subject: [PATCH 3/3] Additional config changes for compatibilty --- home/.zshrc | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/home/.zshrc b/home/.zshrc index 2dd2689..607a78a 100644 --- a/home/.zshrc +++ b/home/.zshrc @@ -49,16 +49,10 @@ export LD_LIBRARY_PATH="$LD_LIBRARY_PATH:/usr/local/cuda-12.8/lib64" [ -f "/home/aselimov/.ghcup/env" ] && . "/home/aselimov/.ghcup/env" # ghcup-env -export PYENV_ROOT="$HOME/.pyenv" -[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init - zsh)" - -# Settings that need to swap between Mac and Linux -if [ "$(uname)" = "Darwin" ]; then - export PATH="$PATH:/opt/homebrew/bin" - alias ls="gls --classify --group-directories-first --color" -else - alias ls="ls --classify --group-directories-first --color" +if [ $(which pyenv 2>&1 1>/dev/null) ]; then + export PYENV_ROOT="$HOME/.pyenv" + [[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" + eval "$(pyenv init - zsh)" fi eval "$(starship init zsh)" @@ -73,3 +67,15 @@ source "$HOME/.config/zsh/zsh-history-substring-search/zsh-history-substring-sea bindkey '^[[A' history-substring-search-up bindkey '^[[B' history-substring-search-down + +# Settings that need to swap between Mac and Linux +if [ "$(uname)" = "Darwin" ]; then + export PATH="$PATH:/opt/homebrew/bin" + alias ls="gls --classify --group-directories-first --color" + # I only start tmux by default on Mac because of dwm+swallow patch + if [[ -z "$TMUX" ]] && [[ -n "$PS1" ]]; then + tmux attach -t dev || tmux new -s dev + fi +else + alias ls="ls --classify --group-directories-first --color" +fi