renaming, treesitter buggy

38 files changed, 60 insertions, 199 deletions

diff --git a/.config/nvim/init.lua b/.config/nvim/init.lua
index d0e013a..4ee361e 100644
--- a/.config/nvim/init.lua
+++ b/.config/nvim/init.lua
@@ -7,39 +7,40 @@ require('colorscheme')
 -- Plugins
 require('_compe')
 require('_telescope')
-require('autopairs')
-require('_bufferline')
-require('closetag')
-require('colorizer')
-require('floaterm')
-require('galaxyline')
-require('gitblame')
-require('gitsigns')
-require('hop')
-require('kommentary')
--- require('limeligth')
-require('neogit')
-require('nvimtree')
-require('quickscope')
-require('rnvimr')
-require('startify')
-require('treesitter')
-require('vim-rooter')
+require('_autopairs')
+require('_closetag')
+require('_colorizer')
+require('_floaterm')
+require('_gitblame')
+require('_gitsigns')
+require('_hop')
+require('_kommentary')
+-- require('_limeligth')
+require('_neogit')
+require('_nvimtree')
+require('_quickscope')
+require('_rnvimr')
+require('_startify')
+-- require('_treesitter')
+require('_vim-rooter')
 
+-- bufferline and statusline
+require('_galaxyline')
+require('_bufferline')
 
 -- Load vim scripts
 -- Which Key (Hope to replace with Lua plugin someday)
-vim.cmd('source ~/.config/nvim/lua/whichkey/init.vim')
-vim.cmd('source ~/.config/nvim/lua/goyo/init.vim')
-vim.cmd('source ~/.config/nvim/lua/vim-bbye/init.vim')
+vim.cmd('source ~/.config/nvim/lua/_goyo/init.vim')
+vim.cmd('source ~/.config/nvim/lua/_vim-bbye/init.vim')
+vim.cmd('source ~/.config/nvim/lua/_whichkey/init.vim')
 
 -- LSP
-require('lspkind')
-require('lsp')
+require('_lspkind')
+require('_lsp')
 require('utils')
-require('lsp.bash-ls')
-require('lsp.docker-ls')
-require('lsp.lua-ls')
-require('lsp.json-ls')
-require('lsp.python-ls')
-require('lsp.yaml-ls')
+require('_lsp.bash-ls')
+require('_lsp.docker-ls')
+require('_lsp.lua-ls')
+require('_lsp.json-ls')
+require('_lsp.python-ls')
+require('_lsp.yaml-ls')
diff --git a/.config/nvim/lua/autopairs/init.lua b/.config/nvim/lua/_autopairs/init.lua
index 6810a77..6810a77 100644
--- a/.config/nvim/lua/autopairs/init.lua
+++ b/.config/nvim/lua/_autopairs/init.lua
diff --git a/.config/nvim/lua/closetag/init.lua b/.config/nvim/lua/_closetag/init.lua
index 8c11641..8c11641 100644
--- a/.config/nvim/lua/closetag/init.lua
+++ b/.config/nvim/lua/_closetag/init.lua
diff --git a/.config/nvim/lua/colorizer/init.lua b/.config/nvim/lua/_colorizer/init.lua
index 1e25d7d..1e25d7d 100644
--- a/.config/nvim/lua/colorizer/init.lua
+++ b/.config/nvim/lua/_colorizer/init.lua
diff --git a/.config/nvim/lua/floaterm/init.lua b/.config/nvim/lua/_floaterm/init.lua
index 633df35..633df35 100644
--- a/.config/nvim/lua/floaterm/init.lua
+++ b/.config/nvim/lua/_floaterm/init.lua
diff --git a/.config/nvim/lua/galaxyline/init.lua b/.config/nvim/lua/_galaxyline/init.lua
index 44801cf..44801cf 100644
--- a/.config/nvim/lua/galaxyline/init.lua
+++ b/.config/nvim/lua/_galaxyline/init.lua
diff --git a/.config/nvim/lua/gitblame/init.lua b/.config/nvim/lua/_gitblame/init.lua
index 12645a7..12645a7 100644
--- a/.config/nvim/lua/gitblame/init.lua
+++ b/.config/nvim/lua/_gitblame/init.lua
diff --git a/.config/nvim/lua/gitsigns/init.lua b/.config/nvim/lua/_gitsigns/init.lua
index b435be7..b435be7 100644
--- a/.config/nvim/lua/gitsigns/init.lua
+++ b/.config/nvim/lua/_gitsigns/init.lua
diff --git a/.config/nvim/lua/goyo/init.vim b/.config/nvim/lua/_goyo/init.vim
index f617194..f617194 100644
--- a/.config/nvim/lua/goyo/init.vim
+++ b/.config/nvim/lua/_goyo/init.vim
diff --git a/.config/nvim/lua/hop/init.lua b/.config/nvim/lua/_hop/init.lua
index f7dd27d..f7dd27d 100644
--- a/.config/nvim/lua/hop/init.lua
+++ b/.config/nvim/lua/_hop/init.lua
diff --git a/.config/nvim/lua/_kommentary/init.lua b/.config/nvim/lua/_kommentary/init.lua
new file mode 100644
index 0000000..350e1ac
--- /dev/null
+++ b/.config/nvim/lua/_kommentary/init.lua
@@ -0,0 +1,6 @@
+vim.g.kommentary_create_default_mappings = false
+vim.api.nvim_set_keymap("n", "gc", "<Plug>kommentary_line_default", {})
+vim.api.nvim_set_keymap("v", "gc", "<Plug>kommentary_visual_default", {})
+require('kommentary.config').configure_language("default", {
+    prefer_single_line_comments = true,
+})
diff --git a/.config/nvim/lua/lsp/bash-ls.lua b/.config/nvim/lua/_lsp/bash-ls.lua
index 8be0383..8be0383 100644
--- a/.config/nvim/lua/lsp/bash-ls.lua
+++ b/.config/nvim/lua/_lsp/bash-ls.lua
diff --git a/.config/nvim/lua/lsp/docker-ls.lua b/.config/nvim/lua/_lsp/docker-ls.lua
index ad6e220..ad6e220 100644
--- a/.config/nvim/lua/lsp/docker-ls.lua
+++ b/.config/nvim/lua/_lsp/docker-ls.lua
diff --git a/.config/nvim/lua/lsp/general.lua b/.config/nvim/lua/_lsp/general.lua
index fa28dbc..fa28dbc 100644
--- a/.config/nvim/lua/lsp/general.lua
+++ b/.config/nvim/lua/_lsp/general.lua
diff --git a/.config/nvim/lua/lsp/init.lua b/.config/nvim/lua/_lsp/init.lua
index 4515e7c..4515e7c 100644
--- a/.config/nvim/lua/lsp/init.lua
+++ b/.config/nvim/lua/_lsp/init.lua
diff --git a/.config/nvim/lua/lsp/json-ls.lua b/.config/nvim/lua/_lsp/json-ls.lua
index d13fed3..d13fed3 100644
--- a/.config/nvim/lua/lsp/json-ls.lua
+++ b/.config/nvim/lua/_lsp/json-ls.lua
diff --git a/.config/nvim/lua/lsp/lua-ls.lua b/.config/nvim/lua/_lsp/lua-ls.lua
index c04219a..c04219a 100644
--- a/.config/nvim/lua/lsp/lua-ls.lua
+++ b/.config/nvim/lua/_lsp/lua-ls.lua
diff --git a/.config/nvim/lua/lsp/python-ls.lua b/.config/nvim/lua/_lsp/python-ls.lua
index 11eeef9..11eeef9 100644
--- a/.config/nvim/lua/lsp/python-ls.lua
+++ b/.config/nvim/lua/_lsp/python-ls.lua
diff --git a/.config/nvim/lua/lsp/vim.lua b/.config/nvim/lua/_lsp/vim.lua
index a7555c6..a7555c6 100644
--- a/.config/nvim/lua/lsp/vim.lua
+++ b/.config/nvim/lua/_lsp/vim.lua
diff --git a/.config/nvim/lua/lsp/wrapper.lua b/.config/nvim/lua/_lsp/wrapper.lua
index 7f3647c..7f3647c 100644
--- a/.config/nvim/lua/lsp/wrapper.lua
+++ b/.config/nvim/lua/_lsp/wrapper.lua
diff --git a/.config/nvim/lua/lsp/yaml-ls.lua b/.config/nvim/lua/_lsp/yaml-ls.lua
index 904f20e..904f20e 100644
--- a/.config/nvim/lua/lsp/yaml-ls.lua
+++ b/.config/nvim/lua/_lsp/yaml-ls.lua
diff --git a/.config/nvim/lua/lspkind/init.lua b/.config/nvim/lua/_lspkind/init.lua
index e3c590f..e3c590f 100644
--- a/.config/nvim/lua/lspkind/init.lua
+++ b/.config/nvim/lua/_lspkind/init.lua
diff --git a/.config/nvim/lua/neogit/init.lua b/.config/nvim/lua/_neogit/init.lua
index ca38081..ca38081 100644
--- a/.config/nvim/lua/neogit/init.lua
+++ b/.config/nvim/lua/_neogit/init.lua
diff --git a/.config/nvim/lua/nvimtree/init.lua b/.config/nvim/lua/_nvimtree/init.lua
index 3803765..3803765 100644
--- a/.config/nvim/lua/nvimtree/init.lua
+++ b/.config/nvim/lua/_nvimtree/init.lua
diff --git a/.config/nvim/lua/quickscope/init.lua b/.config/nvim/lua/_quickscope/init.lua
index 4c70669..4c70669 100644
--- a/.config/nvim/lua/quickscope/init.lua
+++ b/.config/nvim/lua/_quickscope/init.lua
diff --git a/.config/nvim/lua/rnvimr/init.lua b/.config/nvim/lua/_rnvimr/init.lua
index 055326c..055326c 100644
--- a/.config/nvim/lua/rnvimr/init.lua
+++ b/.config/nvim/lua/_rnvimr/init.lua
diff --git a/.config/nvim/lua/startify/init.lua b/.config/nvim/lua/_startify/init.lua
index 9b1488b..3f627a0 100644
--- a/.config/nvim/lua/startify/init.lua
+++ b/.config/nvim/lua/_startify/init.lua
@@ -32,7 +32,7 @@ vim.g.startify_session_dir = '~/.config/nvim/session'
 
 vim.api.nvim_exec('let startify_lists = [ { \'type\': \'files\',     \'header\': [\'   Files\'] }, { \'type\': \'sessions\',  \'header\': [\'   Sessions\'] },    { \'type\': \'bookmarks\', \'header\': [\'   Bookmarks\'] },                                                                   ]',true)
 
-vim.api.nvim_exec('let startify_bookmarks = [ { \'b\': \'~/Blog\' }, { \'i\': \'~/.config/nvim/init.vim\' }, { \'z\': \'~/.zshrc\' }]', true)
+vim.api.nvim_exec('let startify_bookmarks = [ { \'i\': \'~/.config/nvim/init.lua\' }, { \'z\': \'~/.zshrc\' }]', true)
 
 vim.cmd([[
 function! StartifyEntryFormat()
diff --git a/.config/nvim/lua/treesitter/init.lua b/.config/nvim/lua/_treesitter/init.lua
index d202a9f..d202a9f 100644
--- a/.config/nvim/lua/treesitter/init.lua
+++ b/.config/nvim/lua/_treesitter/init.lua
diff --git a/.config/nvim/lua/vim-bbye/init.vim b/.config/nvim/lua/_vim-bbye/init.vim
index 10ee440..10ee440 100644
--- a/.config/nvim/lua/vim-bbye/init.vim
+++ b/.config/nvim/lua/_vim-bbye/init.vim
diff --git a/.config/nvim/lua/vim-pydocstring/init.vim b/.config/nvim/lua/_vim-pydocstring/init.vim
index e3d5311..e3d5311 100644
--- a/.config/nvim/lua/vim-pydocstring/init.vim
+++ b/.config/nvim/lua/_vim-pydocstring/init.vim
diff --git a/.config/nvim/lua/vim-rooter/init.lua b/.config/nvim/lua/_vim-rooter/init.lua
index a873194..a873194 100644
--- a/.config/nvim/lua/vim-rooter/init.lua
+++ b/.config/nvim/lua/_vim-rooter/init.lua
diff --git a/.config/nvim/lua/whichkey/init.vim b/.config/nvim/lua/_whichkey/init.vim
index 5491991..c8fe9e4 100644
--- a/.config/nvim/lua/whichkey/init.vim
+++ b/.config/nvim/lua/_whichkey/init.vim
@@ -35,15 +35,13 @@ let g:which_key_map['r'] = [ ':RnvimrToggle'                                   ,
 let g:which_key_map['T'] = [ ':TSHighlightCapturesUnderCursor'                 , 'treesitter highlight' ]
 let g:which_key_map['v'] = [ '<C-W>v'                                          , 'split right']
 " Add Zen mode, play nice with status line
-" let g:which_key_map['z'] = [ 'Goyo'                                            , 'zen' ]
+let g:which_key_map['z'] = [ 'Goyo'                                            , 'zen' ]
 
 " Group mappings
 
 " a is for actions
 let g:which_key_map.a = {
       \ 'name' : '+actions' ,
-      \ 'c' : [':ColorizerToggle'        , 'colorizer'],
-      \ 'e' : [':CocCommand explorer'    , 'explorer'],
       \ 'h' : [':let @/ = ""'            , 'remove search highlight'],
       \ 'l' : [':Bracey'                 , 'start live server'],
       \ 'L' : [':BraceyStop'             , 'stop live server'],
@@ -231,7 +229,7 @@ let g:which_key_map.t = {
       \ 'm' : [':FloatermNew lazynpm'                           , 'npm'],
       \ 'r' : [':FloatermNew ranger'                            , 'ranger'],
       \ 't' : [':FloatermToggle'                                , 'toggle'],
-      \ 'y' : [':FloatermNew ytop'                              , 'ytop'],
+      \ 'y' : [':FloatermNew btm'                               , 'btm'],
       \ 'u' : [':FloatermNew ncdu'                              , 'ncdu'],
       \ }
 
diff --git a/.config/nvim/lua/barbar/init.lua b/.config/nvim/lua/barbar/init.lua
deleted file mode 100644
index e4eb06b..0000000
--- a/.config/nvim/lua/barbar/init.lua
+++ /dev/null
@@ -1,118 +0,0 @@
-vim.api.nvim_set_keymap('n', '<TAB>', ':BufferNext<CR>', { noremap = true, silent = true })
-vim.api.nvim_set_keymap('n', '<S-TAB>', ':BufferPrevious<CR>', { noremap = true, silent = true })
---[[ nnoremap <silent>    <A-,> :BufferPrevious<CR>
-nnoremap <silent>    <A-.> :BufferNext<CR> ]]
-
-
---" These commands will sort buffers by directory, language, or a custom criteria
---nnoremap <silent>be :BufferLineSortByExtension<CR>
---nnoremap <silent>bd :BufferLineSortByDirectory<CR>
---nnoremap <silent><mymap> :lua require'bufferline'.sort_buffers_by(function (buf_a, buf_b) return buf_a.id < buf_b.id end)<CR>
--- colors for active , inactive buffer tabs 
---[[ require "bufferline".setup {
-    options = {
-        -- buffer_close_icon = "",
-        -- modified_icon = "●",
-        -- close_icon = "",
-        -- left_trunc_marker = "",
-        -- right_trunc_marker = "",
-        -- max_name_length = 14,
-        -- max_prefix_length = 13,
-        -- tab_size = 18,
-        -- enforce_regular_tabs = true,
-        -- view = "multiwindow",
-        -- show_buffer_close_icons = true,
-        -- separator_style = 'slant'
-        separator_style = "thin"
-    },
-    highlights = {
-        background = {
-            guifg = "#abb2bf",
-            guibg = "#282c34"
-        },
-        fill = {
-            guifg = "#282c34",
-            guibg = "#1e1e1e"
-        },
-        buffer_selected = {
-            guifg = "#abb2bf",
-            guibg = "#3A3E44",
-            gui = "bold"
-        },
-        buffer_selected = {
-            guifg = "#abb2bf",
-            guibg = "#3A3E44",
-            gui = "bold"
-        },
-        separator_visible = {
-            guifg = "#1e1e1e",
-            guibg = "#1e1e1e"
-        },
-        separator_selected = {
-            guifg = "#1e1e1e",
-            guibg = "#1e1e1e"
-        },
-        separator = {
-            guifg = "#1e1e1e",
-            guibg = "#1e1e1e"
-        },
-        indicator_selected = {
-            guifg = "#abb2bf",
-            guibg = "#3a3e44"
-        },
-        modified_selected = {
-            guifg = "#abb2bf",
-            guibg = "#3a3e44"
-        },
-        modified = {
-            guifg = "#abb2bf",
-            guibg = "#282c34"
-        },
-        modified_visible = {
-            guifg = "#abb2bf",
-            guibg = "#282c34"
-        },
-        duplicate_selected = {
-            guifg = "#abb3bf",
-            guibg = "#3a3e44",
-            -- gui = "italic"
-        },
-        duplicate_visible = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-            -- gui = "italic"
-        },
-        duplicate = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-            -- gui = "italic"
-        },
-        tab = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-        },
-        tab_selected = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-        },
-        tab_close = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-        },
-        pick_selected = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-            gui = "bold,italic"
-        },
-        pick_visible = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-            gui = "bold,italic"
-        },
-        pick = {
-            guifg = "#abb3bf",
-            guibg = "#282c34",
-            gui = "bold,italic"
-        }
-    }
-} ]]
diff --git a/.config/nvim/lua/kommentary/init.lua b/.config/nvim/lua/kommentary/init.lua
deleted file mode 100644
index dea90f7..0000000
--- a/.config/nvim/lua/kommentary/init.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-vim.g.kommentary_create_default_mappings = false
-vim.api.nvim_set_keymap("n", "<leader>/", "<Plug>kommentary_line_default", {})
-vim.api.nvim_set_keymap("v", "<leader>/", "<Plug>kommentary_visual_default", {})
-require('kommentary.config').configure_language("default", {
-    prefer_single_line_comments = true,
-})
diff --git a/.config/nvim/lua/lightbulb/init.lua b/.config/nvim/lua/lightbulb/init.lua
deleted file mode 100644
index 1469c5b..0000000
--- a/.config/nvim/lua/lightbulb/init.lua
+++ /dev/null
@@ -1,36 +0,0 @@
--- Showing defaults
-require'nvim-lightbulb'.update_lightbulb {
-    sign = {
-        enabled = true,
-        -- Priority of the gutter sign
-        priority = 10,
-    },
-    float = {
-        enabled = false,
-        -- Text to show in the popup float
-        text = "💡",
-        -- Available keys for window options:
-        -- - height     of floating window
-        -- - width      of floating window
-        -- - wrap_at    character to wrap at for computing height
-        -- - max_width  maximal width of floating window
-        -- - max_height maximal height of floating window
-        -- - pad_left   number of columns to pad contents at left
-        -- - pad_right  number of columns to pad contents at right
-        -- - pad_top    number of lines to pad contents at top
-        -- - pad_bottom number of lines to pad contents at bottom
-        -- - offset_x   x-axis offset of the floating window
-        -- - offset_y   y-axis offset of the floating window
-        -- - anchor     corner of float to place at the cursor (NW, NE, SW, SE)
-        -- - winblend   transparency of the window (0-100)
-        win_opts = {},
-    },
-    virtual_text = {
-        enabled = false,
-        -- Text to show at virtual text
-        text = "💡",
-    }
-}
-
-
-vim.cmd [[autocmd CursorHold,CursorHoldI * lua require'nvim-lightbulb'.update_lightbulb()]]
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
index 9bcec6c..1122ba3 100644
--- a/.config/nvim/lua/plugins.lua
+++ b/.config/nvim/lua/plugins.lua
@@ -35,9 +35,9 @@ return require('packer').startup(function()
   use 'hrsh7th/vim-vsnip-integ'
 
   -- Treesitter
-  use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
-  use 'nvim-treesitter/playground'
-  use 'p00f/nvim-ts-rainbow'
+  -- use { 'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' }
+  -- use 'nvim-treesitter/playground'
+  -- use 'p00f/nvim-ts-rainbow'
 
   -- Icons
   use 'kyazdani42/nvim-web-devicons'
@@ -46,7 +46,6 @@ return require('packer').startup(function()
   -- Status Line and Bufferline
   use 'glepnir/galaxyline.nvim'
   use {'akinsho/nvim-bufferline.lua', requires = 'kyazdani42/nvim-web-devicons'}
-  use 'romgrk/barbar.nvim'
 
   -- Telescope
   use 'nvim-lua/popup.nvim'
@@ -95,5 +94,4 @@ return require('packer').startup(function()
   use 'junegunn/goyo.vim'
   use 'junegunn/limelight.vim'
   use 'vimwiki/vimwiki'
-  use 'kosayoda/nvim-lightbulb'
 end)
diff --git a/.config/nvim/lua/settings.lua b/.config/nvim/lua/settings.lua
index 7ad52c6..e75bb02 100644
--- a/.config/nvim/lua/settings.lua
+++ b/.config/nvim/lua/settings.lua
@@ -34,3 +34,14 @@ vim.o.timeoutlen=100                      --By default timeoutlen is 1000 ms
 vim.o.clipboard="unnamedplus"               --Copy paste between vim and everything else
 vim.o.incsearch=true
 vim.o.guifont="SpaceMono\\ Nerd\\ Font\\ Mono:h18"
+
+-- relative line numbers
+-- vim.cmd('set number relativenumber')
+--[[ local u = require('utils')
+
+u.define_augroups({
+    numbertoggle = {
+        {'BufEnter', 'FocusGained', 'InsertLeave * set relativenumber'},
+        {'BufLeave', 'FocusLost', 'InsertEnter * set norelativenumber'},
+    }, 
+}) ]]
diff --git a/.config/nvim/lua/utils.lua b/.config/nvim/lua/utils.lua
index b5f1413..d892729 100644
--- a/.config/nvim/lua/utils.lua
+++ b/.config/nvim/lua/utils.lua
@@ -29,3 +29,10 @@ define_augroups(
         },
     }
 )
+
+define_augroups({
+    numbertoggle = {
+        {'BufEnter,FocusGained,InsertLeave', '*', 'set relativenumber'},
+        {'BufLeave,FocusLost,InsertEnter', '*', 'set norelativenumber'},
+    }, 
+})