From 3734a71e6f427bf26e3d1180eb68591133dcd0b0 Mon Sep 17 00:00:00 2001
From: Spotlight <spotlight@joscomputing.space>
Date: Tue, 14 Aug 2018 18:06:15 -0500
Subject: [PATCH] more vim stuff

---
 .gitignore     |  1 +
 vim/.netrwhist |  4 ----
 vimrc          |  6 ++++++
 zshrc          | 12 +++++++++++-
 4 files changed, 18 insertions(+), 5 deletions(-)
 create mode 100644 .gitignore
 delete mode 100644 vim/.netrwhist

diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..ffe9657
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+vim/.netrwhist
diff --git a/vim/.netrwhist b/vim/.netrwhist
deleted file mode 100644
index c9ced37..0000000
--- a/vim/.netrwhist
+++ /dev/null
@@ -1,4 +0,0 @@
-let g:netrw_dirhistmax  =10
-let g:netrw_dirhist_cnt =2
-let g:netrw_dirhist_1='/home/spotlight/.vim'
-let g:netrw_dirhist_2='/home/spotlight'
diff --git a/vimrc b/vimrc
index 601edf2..2999bc5 100644
--- a/vimrc
+++ b/vimrc
@@ -4,5 +4,11 @@ syntax on
 set number
 filetype plugin indent on
 
+" two-spaced tabs
+set tabstop=2
+set softtabstop=0 noexpandtab
+set shiftwidth=4
+set tabstop=4 softtabstop=0 expandtab shiftwidth=2 smarttab
+
 " vim-airline
 let g:airline_powerline_fonts = 1
diff --git a/zshrc b/zshrc
index 7efee3d..4dfd603 100644
--- a/zshrc
+++ b/zshrc
@@ -54,7 +54,7 @@ export PATH="${HOME}/bin:${HOME}/bin/android-sdk/platform-tools:${PATH}"
 source ${HOME}/bin/google-cloud-sdk/completion.zsh.inc
 source ${HOME}/bin/google-cloud-sdk/path.zsh.inc
 
-export EDITOR=nano
+export EDITOR=vim
 
 # Go
 export GOPATH=${HOME}/go
@@ -83,3 +83,13 @@ fi
 [[ -s "$HOME/.rvm/scripts/rvm" ]] && source "$HOME/.rvm/scripts/rvm" ]]
 # Add RVM to PATH for scripting. Make sure this is the last PATH variable change.
 export PATH="$PATH:$HOME/.rvm/bin"
+
+
+# Adapted from https://github.com/isaacmorneau/dotfiles/blob/882f11172a2c0fd1aa7020d627d2978e5d60f6b0/.bashrc#L125-L130
+function mvsane () {
+    for F in "$@"
+    do
+        mv "$F" $(echo "$F" | sed -r 's/[ ]+/_/g;s/[^a-zA-Z0-9_.-]//g;s/[_-]{2,}/-/g;')
+    done
+}
+. "/Users/spot/bin/acme.sh.env"