aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorMitch Riedstra <mitch@riedstra.us>2018-03-15 20:11:38 -0400
committerMitch Riedstra <mitch@riedstra.us>2018-03-15 20:11:38 -0400
commit0f7e3a5395a283251e68d28f26f2891f0b196e65 (patch)
treea68ebc8e0224dfa2f339b5d71faf800eae972e02
parent0507b921b4e21db6e26beab317ed06d92834da1e (diff)
downloadvim-cfg-0f7e3a5395a283251e68d28f26f2891f0b196e65.tar.gz
vim-cfg-0f7e3a5395a283251e68d28f26f2891f0b196e65.tar.xz
The great purge
Removed all of the plugins adjusted the vimrc a little bit to use only builtins
-rw-r--r--init.vim75
-rwxr-xr-xsetup.sh45
2 files changed, 32 insertions, 88 deletions
diff --git a/init.vim b/init.vim
index 4783756..4d9694b 100644
--- a/init.vim
+++ b/init.vim
@@ -28,7 +28,7 @@ inoremap <Up> <NOP>
inoremap <Down> <NOP>
" Always show status line
-set laststatus=2
+" set laststatus=2
" Case insensitive searching by default
set ic
@@ -49,39 +49,14 @@ set noexpandtab
" Maily for the ability to match HTML tags with '%'
+" Apparently this is apart of the mainline vim install? Cool.
runtime macros/matchit.vim
-" Love hate relationship with this thing. I guess it's back
-map <C-n> :NERDTreeToggle<CR>
-
-
-" To enable/disable the autocomplete dropdown
-nmap <leader> [ :AcpDisable<CR>
-nmap <leader> ] :AcpEnable<CR>
-
-" Gundo
-nnoremap <F5> :GundoToggle<CR>
-"
-" Enable the list of buffers
-let g:airline#extensions#tabline#enabled = 1
-
-" Show just the filename
-let g:airline#extensions#tabline#fnamemod = ':t'
-
-" This lets you just hit enter instead
-" of pressing control-n Some people like it
-" personally I'm not that much of a fan
-" set completeopt=longest,menuone
" Omni completion
filetype plugin on
set omnifunc=syntaxcomplete#Complete
-nmap <F8> :TagbarToggle<CR>
-
-let g:ctrlp_follow_symlinks = 1
-let g:ctrlp_working_path_mode = 0
-
autocmd Filetype python call SetPythonOptions()
autocmd Filetype htmldjango call SethtmldjangoOptions()
autocmd Filetype json call SetJsonOptions()
@@ -98,7 +73,6 @@ function SetMarkdownOptions()
set tabstop=4
set shiftwidth=4
set expandtab
- AcpDisable
endfunction
function SetPythonOptions()
set tabstop=4
@@ -152,40 +126,29 @@ function SetShellOptions()
set smartindent
endfunction
function SetGoOptions()
- " colorscheme acme
- " syntax off
- " colorscheme 256_noir
- AcpDisable
+ syntax off
set nolist
set noic
set nolist
endfunction
function SetYamlOptions()
- " set listchars=tab:▸\ ,eol:¬,trail:•,space:·
- set listchars=tab:▸\ ,eol:¬,trail:•
set expandtab
+ set tabstop=2
set noic
endfunction
-" This is specifically for Salt's state files 'sls'
-autocmd BufNewFile,BufRead *.sls set filetype=yaml
-
-
function! PhpSyntaxOverride()
hi! def link phpDocTags phpDefine
hi! def link phpDocParam phpType
endfunction
-augroup phpSyntaxOverride
- autocmd!
- autocmd FileType php call PhpSyntaxOverride()
-augroup END
" Backslash l
nmap <leader>l :set list!<CR>
" If you want listchars
set list
" set listchars=tab:\|\
-set listchars=tab:▸\ ,eol:¬,trail:•
+set listchars=tab:\|\ ,eol:¬,trail:•
+" set listchars=tab:▸\ ,eol:¬,trail:•
" set listchars=tab:▸\ ,eol:¬
" set listchars=tab:\|\ ,eol:↴
" set listchars=tab:\|\ ,eol:$
@@ -201,10 +164,34 @@ if &term =~ '^screen'
endif
+set noshowmode
+set noruler
+set laststatus=0
+set noshowcmd
+function! ToggleHiddenAll()
+ if s:hidden_all == 0
+ let s:hidden_all = 1
+ set noshowmode
+ set noruler
+ set laststatus=0
+ set noshowcmd
+ else
+ let s:hidden_all = 0
+ set showmode
+ set ruler
+ set laststatus=2
+ set showcmd
+ endif
+endfunction
+
+nnoremap <S-h> :call ToggleHiddenAll()<CR>
+
+
" Line numbers
set nu
" Derp
+set background=dark
syntax on
" syntax off
-colorscheme distinguished
+" colorscheme distinguished
diff --git a/setup.sh b/setup.sh
index cd5b911..a1ccd37 100755
--- a/setup.sh
+++ b/setup.sh
@@ -1,46 +1,3 @@
#!/bin/sh
-WD="$(pwd)"
-
-clone() {
- printf "\033[0mWorking dir: \033[1;34m%s\033[0;33m\n" $DIR
- if [ -d "$DIR" ] ; then
- cd $DIR
- git pull --ff-only origin master
- elif ! [ -d "$DIR" ] ; then
- mkdir -p "$DIR"
- cd "$DIR"
- git clone --depth=1 "$URL" .
- fi
- cd $WD
-}
-DIR="bundle/jinja2-syntax"
-URL="https://github.com/Glench/Vim-Jinja2-Syntax.git"
-clone
-DIR="bundle/vim-airline"
-URL="https://github.com/vim-airline/vim-airline.git"
-clone
-DIR="bundle/nerdtree"
-URL="https://github.com/scrooloose/nerdtree.git"
-clone
-DIR="bundle/vim-autocomplpop"
-URL="https://git.riedstra.us/mitch/vim-autocomplpop.git"
-clone
-DIR="bundle/ag.vim"
-URL="https://github.com/rking/ag.vim.git"
-clone
-DIR="bundle/tagbar"
-URL="git://github.com/majutsushi/tagbar"
-clone
-DIR="bundle/ctrlp.vim"
-URL="https://github.com/ctrlpvim/ctrlp.vim"
-clone
-DIR="bundle/vim-distinguished"
-URL="https://github.com/Lokaltog/vim-distinguished.git"
-clone
-DIR="bundle/emmet-vim"
-URL="https://github.com/mattn/emmet-vim.git"
-clone
-DIR="bundle/l9"
-URL="https://git.riedstra.us/mitch/vim-l9.git"
-clone
+echo "Not doing anything because I'm not using plugins anymore"