Skip to content

Commit

Permalink
Commit msgs dont matter here
Browse files Browse the repository at this point in the history
  • Loading branch information
tdeebswihart committed Aug 2, 2020
1 parent efc7b72 commit 02f333f
Show file tree
Hide file tree
Showing 3 changed files with 12 additions and 9 deletions.
8 changes: 6 additions & 2 deletions doom.d/config.el
Original file line number Diff line number Diff line change
Expand Up @@ -29,7 +29,11 @@

;; If you use `org' and don't want your org files in the default location below,
;; change `org-directory'. It must be set before org loads!
(setq org-directory "~/org/")
(defvar beorg-path "~/Library/Mobile Documents/iCloud~com~appsonthemove~beorg/Documents/org")

(if (file-exists-p beorg-path)
(setq org-directory beorg-path)
(setq org-directory "~/notes"))

;; This determines the style of line numbers in effect. If set to `nil', line
;; numbers are disabled. For relative line numbers, set this to `relative'.
Expand Down Expand Up @@ -262,7 +266,7 @@ _s-k_: Kill all buffers _p_: sw

(setq avy-keys '(?a ?o ?e ?u ?i ?d ?h ?t ?n ?s))

; Some handy leader bindings from my old custom config
; Some handy leader bindings from my old custom config
(map! :leader
:desc "Switch to buffer" "d" #'switch-to-buffer
:desc "Find file" "e" #'counsel-find-file
Expand Down
3 changes: 3 additions & 0 deletions zsh/darwin.sh
Original file line number Diff line number Diff line change
Expand Up @@ -54,4 +54,7 @@ if [ $(uname -s) = "Darwin" ]; then
watchman -- trigger \"${target}\" \"${name}\" -- python3 $(which watchman-process-files.py)
}

test -e "${HOME}/.iterm2_shell_integration.zsh" && source "${HOME}/.iterm2_shell_integration.zsh"


fi
10 changes: 3 additions & 7 deletions zsh/path.sh
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
__maybe_append () {
__maybe_prepend () {
# Add each argument to basepath (our first argument) if it exists
test -z "$1" && echo ""
local basepath="$1"
Expand All @@ -24,7 +24,7 @@ case $(uname -s) in
Darwin)
# since /usr/local is managed by homebrew (and it complains about "unmanaged" pkgs, I use $HOME/.local
BASEPATH="$HOME/homebrew/sbin:$HOME/homebrew/bin:/usr/local/bin:/usr/local/sbin:/usr/bin:/bin:/usr/sbin:/sbin:"
BASEPATH=$(__maybe_append "$BASEPATH" "/opt/X11/bin" "/Library/TeX/texbin" "$HOME/macports/bin" "$HOME/Library/Python/3.7/bin" "/Applications/kitty.app/Contents/MacOS")
BASEPATH=$(__maybe_prepend "$BASEPATH" "/opt/X11/bin" "/Library/TeX/texbin" "$HOME/macports/bin" "$HOME/Library/Python/3.7/bin" "/Applications/kitty.app/Contents/MacOS")

if [ -z "$JAVA_HOME" -a -d /System/Library/Frameworks/JavaVM.framework/Home ]; then
export JAVA_HOME="/System/Library/Frameworks/JavaVM.framework/Home"
Expand All @@ -48,18 +48,14 @@ case $(uname -s) in
fi
esac

BASEPATH=$(__maybe_append "$BASEPATH" "$HOME/.cabal/bin" "$HOME/.cargo/bin" "$HOME/.nimble/bin")
BASEPATH=$(__maybe_prepend "$BASEPATH" "$HOME/.cabal/bin" "$HOME/.cargo/bin" "$HOME/.nimble/bin" "$HOME/.cargo/bin")
if [[ ! -z "$GOPATH" ]]; then
if [[ -d "$GOPATH/bin" ]]; then
# Only add go it if GOPATH is nonempty
BASEPATH="$GOPATH/bin:$BASEPATH"
fi
fi

[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
test -f ~/.asdf/asdf.sh && source ~/.asdf/asdf.sh
test -f ~/.asdf/completions/asdf.bash && source ~/.asdf/completions/asdf.bash


#Setting path -- my local prefix comes first *always*
PATH="$HOME/.local/bin:$BASEPATH"
Expand Down

0 comments on commit 02f333f

Please sign in to comment.