From 6a6186b934bfb8691f2776ab930685404308cd20 Mon Sep 17 00:00:00 2001 From: Anthony Cicchetti Date: Fri, 17 Jun 2022 13:35:52 -0400 Subject: [PATCH] updates --- hammerspoon/init.lua | 2 +- zsh/zshrc | 18 ++++++------------ 2 files changed, 7 insertions(+), 13 deletions(-) diff --git a/hammerspoon/init.lua b/hammerspoon/init.lua index ac781cf..cf85dd6 100644 --- a/hammerspoon/init.lua +++ b/hammerspoon/init.lua @@ -9,7 +9,7 @@ spoon.SpoonInstall:andUse("WindowHalfsAndThirds") spoon.SpoonInstall:andUse("Commander") spoon.SpoonInstall:andUse("ReloadConfiguration") -TERMINAL_NAME = "Wezterm" +TERMINAL_NAME = "WezTerm" spoon.WindowScreenLeftAndRight:bindHotkeys(spoon.WindowScreenLeftAndRight.defaultHotkeys) diff --git a/zsh/zshrc b/zsh/zshrc index 97fc272..3f6e3b2 100644 --- a/zsh/zshrc +++ b/zsh/zshrc @@ -1,10 +1,3 @@ -# Fig pre block. Keep at the top of this file. -export PATH="${PATH}:${HOME}/.local/bin" -if [[ $(whence -p fig 2> /dev/null) ]]; then - FIG_FOUND=1 - . "$HOME/.fig/shell/zshrc.pre.zsh" -fi - HISTFILE=~/.histfile HISTSIZE=10000 SAVEHIST=10000 @@ -22,6 +15,12 @@ export KEYTIMEOUT=1 typeset -U path typeset -U fpath +if [[ $(arch) == 'arm64' ]]; then + path+=('/opt/homebrew/bin') +else + path+=('/usr/local/bin') +fi + hash -d -- -dotfiles=~/.dotfiles hash -d -- -src=~/src hash -d -- -doom=~/.doom-emacs @@ -174,8 +173,3 @@ LS_PICKER="exa" for funcfile in $HOME/.zsh.d/* ; do source "${funcfile}" done - -if [[ $FIG_FOUND == 1 ]]; then - # Fig post block. Keep at the bottom of this file. - . "$HOME/.fig/shell/zshrc.post.zsh" -fi