diff --git a/config/ghostty/config b/config/ghostty/config index 3de8d03..a1ca7c2 100644 --- a/config/ghostty/config +++ b/config/ghostty/config @@ -1,16 +1,13 @@ # --- Basics font-family = "IosevkaTermSlab Nerd Font Propo" +font-style = "Regular" 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 diff --git a/config/ghostty/themes/my-dark b/config/ghostty/themes/zenwritten-dark similarity index 96% rename from config/ghostty/themes/my-dark rename to config/ghostty/themes/zenwritten-dark index 40cae74..1fc0bd5 100644 --- a/config/ghostty/themes/my-dark +++ b/config/ghostty/themes/zenwritten-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/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 diff --git a/home/.zshrc b/home/.zshrc index 0957bc1..607a78a 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+\-$!*_=' @@ -61,7 +49,33 @@ 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)" +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)" +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 + +# 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