dotfiles

commit 62255ed6ecd3b6b8933a529c0250e60b7e9feb68
parent f635f34aa2eb34a737673615b0f06d8fa8db6c28
Author: Arne Swanson <nownpl@0111.click>
Date:   Sat, 11 Aug 2018 11:27:26 -0400

fixed home extravaganza

Diffstat:
mkfile
 | 
9
++++-----
zsh/.zprofile
 | 
2
+-
zsh/.zshrc
 | 
4
++--

3 files changed, 7 insertions(+), 8 deletions(-)
diff --git a/mkfile b/mkfile
@@ -2,15 +2,14 @@ first_run:
 	sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)"
 	# install plugins and themes
 	## geometry
-	git clone https://github.com/geometry-zsh/geometry ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/themes/geometry
+	git clone https://github.com/geometry-zsh/geometry "~/.oh-my-zsh/custom/themes/geometry"
 	## plugins
-	git clone https://github.com/zsh-users/zsh-autosuggestions ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/zsh-autosuggestions
-	git clone https://github.com/zdharma/history-search-multi-word ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/history-search-multi-word
-	git clone https://github.com/zdharma/fast-syntax-highlighting ${ZSH_CUSTOM:-~/.oh-my-zsh/custom}/plugins/fast-syntax-highlighting
+	git clone https://github.com/zsh-users/zsh-autosuggestions "~/.oh-my-zsh/custom/plugins/zsh-autosuggestions"
+	git clone https://github.com/zdharma/history-search-multi-word "~/.oh-my-zsh/custom/plugins/history-search-multi-word"
+	git clone https://github.com/zdharma/fast-syntax-highlighting "~/.oh-my-zsh/custom/plugins/fast-syntax-highlighting"
 
 install:
 	stow -t "$HOME" zsh
 	stow -t "$HOME" git
 	stow -t "$HOME" xorg
-	stow -t "$HOME/.config/fontconfig" fonts
 
diff --git a/zsh/.zprofile b/zsh/.zprofile
@@ -1,2 +1,2 @@
-rm -rf /home/nownpl/.tmp/*
+[[ -d "/home/$(whoami)/.tmp" ]] && rm -rf "/home/$(whoami)/.tmp/*"
 [[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx 
\ No newline at end of file
diff --git a/zsh/.zshrc b/zsh/.zshrc
@@ -1,5 +1,5 @@
 export PATH=$HOME/.bin:$PATH
-export ZSH="/home/nownpl/.oh-my-zsh"
+export ZSH="/home/$(whoami)/.oh-my-zsh"
 
 GEOMETRY_COLOR_EXIT_VALUE="red"
 GEOMETRY_COLOR_DIR="cyan"  
@@ -18,7 +18,7 @@ plugins=(
 )
 
 source $ZSH/oh-my-zsh.sh
-source $HOME/.cargo/env
+[[ -d "$HOME/.cargo" ]] && source $HOME/.cargo/env
 
 export LANG=en_US.UTF-8
 export ARCHFLAGS="-arch x86_64"