Somehow got aliasrc working properly

3 files changed, 33 insertions, 26 deletions

diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index b0c76ee..3c2f7a5 100755
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -7,35 +7,36 @@
 [ -f "$XINITRC" ] && alias startx="startx $XINITRC"
 
 # sudo not required for some system commands.
-for x in mount unmount sv pacman updatedb su ; do
+for x in mount unmount sv pacman updatedb su reboot ; do
 	alias $x="sudo $x"
 done
 
 # Verbosity and settings that you pretty much just always are going to want.
 alias \
-	cp="cp -iv" \
-	mv="mv -iv" \
-	rm="rm -vI" \
-	bc="bc -ql" \
-	mkd="mkdir -pv" \
-	ffmpeg="ffmpeg -hide_banner"
+        cp="cp -iv" \
+        mv="mv -iv" \
+        rm="rm -vI" \
+        bc="bc -ql" \
+        mkd="mkdir -pv" \
+        ffmpeg="ffmpeg -hide_banner"
 
 alias \
-	ls="ls -hN --color=auto --group-directories-first" \
-	grep="grep --color=auto" \
-	diff="diff --color=auto" \
-	ccat="highlight --out-format=ansi"
+        ls="ls -hN --color=auto --group-directories-first" \
+        grep="grep --color=auto" \
+        diff="diff --color=auto" 
+#   ccat="highlight --out-format=ansi"
 
 # My aliases for different programs
-alias \ 
-	lg='lazygit' \
-	gpu-watch="watch -n -1 nvidia-smi" \
-	zshconfig="nvim ~/.zshrc" \
-	gp='git add . && git commit -m "auto push" && git push' \
-	zrc='nvim ~/.zshrc' \
-	zsource='source ~/.zshrc' \
-	v='nvim' \
-	vi='nvim' \
-	vim='nvim' \
-	config='/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME' \
-	tmux='tmux -f $HOME/.config/tmux/.tmux.conf'
+alias \
+        lg="lazygit" \
+        gpuwatch="watch -n1 nvidia-smi" \
+        zshconfig="nvim ~/.zshrc" \
+        zrc="nvim ~/.zshrc" \
+        zsource="source ~/.zshrc" \
+        sdn="sudo shutdown -h now" \
+        e="$EDITOR" \
+        v="$EDITOR" \
+        p="sudo pacman" \
+        config="/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME" \
+        tmux="tmux -f $HOME/.config/tmux/.tmux.conf" \
+        z="zathura" 
diff --git a/.config/shell/profile b/.config/shell/profile
index a78bc45..e1dbf52 100755
--- a/.config/shell/profile
+++ b/.config/shell/profile
@@ -23,10 +23,14 @@ export CARGO_HOME="${XDG_DATA_HOME:-$HOME/.local/share}/cargo"
 export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go"
 export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/history"
 export LESSHIST="-"
-
 # Other program settings:
 export FZF_DEFAULT_OPTS="--layout=reverse --height 40%"
 
+# pyenv
+export PYENV_ROOT="$HOME/.pyenv"
+export PATH="$PYENV_ROOT/bin:$PATH"
+eval "$(pyenv init --path)"
+
 if pacman -Qs libxft-bgra >/dev/null 2>&1; then
 	# Start graphical server on user's current tty if not already running.
 	[ "$(tty)" = "/dev/tty1" ] && ! pidof -s Xorg >/dev/null 2>&1 && exec startx "$XINITRC"
diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc
index dc398be..c39dc9d 100644
--- a/.config/zsh/.zshrc
+++ b/.config/zsh/.zshrc
@@ -1,7 +1,9 @@
 # ZSH config
+
 # Load plugins first
-[ -f $HOME/.config/zsh/plugins.zsh ] && source $HOME/.config/zsh/plugins.zsh
-[ -f $HOME/.config/zsh/functions.zsh ] && source $HOME/.config/zsh/functions.zsh
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/shell/aliasrc"
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/plugins.zsh" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/plugins.zsh"
+[ -f "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/functions.zsh" ] && source "${XDG_CONFIG_HOME:-$HOME/.config}/zsh/functions.zsh"
 
 # Uncomment the following line to use case-sensitive completion.
 CASE_SENSITIVE="true"