From 5738b8d1ea74e6dfaac78d306b07a11cd2ae6c15 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Sat, 23 Jun 2018 13:36:29 +0300
Subject: [PATCH] more vim tweaks, no more vimplugins and gvimrc

---
 gvimrc     | 10 ---------
 vimplugins | 60 ------------------------------------------------------
 vimrc      | 16 +++++++++++++--
 3 files changed, 14 insertions(+), 72 deletions(-)
 delete mode 100644 gvimrc
 delete mode 100644 vimplugins

diff --git a/gvimrc b/gvimrc
deleted file mode 100644
index dd5a653..0000000
--- a/gvimrc
+++ /dev/null
@@ -1,10 +0,0 @@
-if has('win32')
-    set guifont=Fantasque_Sans_Mono:h11
-else
-    set guifont=Fantasque\ Sans\ Mono\ 11
-endif
-set guiheadroom=0 guioptions=aei mouse=a
-set noerrorbells visualbell t_vb=
-set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor
-map <S-Insert> <MiddleMouse>
-map! <S-Insert> <MiddleMouse>
diff --git a/vimplugins b/vimplugins
deleted file mode 100644
index bf79407..0000000
--- a/vimplugins
+++ /dev/null
@@ -1,60 +0,0 @@
-" support my own way of using plugins in vim / bash
-autocmd BufRead *vimplugins set ft=vim
-
-" enable plugins
-source ~/.vim/plugged/vim-plug/plug.vim
-silent!call plug#begin('~/.vim/plugged')
-
-" plugin manager for self updates
-Plug 'junegunn/vim-plug'
-
-" general plugins
-Plug 'junegunn/vim-easy-align'
-Plug 'mhinz/vim-signify'
-Plug 'tpope/vim-commentary'
-Plug 'tpope/vim-fugitive'
-Plug 'tpope/vim-rsi'
-Plug 'vdrandom/vim-tru-typewriter'
-Plug 'vim-scripts/directionalWindowResizer'
-
-" syntax highlight plugins
-Plug 'sheerun/vim-polyglot'
-
-" colorschemes
-Plug 'jonathanfilip/vim-lucius'
-Plug 'lifepillar/vim-solarized8'
-Plug 'nanotech/jellybeans.vim'
-
-" fun to keep
-Plug 'lifepillar/vim-gruvbox8'
-Plug 'tomasr/molokai'
-Plug 'whatyouhide/vim-gotham'
-Plug 'NLKNguyen/papercolor-theme'
-Plug 'hauleth/blame.vim'
-
-" only plug vimwiki within vimwiki dir and this file
-if expand('%:p:h') =~ 'vimwiki' || expand('%') =~ 'vimplugins'
-    Plug 'vimwiki/vimwiki'
-endif
-call plug#end()
-
-" signify options
-let g:signify_vcs_list = [ 'git' ]
-let g:signify_sign_change = '~'
-
-" easy-align options
-xmap <Leader>a <Plug>(EasyAlign)
-nmap <Leader>a <Plug>(EasyAlign)
-
-" we have themes installed, so we use them!
-if has('gui_running') || $TERM =~ '^\(tmux\|st\)' && v:version >= 800
-    let &t_8f = "\033[38;2;%lu;%lu;%lum"
-    let &t_8b = "\033[48;2;%lu;%lu;%lum"
-    set termguicolors bg=light
-    colorscheme PaperColor
-else
-    let g:solarized_use16 = 1
-    let g:solarized_term_italics = 0
-    set bg=light
-    colorscheme solarized8
-endif
diff --git a/vimrc b/vimrc
index 041b691..c39fdd0 100644
--- a/vimrc
+++ b/vimrc
@@ -52,7 +52,7 @@ noremap q <NOP>
 nnoremap <Leader>q :q<CR>
 nnoremap <Leader>s :w<CR>
 
-if v:version >= 800 && !has('nvim')
+if v:version >= 800
     set breakindent
 
     " signify options
@@ -64,7 +64,7 @@ if v:version >= 800 && !has('nvim')
     nmap <Leader>a <Plug>(EasyAlign)
 
     " only plug vimwiki within vimwiki dir and this file
-    if expand('%:p:h') =~ 'vimwiki' || expand('%') =~ 'vimplugins'
+    if expand('%:p:h') =~ 'vimwiki'
         packadd vimwiki
     endif
 
@@ -82,5 +82,17 @@ if v:version >= 800 && !has('nvim')
     endif
 endif
 
+if has('gui_running')
+    if has('win32')
+        set guifont=Fantasque_Sans_Mono:h11
+    else
+        set guifont=Fantasque\ Sans\ Mono\ 11
+    endif
+    set guicursor=a:blinkon0,a:block,i:ver1-Cursor/lCursor,r:hor1-Cursor/lCursor
+    set guiheadroom=0 guioptions=aei mouse=a noerrorbells visualbell t_vb=
+    map <S-Insert> <MiddleMouse>
+    map! <S-Insert> <MiddleMouse>
+endif
+
 syntax on
 filetype plugin on