From aa17324df14ef08d99cd244138fb2f5a2c422134 Mon Sep 17 00:00:00 2001
From: Mitch Riedstra <mitch@riedstra.us>
Date: Sun, 29 Dec 2019 11:04:17 -0500
Subject: Remove some unused themes. Add vim-hardtime. Adjust key bindings and
 filetype options

---
 .gitmodules                          | 15 +++------------
 init.vim                             |  8 ++++++--
 pack/plugins/start/dracula           |  1 -
 pack/plugins/start/vim-hardtime      |  1 +
 pack/themes/start/base16-black-metal |  1 -
 pack/themes/start/orbital            |  1 -
 plugin/filetype-options.vim          |  2 +-
 plugin/rebinds.vim                   | 29 ++++++++++++++++++++++++-----
 8 files changed, 35 insertions(+), 23 deletions(-)
 delete mode 160000 pack/plugins/start/dracula
 create mode 160000 pack/plugins/start/vim-hardtime
 delete mode 160000 pack/themes/start/base16-black-metal
 delete mode 160000 pack/themes/start/orbital

diff --git a/.gitmodules b/.gitmodules
index d0f92df..d3b1c20 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -22,9 +22,6 @@
 [submodule "pack/plugins/start/vim-airline-themes"]
 	path = pack/plugins/start/vim-airline-themes
 	url = https://github.com/vim-airline/vim-airline-themes/
-[submodule "pack/plugins/start/dracula"]
-	path = pack/plugins/start/dracula
-	url = https://github.com/dracula/vim.git
 [submodule "pack/plugins/start/l9"]
 	path = pack/plugins/start/l9
 	url = https://git.riedstra.us/vim/vim-l9.git
@@ -37,15 +34,9 @@
 [submodule "pack/themes/start/solarized"]
 	path = pack/themes/start/solarized
 	url = https://github.com/altercation/vim-colors-solarized
-[submodule "pack/themes/start/orbital"]
-	path = pack/themes/start/orbital
-	url = https://github.com/fcpg/vim-orbital
 [submodule "pack/themes/start/monotone"]
 	path = pack/themes/start/monotone
 	url = https://github.com/Lokaltog/vim-monotone
-[submodule "pack/themes/start/gruvbox"]
-	path = pack/themes/start/gruvbox
-	url = https://github.com/morhetz/gruvbox
-[submodule "pack/themes/start/base16-black-metal"]
-	path = pack/themes/start/base16-black-metal
-	url = https://github.com/metalelf0/base16-black-metal-scheme.git
+[submodule "pack/plugins/start/vim-hardtime"]
+	path = pack/plugins/start/vim-hardtime
+	url = https://github.com/takac/vim-hardtime
diff --git a/init.vim b/init.vim
index 35bccf7..e21d542 100644
--- a/init.vim
+++ b/init.vim
@@ -22,8 +22,8 @@ let g:netrw_liststyle=3
 " let g:airline_theme="monochrome"
 let g:airline_theme="distinguished"
 
-colorscheme 256_noir
-" colorscheme distinguished
+" colorscheme 256_noir
+colorscheme distinguished
 
 set guifont=ProFont\ 11
 
@@ -31,3 +31,7 @@ set guifont=ProFont\ 11
 " 	colorscheme gruvbox
 " 	set background=light
 " endif
+
+
+
+" let g:hardtime_default_on = 1
diff --git a/pack/plugins/start/dracula b/pack/plugins/start/dracula
deleted file mode 160000
index c8c0a93..0000000
--- a/pack/plugins/start/dracula
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit c8c0a9325407c487fd702eca39d987d67123c98b
diff --git a/pack/plugins/start/vim-hardtime b/pack/plugins/start/vim-hardtime
new file mode 160000
index 0000000..d912856
--- /dev/null
+++ b/pack/plugins/start/vim-hardtime
@@ -0,0 +1 @@
+Subproject commit d9128568afa62947b7ac8f12c22d88e3de526a6b
diff --git a/pack/themes/start/base16-black-metal b/pack/themes/start/base16-black-metal
deleted file mode 160000
index cdfb3d2..0000000
--- a/pack/themes/start/base16-black-metal
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit cdfb3d2f3020648338253587917244eff4034781
diff --git a/pack/themes/start/orbital b/pack/themes/start/orbital
deleted file mode 160000
index 39ba0c7..0000000
--- a/pack/themes/start/orbital
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 39ba0c7e995185ff262bb88b5af71394bafd5087
diff --git a/plugin/filetype-options.vim b/plugin/filetype-options.vim
index f0cbb37..1adfe23 100644
--- a/plugin/filetype-options.vim
+++ b/plugin/filetype-options.vim
@@ -81,7 +81,7 @@ function SetShellOptions()
 	set smartindent
 endfunction
 function SetGoOptions()
-	set tabstop=8
+	set tabstop=4
 	set noexpandtab
 	" The ACP is pretty slow with my Go plugins enabled
 	AcpDisable
diff --git a/plugin/rebinds.vim b/plugin/rebinds.vim
index cacef62..9874d13 100644
--- a/plugin/rebinds.vim
+++ b/plugin/rebinds.vim
@@ -1,8 +1,27 @@
-" Keep the newbs from using arrow keys
-inoremap <Left>  <NOP>
-inoremap <Right> <NOP>
-inoremap <Up>    <NOP>
-inoremap <Down>  <NOP>
+" Remove newbie crutches in Command Mode
+cnoremap <Down> <Nop>
+cnoremap <Left> <Nop>
+cnoremap <Right> <Nop>
+cnoremap <Up> <Nop>
+
+" Remove newbie crutches in Insert Mode
+inoremap <Down> <Nop>
+inoremap <Left> <Nop>
+inoremap <Right> <Nop>
+inoremap <Up> <Nop>
+
+" Remove newbie crutches in Normal Mode
+nnoremap <Down> <Nop>
+nnoremap <Left> <Nop>
+nnoremap <Right> <Nop>
+nnoremap <Up> <Nop>
+
+" Remove newbie crutches in Visual Mode
+vnoremap <Down> <Nop>
+vnoremap <Left> <Nop>
+vnoremap <Right> <Nop>
+vnoremap <Up> <Nop>
+
 
 " map <C-n> :Lex<CR>
 map <C-n> :NERDTreeToggle<CR>
-- 
cgit v1.2.3