From 276affe557e2df1ff2089540ff63d38051d79ed8 Mon Sep 17 00:00:00 2001
From: Gustaf Rydholm <gustaf.rydholm@gmail.com>
Date: Sat, 23 Sep 2023 00:34:31 +0200
Subject: Update shell

---
 .config/shell/aliasrc   | 31 +++++++++++++++++++------------
 .config/shell/variables |  8 ++++++--
 2 files changed, 25 insertions(+), 14 deletions(-)

diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc
index a2d2373..718a740 100755
--- a/.config/shell/aliasrc
+++ b/.config/shell/aliasrc
@@ -8,7 +8,7 @@
 
 # sudo not required for some system commands.
 for x in mount unmount sv pacman updatedb su reboot; do
-	alias $x="doas $x"
+	alias "$x=doas $x"
 done
 
 # Verbosity and settings that you pretty much just always are going to want.
@@ -34,14 +34,24 @@ alias \
 	e="$EDITOR" \
 	v="$EDITOR" \
 	p="sudo pacman" \
-  dots="/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME" \
-  npm="fnm" \
-  z="zathura" \
-  mbsync="mbsync -c $MBSYNCRC" \
-  monerod="monerod --data-dir "$XDG_DATA_HOME"/bitmonero" \
-  wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts" \
-  hss="hugo server --noHTTPCache" \
-  tmux="tmux -u"
+	dots="/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME" \
+	npm="fnm" \
+	z="zathura" \
+	mbsync="mbsync -c $MBSYNCRC" \
+	monerod="monerod --data-dir ""$XDG_DATA_HOME/bitmonero" \
+	wget="wget --hsts-file=$XDG_DATA_HOME/wget-hsts" \
+	hss="hugo server --noHTTPCache" \
+	tmux="tmux -u"
+
+# git
+alias \
+	gw="git worktree" \
+	gc="git commit" \
+	ga="git add" \
+	gm="git merge" \
+	gco="git checkout" \
+	gl="git log" \
+	gb="git branch -a"
 
 # Pushing to multiple git repositories
 alias gua="git remote | xargs -L1 git push --all"
@@ -49,6 +59,3 @@ alias dua="dots remote | xargs -L1 git --git-dir=$HOME/dotfiles/ --work-tree=$HO
 
 # Doas smooth transition
 alias sudo="doas"
-
-# Haskell formatter
-alias fourmolu="$HOME/.local/share/cabal/bin/fourmolu"
diff --git a/.config/shell/variables b/.config/shell/variables
index 29b932f..d54f961 100644
--- a/.config/shell/variables
+++ b/.config/shell/variables
@@ -27,6 +27,9 @@ export CABAL_CONFIG="$XDG_CONFIG_HOME/cabal/config"
 export CABAL_DIR="$XDG_DATA_HOME/cabal"
 export CABAL_BUILDDIR="$XDG_CACHE_HOME/cabal"
 
+# Haskell formatter
+export PATH="$HOME/.local/share/cabal/bin/fourmolu:$PATH"
+
 # Ocaml
 export OPAMROOT="$XDG_CONFIG_HOME/opam"
 
@@ -47,8 +50,9 @@ export RUSTUP_HOME="$XDG_DATA_HOME"/rustup
 export PATH="${XDG_DATA_HOME:-$HOME/.local/share}/cargo/bin:$PATH"
 
 # Cuda
-export PATH="/opt/cuda/bin:$PATH"
-export LD_LIBRARY_PATH="/opt/cuda/lib64:$LD_LIBRARY_PATH"
+export PATH="/opt/cuda-11.7/bin:$PATH"
+export LD_LIBRARY_PATH="/opt/cuda-11.7/extras/CUPTI/lib64:$LD_LIBRARY_PATH"
+export LD_LIBRARY_PATH="/opt/cuda-11.7/lib64:$LD_LIBRARY_PATH"
 export CUDA_CACHE_PATH="$XDG_CACHE_HOME"/nv
 
 # Haskell
-- 
cgit v1.2.3-70-g09d2