From 52fb2ace608f9af5c8ee805db32fbffba7b627f7 Mon Sep 17 00:00:00 2001 From: Elizabeth Hunt Date: Sun, 2 Apr 2023 18:10:34 -0600 Subject: [PATCH] Machine specific config should be first --- .zshrc | 5 +++-- scripts/machine-specific-zsh/Lizzys-BasedBook.zsh | 2 -- scripts/machine-specific-zsh/mikasa.local.zsh | 11 +++++++++++ 3 files changed, 14 insertions(+), 4 deletions(-) delete mode 100644 scripts/machine-specific-zsh/Lizzys-BasedBook.zsh create mode 100644 scripts/machine-specific-zsh/mikasa.local.zsh diff --git a/.zshrc b/.zshrc index 86e1fd1..ed9e51c 100644 --- a/.zshrc +++ b/.zshrc @@ -1,3 +1,6 @@ +# Machine specific config +[ -f ~/scripts/machine-specific-zsh/$(hostname).zsh ] && source ~/scripts/machine-specific-zsh/$(hostname).zsh + export GPG_TTY=$(tty) export PATH=$PATH:$HOME/scripts:$HOME/.local/bin:$HOME/.rowswell/bin @@ -51,5 +54,3 @@ alias fuckctl="journalctl -fu" alias sbcl="rlwrap sbcl" alias spt="spt --tick-rate 12" -# Machine specific config -[ -f ~/scripts/machine-specific-zsh/$(hostname).zsh ] && source ~/scripts/machine-specific-zsh/$(hostname).zsh diff --git a/scripts/machine-specific-zsh/Lizzys-BasedBook.zsh b/scripts/machine-specific-zsh/Lizzys-BasedBook.zsh deleted file mode 100644 index d064cb6..0000000 --- a/scripts/machine-specific-zsh/Lizzys-BasedBook.zsh +++ /dev/null @@ -1,2 +0,0 @@ -# Ah, mac utils -export PATH=$PATH:/usr/local/opt/binutils/bin:/usr/local/opt/gnu-tar/libexec/gnubin:/usr/local/opt/grep/libexec/gnubin:/usr/local/opt/findutils/libexec/gnubin:/usr/local/opt/coreutils/libexec/gnubin:/usr/local/i386elfgcc/bin/ diff --git a/scripts/machine-specific-zsh/mikasa.local.zsh b/scripts/machine-specific-zsh/mikasa.local.zsh new file mode 100644 index 0000000..522caf1 --- /dev/null +++ b/scripts/machine-specific-zsh/mikasa.local.zsh @@ -0,0 +1,11 @@ +# Brew, gnuutils +export HOMEBREW_PREFIX="/opt/homebrew"; +export HOMEBREW_CELLAR="/opt/homebrew/Cellar"; +export HOMEBREW_REPOSITORY="/opt/homebrew"; +export PATH="/opt/homebrew/bin:/opt/homebrew/sbin${PATH+:$PATH}"; +export MANPATH="/opt/homebrew/share/man${MANPATH+:$MANPATH}:"; +export INFOPATH="/opt/homebrew/share/info:${INFOPATH:-}"; +export PATH="/opt/homebrew/opt/coreutils/libexec/gnubin:$PATH" + +# asdf +. /opt/homebrew/opt/asdf/libexec/asdf.sh