From 0b931aa6f85f114576af03d90d6e628fca665697 Mon Sep 17 00:00:00 2001
From: katherine <shmibs@shmibbles.me>
Date: Sat, 8 Apr 2017 18:33:52 -0700
Subject: linting

---
 .config/init/submodules/make-gif |  2 +-
 .vimrc                           |  4 ----
 .zshrc                           | 35 +++++++++++++++++------------------
 3 files changed, 18 insertions(+), 23 deletions(-)

diff --git a/.config/init/submodules/make-gif b/.config/init/submodules/make-gif
index cb26d5d..f8d771b 160000
--- a/.config/init/submodules/make-gif
+++ b/.config/init/submodules/make-gif
@@ -1 +1 @@
-Subproject commit cb26d5ddb9dc81143f95690c940efb2bfe15cf27
+Subproject commit f8d771bfdf924b424724134efe9db9e7e6d2262c
diff --git a/.vimrc b/.vimrc
index 650fb7f..8daf1a9 100644
--- a/.vimrc
+++ b/.vimrc
@@ -129,10 +129,6 @@ set title
 "spelling
 set spelllang=en_gb
 
-"gvim-specific settings
-set guifont=Tamsyn\ 11
-set guioptions=aegimt
-
 "visual marker for overflowing the 80th column
 highlight Column80 ctermbg=black
 call matchadd('Column80', '\%81v', 100)
diff --git a/.zshrc b/.zshrc
index 2a0964c..848413f 100644
--- a/.zshrc
+++ b/.zshrc
@@ -140,28 +140,28 @@ bindkey '^N' down-history
 
 alias :q='exit'
 
-if [[ "$(whence vim)" != "" ]] then
+if [[ ! -z $(whence vim) ]] then
 	export EDITOR='vim'
 	alias svim='sudo -E vim'
 	alias svimdiff='sudo -E vim -d'
 fi
 
-if [[ "$(whence nvim)" != "" ]] then
+if [[ ! -z $(whence nvim) ]] then
 	alias svim='sudo -E nvim'
 	alias svimdiff='sudo -E nvim -d'
 	alias vim='nvim'
 	export EDITOR='nvim'
 fi
 
-[[ "$(whence sdcv)" != "" ]] && alias def='sdcv'
-[[ "$(whence mpv)" != "" ]] && alias dvd='mpv --deinterlace=yes dvd://'
-[[ "$(whence herbstclient)" != "" ]] && alias hc='herbstclient'
-[[ "$(whence aiksaurus)" != "" ]] && alias thesaurus='aiksaurus'
-[[ "$(whence ag)" != "" ]] && alias ag='ag --color-match "1;34"'
-[[ "$(whence latex)" != "" ]] && alias latex='latex -output-format=pdf'
-[[ "$(whence startx)" != "" ]] && alias sx='startx'
+[[ ! -z $(whence sdcv) ]] && alias def='sdcv'
+[[ ! -z $(whence mpv) ]] && alias dvd='mpv --deinterlace=yes dvd://'
+[[ ! -z $(whence herbstclient) ]] && alias hc='herbstclient'
+[[ ! -z $(whence aiksaurus) ]] && alias thesaurus='aiksaurus'
+[[ ! -z $(whence ag) ]] && alias ag='ag --color-match "1;34"'
+[[ ! -z $(whence latex) ]] && alias latex='latex -output-format=pdf'
+[[ ! -z $(whence startx) ]] && alias sx='startx'
 
-if [[ "$(whence udevil)" != "" ]] then
+if [[ ! -z $(whence udevil) ]] then
 	alias vmount='udevil mount'
 	alias vumount='udevil umount'
 fi
@@ -169,14 +169,13 @@ fi
 ################## FUNCTIONS ##################
 
 # ignore non-tracked files
-if [[ "$(whence git)" != "" ]] then
+if [[ ! -z $(whence git) ]] then
 git() {
-	if [[ $# -gt 0 ]] && [[ "$1" == "status" ]]; then
-		shift
-		$(whence -p git) status -uno "$@"
-	else
-		$(whence -p git) "$@"
-	fi
+	case $1 in
+		status) shift; $(whence -p git) status -uno "$@" ;;
+		pull) shift; $(whence -p git) pull --recurse-submodules "$@" ;;
+		*) $(whence -p git) "$@" ;;
+	esac
 }
 fi
 
@@ -193,5 +192,5 @@ case $(uname) in
 		fi
 		;;
 	*)
-		echo -e '[-- OS UNRECOGNISED --]'
+		echo -e '[-- OS UNRECOGNISED (T_T) --]'
 esac
-- 
cgit v1.2.3