From c571647330f51285125e6404b9c2f4276f961a68 Mon Sep 17 00:00:00 2001
From: Von Random <von@vdrandom.org>
Date: Fri, 22 Jun 2018 20:05:04 +0300
Subject: [PATCH] get rid of vimplugins

---
 i3_config                                     |  1 +
 .../start/mousetoggle/plugin/mousetoggle.vim  | 15 ++++++
 vimplugins                                    | 10 +---
 vimrc                                         | 54 +++++++++----------
 4 files changed, 43 insertions(+), 37 deletions(-)
 create mode 100644 pack/general/start/mousetoggle/plugin/mousetoggle.vim

diff --git a/i3_config b/i3_config
index 32cc66c..37f711c 100644
--- a/i3_config
+++ b/i3_config
@@ -154,6 +154,7 @@ force_focus_wrapping yes
 
 # rules
 # software
+for_window [class="jetbrains-toolbox"] floating enable
 for_window [class="Vpnui"] floating enable
 for_window [class="Deadbeef"] floating enable
 for_window [class="Google-musicmanager"] floating enable
diff --git a/pack/general/start/mousetoggle/plugin/mousetoggle.vim b/pack/general/start/mousetoggle/plugin/mousetoggle.vim
new file mode 100644
index 0000000..7ec009f
--- /dev/null
+++ b/pack/general/start/mousetoggle/plugin/mousetoggle.vim
@@ -0,0 +1,15 @@
+fun! s:ToggleMouse()
+    if !exists("s:old_mouse")
+        let s:old_mouse = "a"
+        set ttymouse=sgr
+    endif
+    if &mouse == ""
+        let &mouse = s:old_mouse
+        echo "mouse enabled (" . &mouse . ")"
+    else
+        let s:old_mouse = &mouse
+        let &mouse=""
+        echo "mouse disabled"
+    endif
+endfunction
+noremap <Leader>m :call <SID>ToggleMouse()<CR>
diff --git a/vimplugins b/vimplugins
index 071bad7..bf79407 100644
--- a/vimplugins
+++ b/vimplugins
@@ -30,13 +30,7 @@ Plug 'lifepillar/vim-gruvbox8'
 Plug 'tomasr/molokai'
 Plug 'whatyouhide/vim-gotham'
 Plug 'NLKNguyen/papercolor-theme'
-
-" experimenting
-Plug 'ajmwagar/vim-deus'
 Plug 'hauleth/blame.vim'
-Plug 'kaicataldo/material.vim'
-Plug 'Badacadabra/vim-archery'
-Plug 'chriskempson/base16-vim'
 
 " only plug vimwiki within vimwiki dir and this file
 if expand('%:p:h') =~ 'vimwiki' || expand('%') =~ 'vimplugins'
@@ -56,8 +50,8 @@ nmap <Leader>a <Plug>(EasyAlign)
 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=dark
-    colorscheme archery
+    set termguicolors bg=light
+    colorscheme PaperColor
 else
     let g:solarized_use16 = 1
     let g:solarized_term_italics = 0
diff --git a/vimrc b/vimrc
index 8e39047..041b691 100644
--- a/vimrc
+++ b/vimrc
@@ -21,9 +21,6 @@ let g:sh_indent_case_labels=1
 if v:version >= 703
     set colorcolumn=80 relativenumber formatoptions+=j
 endif
-if v:version >= 800
-    set breakindent
-endif
 
 " maps
 "leader
@@ -55,36 +52,35 @@ noremap q <NOP>
 nnoremap <Leader>q :q<CR>
 nnoremap <Leader>s :w<CR>
 
-" mouse toggle
-fun! s:ToggleMouse()
-    if !exists("s:old_mouse")
-        let s:old_mouse = "a"
-        set ttymouse=sgr
+if v:version >= 800 && !has('nvim')
+    set breakindent
+
+    " 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)
+
+    " only plug vimwiki within vimwiki dir and this file
+    if expand('%:p:h') =~ 'vimwiki' || expand('%') =~ 'vimplugins'
+        packadd vimwiki
     endif
-    if &mouse == ""
-        let &mouse = s:old_mouse
-        echo "mouse enabled (" . &mouse . ")"
+
+    " yaaay themes
+    if has('gui_running') || $TERM =~ '^\(tmux\|st\)'
+        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 s:old_mouse = &mouse
-        let &mouse=""
-        echo "mouse disabled"
+        let g:solarized_use16 = 1
+        let g:solarized_term_italics = 0
+        set bg=light
+        colorscheme solarized8
     endif
-endfunction
-noremap <Leader>m :call <SID>ToggleMouse()<CR>
-
-" plugins
-let plugins = expand("$HOME/.vimplugins")
-if filereadable(plugins) && v:version >= 703
-    execute 'source ' . fnameescape(plugins)
-else
-    colorscheme default
 endif
 
-" explicit solarized8
-"let g:solarized_use16 = 1
-"let g:solarized_term_italics = 0
-"set bg=light
-"colorscheme solarized8
-
 syntax on
 filetype plugin on