9 files changed, 76 insertions, 47 deletions
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index 6a76026..4c7d5c2 100644
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -18,8 +18,12 @@ source /home/jozan/.config/nvim/plug.vim
 source /home/jozan/.config/nvim/settings.vim
 source /home/jozan/.config/nvim/bindings.vim
 source /home/jozan/.config/nvim/sidebars.vim
-source /home/jozan/.config/nvim/plugins.vim
 source /home/jozan/.config/nvim/langs.vim
 source /home/jozan/.config/nvim/plug-config/airline.vim
 source /home/jozan/.config/nvim/plug-config/coc.vim
+source /home/jozan/.config/nvim/plug-config/floaterm.vim
+source /home/jozan/.config/nvim/plug-config/nerd-commenter.vim
+source /home/jozan/.config/nvim/plug-config/org.vim
+source /home/jozan/.config/nvim/plug-config/quickscope.vim
+source /home/jozan/.config/nvim/plug-config/rainbow.vim
 source /home/jozan/.config/nvim/plug-config/startify.vim
diff --git a/.config/nvim/plug-config/airline.vim b/.config/nvim/plug-config/airline.vim
new file mode 100644
index 0000000..868d910
--- /dev/null
+++ b/.config/nvim/plug-config/airline.vim
@@ -0,0 +1,12 @@
+" Airline
+let g:airline#extensions#tabline#enabled = 1
+let g:airline#extensions#tabline#fnamemod = ':t'
+let g:airline_detect_modified = 1
+let g:airline_detect_paste = 1
+let g:airline_detect_crypt = 1
+let g:airline_theme = 'base16_default'
+let g:airline_powerline_fonts = 1
+let g:airline_symbols_ascii = 1
+let g:airline#parts#ffenc#skip_expected_string = 'utf-8[unix]'
+let g:airline#extensions#cursormode#enabled = 1
+let g:airline#extensions#tabline#buffer_idx_mode = 1
diff --git a/.config/nvim/plug-config/floaterm.vim b/.config/nvim/plug-config/floaterm.vim
new file mode 100644
index 0000000..346fddc
--- /dev/null
+++ b/.config/nvim/plug-config/floaterm.vim
@@ -0,0 +1,6 @@
+" Floaterm
+let g:floaterm_autoinsert = 1
+let g:floaterm_width = 0.85
+let g:floaterm_height = 0.75
+let g:floaterm_wintitle = 0
+let g:floaterm_autoclose = 1
diff --git a/.config/nvim/plug-config/nerd-commenter.vim b/.config/nvim/plug-config/nerd-commenter.vim
new file mode 100644
index 0000000..04a942d
--- /dev/null
+++ b/.config/nvim/plug-config/nerd-commenter.vim
@@ -0,0 +1,9 @@
+" NERD Commenter
+let g:NERDSpaceDelims = 1
+let g:NERDCompactSexyComs = 1
+let g:NERDDefaultAlign = 'left'
+let g:NERDAltDelims_java = 1
+let g:NERDCustomDelimiters = { 'c': { 'left': '/*','right': '*/' } }
+let g:NERDCommentEmptyLines = 1
+let g:NERDTrimTrailingWhitespace = 1
+let g:NERDToggleCheckAllLines = 1
diff --git a/.config/nvim/plug-config/org.vim b/.config/nvim/plug-config/org.vim
new file mode 100644
index 0000000..bbf7682
--- /dev/null
+++ b/.config/nvim/plug-config/org.vim
@@ -0,0 +1,3 @@
+" Org-mode
+let g:org_todo_keywords = ['TODO',  '|', 'DONE', 'CANCELED']
+let g:org_export_emacs = "/usr/local/bin/emacs"
diff --git a/.config/nvim/plug-config/quickscope.vim b/.config/nvim/plug-config/quickscope.vim
new file mode 100644
index 0000000..3c1eb0a
--- /dev/null
+++ b/.config/nvim/plug-config/quickscope.vim
@@ -0,0 +1,7 @@
+" Quickscope
+let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
+
+highlight QuickScopePrimary guifg='#00C7DF' gui=underline ctermfg=155 cterm=underline
+highlight QuickScopeSecondary guifg='#afff5f' gui=underline ctermfg=81 cterm=underline
+
+let g:qs_max_chars=150
diff --git a/.config/nvim/plug-config/rainbow.vim b/.config/nvim/plug-config/rainbow.vim
new file mode 100644
index 0000000..461770c
--- /dev/null
+++ b/.config/nvim/plug-config/rainbow.vim
@@ -0,0 +1,2 @@
+" Rainbow
+let g:rainbow_active = 1
diff --git a/.config/nvim/plug-config/startify.vim b/.config/nvim/plug-config/startify.vim
new file mode 100644
index 0000000..a7c5d50
--- /dev/null
+++ b/.config/nvim/plug-config/startify.vim
@@ -0,0 +1,32 @@
+" Startify
+let g:startify_custom_header = startify#pad([
+			\ '  _____________________________________ ',
+			\ ' /                                     \',
+			\ ' |    Hi, partner, welcome_back to     |',
+			\ ' |  _ __   ___  _____   _(_)_ __ ___   |',
+			\ ' | | ''_ \ / _ \/ _ \ \ / / | ''_ ` _ \  |',
+			\ ' | | | | |  __/ (_) \ V /| | | | | | | |',
+			\ ' | |_| |_|\___|\___/ \_/ |_|_| |_| |_| |',
+			\ ' \                                     /',
+			\ '  ------------------------------------- ',
+			\ '         \   ^__^                       ',
+			\ '          \  (oo)\_______               ',
+			\ '             (__)\       )\/\           ',
+			\ '                 ||----w |              ',
+			\ '                 ||     ||              ',
+			\ ])
+let g:startify_lists = [
+			\ { 'type': 'sessions',  'header': startify#pad(['Sessions'])	},
+			\ { 'type': 'files',     'header': startify#pad(['Recent'])		},
+			\ { 'type': 'bookmarks', 'header': startify#pad(['Bookmarks'])	},
+			\ { 'type': 'commands',  'header': startify#pad(['Commands'])	},
+			\ ]
+let g:startify_bookmarks = [
+			\ { 'b': '~/.config/bspwm/bspwmrc' },
+			\ { 'e': '~/.config/env' },
+			\ { 'fa': '~/.config/fish/alias.fish' },
+			\ { 'fc': '~/.config/fish/config.fish' },
+			\ { 'v': '~/.config/nvim/init.vim' },
+			\ { 'zc': '~/.config/zsh/.zshrc' },
+			\ { 'za': '~/.config/zsh/alias.zsh' },
+			\ ]
diff --git a/.config/nvim/plugins.vim b/.config/nvim/plugins.vim
deleted file mode 100644
index 2237045..0000000
--- a/.config/nvim/plugins.vim
+++ /dev/null
@@ -1,46 +0,0 @@
-" Rainbow
-let g:rainbow_active = 1
-
-" NERD Commenter
-let g:NERDSpaceDelims = 1
-let g:NERDCompactSexyComs = 1
-let g:NERDDefaultAlign = 'left'
-let g:NERDAltDelims_java = 1
-let g:NERDCustomDelimiters = { 'c': { 'left': '/*','right': '*/' } }
-let g:NERDCommentEmptyLines = 1
-let g:NERDTrimTrailingWhitespace = 1
-let g:NERDToggleCheckAllLines = 1
-
-" Cursor mode
-let g:airline#extensions#cursormode#enabled = 1
-" let g:cursormode_color_map = {
-"             \	"i": 		"#d79921",
-"             \	"n": 		"#d79921",
-"             \	"R": 		"#cc241d",
-"             \	"r": 		"#cc241d",
-"             \	"v": 		"#b06597",
-"             \	"V": 		"#b06597",
-"             \	"\<C-V>":	"#b06597",
-"             \}
-
-" 10 buffers jump
-let g:airline#extensions#tabline#buffer_idx_mode = 1
-
-" Org-mode
-let g:org_todo_keywords = ['TODO',  '|', 'DONE', 'CANCELED']
-let g:org_export_emacs = "/usr/local/bin/emacs"
-
-" Floaterm
-let g:floaterm_autoinsert = 1
-let g:floaterm_width = 0.85
-let g:floaterm_height = 0.75
-let g:floaterm_wintitle = 0
-let g:floaterm_autoclose = 1
-
-" Quickscope
-let g:qs_highlight_on_keys = ['f', 'F', 't', 'T']
-
-highlight QuickScopePrimary guifg='#00C7DF' gui=underline ctermfg=155 cterm=underline
-highlight QuickScopeSecondary guifg='#afff5f' gui=underline ctermfg=81 cterm=underline
-
-let g:qs_max_chars=150