Add a few colorschemes. Adjust default vimrc

7 files changed, 55 insertions, 54 deletions

diff --git a/.gitmodules b/.gitmodules
index c1e6932..4fb25e4 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -52,3 +52,12 @@
 [submodule "pack/plugins/start/terraform"]
 	path = pack/plugins/start/terraform
 	url = https://github.com/hashivim/vim-terraform
+[submodule "pack/plugins/start/acme-colors"]
+	path = pack/plugins/start/acme-colors
+	url = https://github.com/plan9-for-vimspace/acme-colors
+[submodule "pack/plugins/start/atlas"]
+	path = pack/plugins/start/atlas
+	url = https://github.com/huyvohcmc/atlas.vim
+[submodule "pack/plugins/start/vim-boring"]
+	path = pack/plugins/start/vim-boring
+	url = https://github.com/t184256/vim-boring
diff --git a/init.vim b/init.vim
index 9698743..75ac992 100644
--- a/init.vim
+++ b/init.vim
@@ -1,5 +1,47 @@
-
-" Omni completion
+set encoding=utf-8
+set fileencoding=utf-8
+set nu
+set rnu
+set listchars=tab:▸\ ,eol:¬,trail:•
+" set listchars=tab:\|\  " Alternative listchars w/o special chars.
+set tw=80
+set colorcolumn=80
+set ic
+set hls
+set updatecount=0
+set nocompatible
+set tabstop=4
+set shiftwidth=4
+set noexpandtab
+set mouse+=a
+syntax on
+"if &term =~ '^screen'
+"	" tmux knows the extended mouse mode
+"	set ttymouse=xterm2
+"endif
+
+
+" I know how to setup my editor, I don't need your changes to my vim
+" configuration.
+set nomodeline
+
+" Use \-n in normal mode to toggle line numbers
+nmap <leader>n :set invnu<CR>
+nmap <leader>r :set invrnu<CR>
+" Use \-l in normal mode to toggle listchars
+nmap <leader>l :set list!<CR>
+
+" Use \-s to pop open a spelling menu. use ]s to search forwards and [s to go
+" backwards.
+" Apparently this also doesn't work if spell checking isn't enabled
+" at the time you enable it.
+set spell
+nnoremap \s ea<C-X><C-S>
+set nospell
+
+" set hidden			" This will allow you to change buffers w/o saving
+
+" Omni completion, c-x c-o in insert/append mode
 filetype plugin on
 set omnifunc=syntaxcomplete#Complete
 
@@ -23,7 +65,8 @@ let g:netrw_liststyle=3
 let g:airline_theme="distinguished"
 
 " colorscheme 256_noir
-colorscheme distinguished
+" colorscheme distinguished
+colorscheme sane
 
 set guifont=ProFontOTB\ 11
 
@@ -35,7 +78,6 @@ endif
 
 " let g:hardtime_default_on = 1
 
-
 " For syntastic it's worth running 
 " SyntasticInfo : to see what's available for the given open file
 " SyntasticCheck yamllint : if you want to say manually run the `yamllint`
diff --git a/pack/plugins/start/acme-colors b/pack/plugins/start/acme-colors
new file mode 160000
+Subproject de3c6963339114bea7ab61cc02522885d5809b4
diff --git a/pack/plugins/start/atlas b/pack/plugins/start/atlas
new file mode 160000
+Subproject f254465adbcae565d9cf8c987f5a797c1f9cf92
diff --git a/pack/plugins/start/vim-boring b/pack/plugins/start/vim-boring
new file mode 160000
+Subproject 82fe866bbbea774e518c1e0a89c92843f21ec7c
diff --git a/pack/themes/start/mitch b/pack/themes/start/mitch
-Subproject 217beabd4f442b3dde578f220ea6f40f3648f3e
+Subproject 1667e2cd706cb88d3b9168233e23d7027034b77
diff --git a/plugin/basics.vim b/plugin/basics.vim
deleted file mode 100644
index 6e1a539..0000000
--- a/plugin/basics.vim
+++ /dev/null
@@ -1,50 +0,0 @@
-" Basic vimrc for systems you don't want to copy the full one to
-set encoding=utf-8		" The encoding displayed.
-set fileencoding=utf-8	" The encoding written to file.
-set background=dark		" Since most terminals I have dark backgrounds
-set nu					" Line 'nu'mbers
-set rnu
-set listchars=tab:▸\ ,eol:¬,trail:• " Listchars are used to show normally
-									" invisible chars such as tabs, EOL and
-									" trailing whitespace
-" set listchars=tab:\|\  " Alternative listchars w/o special chars.
-set colorcolumn=80		" Sets a "coloured" coloumn to tell you where your line
-						" breaks should be so you don't piss off people using
-						" a terminal.
-set ic					" Case insensitive search by default
-set hls					" Highlight my searches by default
-set updatecount=0		" Do not write swap files
-set nocompatible		" Don't be compatbile with 'vi'
-set tabstop=4			" Tab width
-set shiftwidth=4
-set noexpandtab			" Do **NOT** turn tabs into spaces by default
-" Be smart about the mouse
-set mouse+=a
-if &term =~ '^screen'
-	" tmux knows the extended mouse mode
-	set ttymouse=xterm2
-endif
-syntax on				" Syntax highlighting by default
-
-
-set nomodeline			" I know how to setup my editor, I don't need your
-						" changes to my vim configuration.
-
-" Use \-n in normal mode to toggle line numbers
-nmap <leader>n :set invnu<CR>
-" Use \-l in normal mode to toggle listchars
-nmap <leader>l :set list!<CR>
-
-" Use \-s to pop open a spelling menu. use ]s to search forwards and [s to go
-" backwards.
-" Apparently this also doesn't work if spell checking isn't enabled
-" at the time you enable it.
-set spell
-nnoremap \s ea<C-X><C-S>
-set nospell
-
-" set hidden			" This will allow you to change buffers w/o saving
-
-" Omni completion, c-x c-o in insert/append mode
-" filetype plugin on
-" set omnifunc=syntaxcomplete#Complete