diff --git a/.config/aerospace/aerospace.toml##template.j2 b/.config/aerospace/aerospace.toml##template.j2 index 33b5b17..facc83b 100644 --- a/.config/aerospace/aerospace.toml##template.j2 +++ b/.config/aerospace/aerospace.toml##template.j2 @@ -153,6 +153,10 @@ run = ['layout floating'] if.app-id = 'app.soulver.appstore.mac' run = ['layout floating'] +[[on-window-detected]] +if.app-id = 'com.mitchellh.ghostty' +run = [ 'layout tiling' ] + # 'main' binding mode declaration # See: https://nikitabobko.github.io/AeroSpace/guide#binding-modes # 'main' binding mode must be always presented diff --git a/.config/wezterm/wezterm.lua b/.config/wezterm/wezterm.lua index da36420..d38d432 100644 --- a/.config/wezterm/wezterm.lua +++ b/.config/wezterm/wezterm.lua @@ -7,7 +7,8 @@ return { window_decorations = "RESIZE", color_scheme = "Catppuccin Mocha", font = wezterm.font("IosevkaTerm NFP", { weight = "DemiBold", stretch = "Normal", style = "Normal" }), - font_size = 15, + -- font = wezterm.font("DepartureMono Nerd Font Mono", { weight = "Regular", stretch = "Normal", style = "Normal" }), + font_size = 14, freetype_load_target = "Light", freetype_load_flags = "DEFAULT", freetype_render_target = "Light", diff --git a/.config/zsh/asdf.zsh##template.j2 b/.config/zsh/asdf.zsh##template.j2 index 10f2ad7..8735399 100644 --- a/.config/zsh/asdf.zsh##template.j2 +++ b/.config/zsh/asdf.zsh##template.j2 @@ -18,7 +18,8 @@ export KERL_CONFIGURE_OPTIONS="$KERL_CONFIGURE_OPTIONS --enable-darwin-64bit" {% endif -%} # export CXXFLAGS="-ffat-lto-objects" -export CFLAGS="-O2 -ffat-lto-objects" +# export CFLAGS="-O2 -ffat-lto-objects" +export CFLAGS="" export LDFLAGS="" if which brew > /dev/null; then diff --git a/.config/zsh/git.zsh b/.config/zsh/git.zsh index 67dc558..86d53b8 100644 --- a/.config/zsh/git.zsh +++ b/.config/zsh/git.zsh @@ -1,7 +1,10 @@ alias ghm='git push heroku master' alias gpp='git pull origin "(git_current_branch)" && git push origin "(git_current_branch)"' alias gfap='git pull --all -p' -alias ly='lazygit --use-config-file "$HOME/.config/yadm/lazygit.yml,$HOME/Library/Application Support/lazygit/config.yml" --work-tree ~ --git-dir ~/.local/share/yadm/repo.git' + +alias lazygit='lazygit --use-config-file "$HOME/.config/lazygit/config.yml"' +alias lg='lazygit' +alias ly='lazygit --use-config-file "$HOME/.config/yadm/lazygit.yml,$HOME/.config/lazygit/config.yml" --work-tree ~ --git-dir ~/.local/share/yadm/repo.git' function gctest () { local branch="${1:-master}" @@ -35,10 +38,3 @@ function gie () { alias grc="git branch --merged | grep -v '\*' | grep -v master | grep -v stage | xargs -n 1 git branch -d" alias grcr="git fetch --all -p && git branch -r --merged | grep -v '\*' | grep origin | grep -v master | grep -v stage | sed 's/origin\//:/' | xargs -n 1 echo git push origin" - -alias lg="lazygit" - -krak () { - dir="$(cd "$(dirname "$1")"; pwd -P)/$(basename "$1")" - open gitkraken://repo/$dir -} diff --git a/.gitconfig##template b/.gitconfig##template index 055f88d..12014f1 100644 --- a/.gitconfig##template +++ b/.gitconfig##template @@ -20,7 +20,7 @@ [gpg "ssh"] program = "/Applications/1Password.app/Contents/MacOS/op-ssh-sign" allowedSignersFile = /Users/tedkulp/.ssh/allowed_signers -{% else -%} +{% else %} [core] pager = delta {% endif %}