LunarVim

42 files changed, 226 insertions, 462 deletions

diff --git a/lua/lsp/emmet-ls.lua b/lua/lsp/emmet-ls.lua
new file mode 100644
index 00000000..6531ccf0
--- /dev/null
+++ b/lua/lsp/emmet-ls.lua
@@ -0,0 +1,19 @@
+local nvim_lsp = require'lspconfig'
+local configs = require'lspconfig/configs'
+local capabilities = vim.lsp.protocol.make_client_capabilities()
+capabilities.textDocument.completion.completionItem.snippetSupport = true
+
+configs.emmet_ls = {
+  default_config = {
+    cmd = {'emmet-ls', '--stdio'};
+    filetypes = {'html', 'css'};
+    root_dir = function()
+      return vim.loop.cwd()
+    end;
+    settings = {};
+  };
+}
+
+nvim_lsp.emmet_ls.setup{
+  -- on_attach = on_attach;
+}
diff --git a/lua/lsp/virtual_text.lua b/lua/lsp/virtual_text.lua
deleted file mode 100644
index 9ca2e998..00000000
--- a/lua/lsp/virtual_text.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local virtual_text = {}
-
-virtual_text.show = true
-
-virtual_text.toggle = function()
-    virtual_text.show = not virtual_text.show
-    vim.lsp.diagnostic.display(
-        vim.lsp.diagnostic.get(0, 1),
-        0,
-        1,
-        {virtual_text = virtual_text.show}
-    )
-end
-
-return virtual_text
diff --git a/lua/nv-autocommands/init.lua b/lua/lv-autocommands/init.lua
index ff2cbf50..5b562784 100644
--- a/lua/nv-autocommands/init.lua
+++ b/lua/lv-autocommands/init.lua
@@ -1,4 +1,4 @@
-local utils = require('nv-utils')
+local utils = require('lv-utils')
 
 local auto_formatters = {            }
 
@@ -24,7 +24,7 @@ utils.define_augroups({
         {'BufWinEnter', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
         {'BufRead', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
         {'BufNewFile', '*', 'setlocal formatoptions-=c formatoptions-=r formatoptions-=o'},
-        {'VimLeavePre', '*', 'set title set titleold='},
+        {'VimLeavePre', '*', 'set title set titleold='}
 
         -- {'User', 'GoyoLeave', 'lua require(\'galaxyline\').disable_galaxyline()'},
         -- {'User', 'GoyoEnter', 'lua require(\'galaxyline\').galaxyline_augroup()'},
diff --git a/lua/nv-autopairs/init.lua b/lua/lv-autopairs/init.lua
index 5d0adf85..5d0adf85 100644
--- a/lua/nv-autopairs/init.lua
+++ b/lua/lv-autopairs/init.lua
diff --git a/lua/nv-barbar/init.lua b/lua/lv-barbar/init.lua
index 49c1206b..49c1206b 100644
--- a/lua/nv-barbar/init.lua
+++ b/lua/lv-barbar/init.lua
diff --git a/lua/nv-comment/init.lua b/lua/lv-comment/init.lua
index df794386..df794386 100644
--- a/lua/nv-comment/init.lua
+++ b/lua/lv-comment/init.lua
diff --git a/lua/nv-compe/init.lua b/lua/lv-compe/init.lua
index 61270960..61270960 100644
--- a/lua/nv-compe/init.lua
+++ b/lua/lv-compe/init.lua
diff --git a/lua/lv-dashboard/init.lua b/lua/lv-dashboard/init.lua
new file mode 100644
index 00000000..b8553405
--- /dev/null
+++ b/lua/lv-dashboard/init.lua
@@ -0,0 +1,55 @@
+-- vim.g.dashboard_custom_header = {
+--     '███╗   ██╗██╗   ██╗ ██████╗ ██████╗ ██████╗ ███████╗',
+--     '████╗  ██║██║   ██║██╔════╝██╔═══██╗██╔══██╗██╔════╝',
+--     '██╔██╗ ██║██║   ██║██║     ██║   ██║██║  ██║█████╗',
+--     '██║╚██╗██║╚██╗ ██╔╝██║     ██║   ██║██║  ██║██╔══╝',
+--     '██║ ╚████║ ╚████╔╝ ╚██████╗╚██████╔╝██████╔╝███████╗',
+--     '╚═╝  ╚═══╝  ╚═══╝   ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝'
+-- }
+-- vim.g.dashboard_custom_header = {
+--
+-- '      _..._                                                                           ',
+-- '    .\'     `.   ██      ██    ██ ███    ██  █████  ██████  ██    ██ ██ ███    ███ ',
+-- '   :         :  ██      ██    ██ ████   ██ ██   ██ ██   ██ ██    ██ ██ ████  ████ ',
+-- '   :         :  ██      ██    ██ ██ ██  ██ ███████ ██████  ██    ██ ██ ██ ████ ██ ',
+-- '   `.       .\'  ██      ██    ██ ██  ██ ██ ██   ██ ██   ██  ██  ██  ██ ██  ██  ██ ',
+-- '     `-...-\'    ███████  ██████  ██   ████ ██   ██ ██   ██   ████   ██ ██      ██ ',
+--
+-- }
+
+vim.g.dashboard_custom_header = {
+
+'                 _..._                                                                           ',
+'               .\'   (_`.    _                         __     ___           ',
+'              :  .      :  | |   _   _ _ __   __ _ _ _\\ \\   / (_)_ __ ___  ',
+'              :)    ()  :  | |  | | | | \'_ \\ / _` | \'__\\ \\ / /| | \'_ ` _ \\ ',
+'              `.   .   .\'  | |__| |_| | | | | (_| | |   \\ V / | | | | | | |',
+'                `-...-\'    |_____\\__,_|_| |_|\\__,_|_|    \\_/  |_|_| |_| |_|',
+
+}
+
+
+vim.g.dashboard_default_executive = 'telescope'
+
+vim.g.dashboard_custom_section = {
+    a = {description = {'  Find File          '}, command = 'Telescope find_files'},
+    b = {description = {'  Recently Used Files'}, command = 'Telescope oldfiles'},
+    c = {description = {'  Load Last Session  '}, command = 'SessionLoad'},
+    d = {description = {'  Find Word          '}, command = 'Telescope live_grep'},
+    e = {description = {'  Settings           '}, command = ':e ~/.config/nvim/nv-settings.lua'}
+    -- e = {description = {'  Marks              '}, command = 'Telescope marks'}
+}
+
+-- file_browser = {description = {' File Browser'}, command = 'Telescope find_files'},
+
+-- vim.g.dashboard_custom_shortcut = {
+--     a = 'f',
+--     find_word = 'SPC f a',
+--     last_session = 'SPC s l',
+--     new_file = 'SPC c n',
+--     book_marks = 'SPC f b'
+-- }
+-- find_history = 'SPC f h',
+
+-- vim.g.dashboard_session_directory = '~/.cache/nvim/session'
+vim.g.dashboard_custom_footer = {'chrisatmachine.com'}
diff --git a/lua/nv-emmet/init.lua b/lua/lv-emmet/init.lua
index 445a33f7..445a33f7 100644
--- a/lua/nv-emmet/init.lua
+++ b/lua/lv-emmet/init.lua
diff --git a/lua/nv-galaxyline/init.lua b/lua/lv-galaxyline/init.lua
index f9ac859b..f9ac859b 100644
--- a/lua/nv-galaxyline/init.lua
+++ b/lua/lv-galaxyline/init.lua
diff --git a/lua/nv-gitsigns/init.lua b/lua/lv-gitsigns/init.lua
index c19a5d00..c19a5d00 100644
--- a/lua/nv-gitsigns/init.lua
+++ b/lua/lv-gitsigns/init.lua
diff --git a/lua/nv-globals.lua b/lua/lv-globals.lua
index bae0e9db..a8fc6b21 100644
--- a/lua/nv-globals.lua
+++ b/lua/lv-globals.lua
@@ -1,7 +1,7 @@
 O = {
     auto_close_tree = 0,
     auto_complete = true,
-    colorscheme = 'nvcode',
+    colorscheme = 'lunar',
     hidden_files = true,
     wrap_lines = false,
     number = true,
diff --git a/lua/nv-lspinstall/init.lua b/lua/lv-lspinstall/init.lua
index 2b6e0edb..2b6e0edb 100644
--- a/lua/nv-lspinstall/init.lua
+++ b/lua/lv-lspinstall/init.lua
diff --git a/lua/nv-lspkind/init.lua b/lua/lv-lspkind/init.lua
index e3c590fc..e3c590fc 100644
--- a/lua/nv-lspkind/init.lua
+++ b/lua/lv-lspkind/init.lua
diff --git a/lua/nv-nvim-dap/init.lua b/lua/lv-nvim-dap/init.lua
index e69de29b..e69de29b 100644
--- a/lua/nv-nvim-dap/init.lua
+++ b/lua/lv-nvim-dap/init.lua
diff --git a/lua/lv-nvimtree/init.lua b/lua/lv-nvimtree/init.lua
new file mode 100644
index 00000000..3d2f7ad7
--- /dev/null
+++ b/lua/lv-nvimtree/init.lua
@@ -0,0 +1,65 @@
+--[[ " 
+--let g:nvim_tree_auto_ignore_ft = 'startify' "empty by default, don't auto open tree on specific filetypes.
+let g:nvim_tree_hide_dotfiles = 1 "0 by default, this option hides files and folders starting with a dot `.`
+let g:nvim_tree_git_hl = 1 "0 by default, will enable file highlight for git attributes (can be used without the icons).
+" let g:nvim_tree_tab_open = 1 "0 by default, will open the tree when entering a new tab and the tree was previously open
+" let g:nvim_tree_width_allow_resize  = 1 "0 by default, will not resize the tree when opening a file
+let g:nvim_tree_show_icons = {
+    \ 'git': 1,
+    \ 'folders': 1,
+    \ 'files': 1,
+    \ }
+
+"If 0, do not show the icons for one of 'git' 'folder' and 'files'
+"1 by default, notice that if 'files' is 1, it will only display
+"if nvim-web-devicons is installed and on your runtimepath ]] -- vim.g.nvim_tree_ignore = [ '.git', 'node_modules', '.cache' ] "empty by default
+vim.g.nvim_tree_disable_netrw = 0 -- "1 by default, disables netrw
+-- vim.g.nvim_tree_hijack_netrw = 0 --"1 by default, prevents netrw from automatically opening when opening directories (but lets you keep its other utilities)
+vim.g.nvim_tree_hide_dotfiles = 1 -- 0 by default, this option hides files and folders starting with a dot `.`
+vim.g.nvim_tree_indent_markers = 1 -- "0 by default, this option shows indent markers when folders are open
+vim.g.nvim_tree_follow = 1 -- "0 by default, this option allows the cursor to be updated when entering a buffer
+vim.g.nvim_tree_auto_close = O.auto_close_tree -- 0 by default, closes the tree when it's the last window
+vim.g.nvim_tree_auto_ignore_ft = 'startify' --empty by default, don't auto open tree on specific filetypes.
+local tree_cb = require'nvim-tree.config'.nvim_tree_callback
+    vim.g.nvim_tree_bindings = {
+      -- ["<CR>"] = ":YourVimFunction()<cr>",
+      -- ["u"] = ":lua require'some_module'.some_function()<cr>",
+
+      -- default mappings
+      ["<CR>"]           = tree_cb("edit"),
+      ["o"]              = tree_cb("edit"),
+      ["l"]              = tree_cb("edit"),
+      ["<2-LeftMouse>"]  = tree_cb("edit"),
+      ["<2-RightMouse>"] = tree_cb("cd"),
+      ["<C-]>"]          = tree_cb("cd"),
+      ["<C-v>"]          = tree_cb("vsplit"),
+      ["<C-x>"]          = tree_cb("split"),
+      ["<C-t>"]          = tree_cb("tabnew"),
+      ["<"]              = tree_cb("prev_sibling"),
+      [">"]              = tree_cb("next_sibling"),
+      ["<BS>"]           = tree_cb("close_node"),
+      -- ["h"]           = tree_cb("close_node"),
+      ["<S-CR>"]         = tree_cb("close_node"),
+      ["<Tab>"]          = tree_cb("preview"),
+      ["I"]              = tree_cb("toggle_ignored"),
+      ["H"]              = tree_cb("toggle_dotfiles"),
+      ["R"]              = tree_cb("refresh"),
+      ["a"]              = tree_cb("create"),
+      ["d"]              = tree_cb("remove"),
+      ["r"]              = tree_cb("rename"),
+      ["<C-r>"]          = tree_cb("full_rename"),
+      ["x"]              = tree_cb("cut"),
+      ["c"]              = tree_cb("copy"),
+      ["p"]              = tree_cb("paste"),
+      ["[c"]             = tree_cb("prev_git_item"),
+      ["]c"]             = tree_cb("next_git_item"),
+      ["-"]              = tree_cb("dir_up"),
+      ["q"]              = tree_cb("close"),
+    }
+-- vim.g.nvim_tree_show_icons = {git = 1, folders = 1, files = 1}
+vim.g.nvim_tree_icons = {
+    default = '',
+    symlink = '',
+    git = {unstaged = "", staged = "✓", unmerged = "", renamed = "➜", untracked = ""},
+    folder = {default = "", open = "", empty = "", empty_open = "", symlink = ""}
+}
diff --git a/lua/lv-rnvimr/init.lua b/lua/lv-rnvimr/init.lua
new file mode 100644
index 00000000..f84bde9a
--- /dev/null
+++ b/lua/lv-rnvimr/init.lua
@@ -0,0 +1,6 @@
+-- Make Ranger replace netrw and be the file explorer
+vim.g.rnvimr_ex_enable = 1
+vim.g.rnvimr_draw_border = 1
+vim.g.rnvimr_pick_enable = 1
+vim.g.rnvimr_bw_enable = 1
+vim.api.nvim_set_keymap('n', '-', ':RnvimrToggle<CR>', {noremap = true, silent = true})
diff --git a/lua/nv-telescope/init.lua b/lua/lv-telescope/init.lua
index 0255f6cf..0e561f51 100644
--- a/lua/nv-telescope/init.lua
+++ b/lua/lv-telescope/init.lua
@@ -2,7 +2,6 @@ local actions = require('telescope.actions')
 -- Global remapping
 ------------------------------
 -- '--color=never',
-require('telescope').load_extension('media_files')
 require('telescope').setup {
     defaults = {
         find_command = {'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case'},
@@ -61,13 +60,5 @@ require('telescope').setup {
                 -- ["<C-i>"] = my_cool_custom_action,
             }
         }
-    },
-    extensions = {
-        media_files = {
-            -- filetypes whitelist
-            -- defaults to {"png", "jpg", "mp4", "webm", "pdf"}
-            filetypes = {"png", "webp", "jpg", "jpeg"},
-            find_cmd = "rg" -- find command (defaults to `fd`)
-        }
     }
 }
diff --git a/lua/nv-treesitter/init.lua b/lua/lv-treesitter/init.lua
index f846a917..02a9a826 100644
--- a/lua/nv-treesitter/init.lua
+++ b/lua/lv-treesitter/init.lua
@@ -1,21 +1,12 @@
 require'nvim-treesitter.configs'.setup {
     ensure_installed = O.treesitter.ensure_installed, -- one of "all", "maintained" (parsers with maintainers), or a list of languages
-    -- TODO seems to be broken
     ignore_install = O.treesitter.ignore_install,
     highlight = {
         enable = O.treesitter.highlight.enabled -- false will disable the whole extension
     },
     -- indent = {enable = true, disable = {"python", "html", "javascript"}},
+    -- TODO seems to be broken
     indent = {enable = {"javascriptreact"}},
-    playground = {
-        enable = O.treesitter.playground.enabled,
-        disable = {},
-        updatetime = 25, -- Debounced time for highlighting nodes in the playground from source code
-        persist_queries = false -- Whether the query persists across vim sessions
-    },
     autotag = {enable = true},
-    rainbow = {enable = O.treesitter.rainbow.enabled},
-    context_commentstring = {enable = true, config = {javascriptreact = {style_element = '{/*%s*/}'}}}
-    -- refactor = {highlight_definitions = {enable = true}}
 }
 
diff --git a/lua/nv-utils/init.lua b/lua/lv-utils/init.lua
index c177cb09..c177cb09 100644
--- a/lua/nv-utils/init.lua
+++ b/lua/lv-utils/init.lua
diff --git a/lua/nv-bookmark/init.lua b/lua/nv-bookmark/init.lua
deleted file mode 100644
index 1f729bc8..00000000
--- a/lua/nv-bookmark/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.g.bookmark_no_default_key_mappings = 1
-vim.g.bookmark_sign = ''
diff --git a/lua/nv-colorizer/init.lua b/lua/nv-colorizer/init.lua
deleted file mode 100644
index a3a7aaed..00000000
--- a/lua/nv-colorizer/init.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-require'colorizer'.setup(
-  {'*';},
-  {
-    RGB      = true;         -- #RGB hex codes
-    RRGGBB   = true;         -- #RRGGBB hex codes
-    RRGGBBAA = true;         -- #RRGGBBAA hex codes
-    rgb_fn   = true;         -- CSS rgb() and rgba() functions
-    hsl_fn   = true;         -- CSS hsl() and hsla() functions
-    css      = true;         -- Enable all CSS features: rgb_fn, hsl_fn, names, RGB, RRGGBB
-    css_fn   = true;         -- Enable all CSS *functions*: rgb_fn, hsl_fn
-  })
-	  -- names    = true;         -- "Name" codes like Blue
diff --git a/lua/nv-dadbod/init.lua b/lua/nv-dadbod/init.lua
deleted file mode 100644
index f5de451a..00000000
--- a/lua/nv-dadbod/init.lua
+++ /dev/null
@@ -1,6 +0,0 @@
-vim.api.nvim_set_keymap("n", "<leader>Du", ":DBUIToggle<CR>", {noremap=true, silent = true})
-vim.api.nvim_set_keymap("n", "<leader>Df", ":DBUIFindBuffer<CR>", {noremap=true, silent = true})
-vim.api.nvim_set_keymap("n", "<leader>Dr", ":DBUIRenameBuffer<CR>", {noremap=true, silent = true})
-vim.api.nvim_set_keymap("n", "<leader>Dl", ":DBUILastQueryInfo<CR>", {noremap=true, silent = true})
-vim.g.db_ui_save_location = O.database.save_location
-vim.g.db_ui_auto_execute_table_helpers = O.database.auto_execute
\ No newline at end of file
diff --git a/lua/nv-dashboard/init.lua b/lua/nv-dashboard/init.lua
deleted file mode 100644
index 9ef9b2d6..00000000
--- a/lua/nv-dashboard/init.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-vim.g.dashboard_custom_header = {
-    '███╗   ██╗██╗   ██╗ ██████╗ ██████╗ ██████╗ ███████╗',
-    '████╗  ██║██║   ██║██╔════╝██╔═══██╗██╔══██╗██╔════╝',
-    '██╔██╗ ██║██║   ██║██║     ██║   ██║██║  ██║█████╗',
-    '██║╚██╗██║╚██╗ ██╔╝██║     ██║   ██║██║  ██║██╔══╝',
-    '██║ ╚████║ ╚████╔╝ ╚██████╗╚██████╔╝██████╔╝███████╗',
-    '╚═╝  ╚═══╝  ╚═══╝   ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝'
-}
-
-vim.g.dashboard_default_executive = 'telescope'
-
-vim.g.dashboard_custom_section = {
-    a = {description = {'  Find File          '}, command = 'Telescope find_files'},
-    b = {description = {'  Recently Used Files'}, command = 'Telescope oldfiles'},
-    c = {description = {'  Load Last Session  '}, command = 'SessionLoad'},
-    d = {description = {'  Find Word          '}, command = 'Telescope live_grep'},
-    e = {description = {'  Settings           '}, command = ':e ~/.config/nvim/nv-settings.lua'}
-    -- e = {description = {'  Marks              '}, command = 'Telescope marks'}
-}
-
--- file_browser = {description = {' File Browser'}, command = 'Telescope find_files'},
-
--- vim.g.dashboard_custom_shortcut = {
---     a = 'f',
---     find_word = 'SPC f a',
---     last_session = 'SPC s l',
---     new_file = 'SPC c n',
---     book_marks = 'SPC f b'
--- }
--- find_history = 'SPC f h',
-
--- vim.g.dashboard_session_directory = '~/.cache/nvim/session'
-vim.g.dashboard_custom_footer = {'chrisatmachine.com'}
diff --git a/lua/nv-dependency/init.lua b/lua/nv-dependency/init.lua
deleted file mode 100644
index fc056d55..00000000
--- a/lua/nv-dependency/init.lua
+++ /dev/null
@@ -1 +0,0 @@
-require('dependency_assist').setup()
\ No newline at end of file
diff --git a/lua/nv-dial/init.lua b/lua/nv-dial/init.lua
deleted file mode 100644
index a743303f..00000000
--- a/lua/nv-dial/init.lua
+++ /dev/null
@@ -1,15 +0,0 @@
-local dial = require("dial")
-
-dial.augends["custom#boolean"] = dial.common.enum_cyclic{
-    name = "boolean",
-    strlist = {"true", "false"},
-}
-table.insert(dial.config.searchlist.normal, "custom#boolean")
-vim.cmd([[
-nmap <C-a> <Plug>(dial-increment)
-nmap <C-x> <Plug>(dial-decrement)
-vmap <C-a> <Plug>(dial-increment)
-vmap <C-x> <Plug>(dial-decrement)
-vmap g<C-a> <Plug>(dial-increment-additional)
-vmap g<C-x> <Plug>(dial-decrement-additional)
-  ]])
diff --git a/lua/nv-doge/init.lua b/lua/nv-doge/init.lua
deleted file mode 100644
index 31746795..00000000
--- a/lua/nv-doge/init.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.g.doge_mapping = '<Leader>*'
\ No newline at end of file
diff --git a/lua/nv-floaterm/init.lua b/lua/nv-floaterm/init.lua
deleted file mode 100644
index b8ecbd40..00000000
--- a/lua/nv-floaterm/init.lua
+++ /dev/null
@@ -1,14 +0,0 @@
--- Floaterm
-vim.g.floaterm_keymap_toggle = '<F1>'
-vim.g.floaterm_keymap_next   = '<F2>'
-vim.g.floaterm_keymap_prev   = '<F3>'
-vim.g.floaterm_keymap_new    = '<F4>'
-vim.g.floaterm_title=''
-
-vim.g.floaterm_gitcommit='floaterm'
-vim.g.floaterm_shell=O.shell
-vim.g.floaterm_autoinsert=1
-vim.g.floaterm_width=0.8
-vim.g.floaterm_height=0.8
-vim.g.floaterm_wintitle=0
-vim.g.floaterm_autoclose=1
diff --git a/lua/nv-gitblame/init.lua b/lua/nv-gitblame/init.lua
deleted file mode 100644
index 12645a7f..00000000
--- a/lua/nv-gitblame/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.cmd('highlight default link gitblame SpecialComment')
-vim.g.gitblame_enabled = 0
diff --git a/lua/nv-hop/init.lua b/lua/nv-hop/init.lua
deleted file mode 100644
index cd71293b..00000000
--- a/lua/nv-hop/init.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.api.nvim_set_keymap('n', 's', ":HopChar2<cr>", {silent = true})
-vim.api.nvim_set_keymap('n', 'S', ":HopWord<cr>", {silent = true})
-
diff --git a/lua/nv-indentline/init.lua b/lua/nv-indentline/init.lua
deleted file mode 100644
index 8ec677b4..00000000
--- a/lua/nv-indentline/init.lua
+++ /dev/null
@@ -1,11 +0,0 @@
-vim.g.indent_blankline_buftype_exclude = {'terminal'}
-vim.g.indent_blankline_filetype_exclude = {'man', 'help', 'startify', 'dashboard', 'packer', 'neogitstatus', 'markdown'}
-vim.g.indent_blankline_char = '▏'
--- vim.g.indent_blankline_use_treesitter = true
-vim.g.indent_blankline_show_trailing_blankline_indent = false
-vim.g.indent_blankline_show_current_context = true
-vim.g.indent_blankline_context_patterns = {
-    'class', 'return', 'function', 'method', '^if', '^while', 'jsx_element', '^for', '^object', '^table', 'block',
-    'arguments', 'if_statement', 'else_clause', 'jsx_element', 'jsx_self_closing_element', 'try_statement',
-    'catch_clause', 'import_statement', 'operation_type'
-}
diff --git a/lua/nv-lightbulb/init.lua b/lua/nv-lightbulb/init.lua
deleted file mode 100644
index 02b21184..00000000
--- a/lua/nv-lightbulb/init.lua
+++ /dev/null
@@ -1,34 +0,0 @@
--- Showing defaults
-require'nvim-lightbulb'.update_lightbulb {
-    sign = {
-        enabled = true,
-        -- Priority of the gutter sign
-        priority = 10,
-        text = "💡",
-    },
-    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 = "💡",
-    }
-}
diff --git a/lua/nv-matchup/init.lua b/lua/nv-matchup/init.lua
deleted file mode 100644
index 44949085..00000000
--- a/lua/nv-matchup/init.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.g.matchup_matchparen_offscreen = {}
diff --git a/lua/nv-numb/init.lua b/lua/nv-numb/init.lua
deleted file mode 100644
index 415327f1..00000000
--- a/lua/nv-numb/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
-require('numb').setup{
-   show_numbers = true, -- Enable 'number' for the window while peeking
-   show_cursorline = true -- Enable 'cursorline' for the window while peeking
-}
diff --git a/lua/nv-nvim-peekup/init.lua b/lua/nv-nvim-peekup/init.lua
deleted file mode 100644
index a6ff62b7..00000000
--- a/lua/nv-nvim-peekup/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-vim.g.peekup_open = '""'
-
diff --git a/lua/nv-nvimtree/init.lua b/lua/nv-nvimtree/init.lua
deleted file mode 100644
index 2f4d42a9..00000000
--- a/lua/nv-nvimtree/init.lua
+++ /dev/null
@@ -1,74 +0,0 @@
---[[ " 
---let g:nvim_tree_auto_ignore_ft = 'startify' "empty by default, don't auto open tree on specific filetypes.
-let g:nvim_tree_hide_dotfiles = 1 "0 by default, this option hides files and folders starting with a dot `.`
-let g:nvim_tree_git_hl = 1 "0 by default, will enable file highlight for git attributes (can be used without the icons).
-" let g:nvim_tree_tab_open = 1 "0 by default, will open the tree when entering a new tab and the tree was previously open
-" let g:nvim_tree_width_allow_resize  = 1 "0 by default, will not resize the tree when opening a file
-let g:nvim_tree_show_icons = {
-    \ 'git': 1,
-    \ 'folders': 1,
-    \ 'files': 1,
-    \ }
-
-"If 0, do not show the icons for one of 'git' 'folder' and 'files'
-"1 by default, notice that if 'files' is 1, it will only display
-"if nvim-web-devicons is installed and on your runtimepath ]]
--- vim.g.nvim_tree_ignore = [ '.git', 'node_modules', '.cache' ] "empty by default
-vim.g.nvim_tree_disable_netrw = 0 --"1 by default, disables netrw
--- vim.g.nvim_tree_hijack_netrw = 0 --"1 by default, prevents netrw from automatically opening when opening directories (but lets you keep its other utilities)
-vim.g.nvim_tree_hide_dotfiles = 1 --0 by default, this option hides files and folders starting with a dot `.`
-vim.g.nvim_tree_indent_markers = 1 --"0 by default, this option shows indent markers when folders are open
-vim.g.nvim_tree_follow = 1 --"0 by default, this option allows the cursor to be updated when entering a buffer
--- vim.g.nvim_tree_lsp_diagnostics = 1 --0 by default, will show lsp diagnostics in the tree. See :help nvim_tree_lsp_diagnostics
-vim.g.nvim_tree_auto_close = O.auto_close_tree --0 by default, closes the tree when it's the last window
-vim.g.nvim_tree_auto_ignore_ft = 'startify' --"empty by default, don't auto open tree on specific filetypes.
-local tree_cb = require'nvim-tree.config'.nvim_tree_callback
-vim.g.nvim_tree_bindings = {
-    -- mappings
-    ["<CR>"] = tree_cb("edit"),
-    ["l"] = tree_cb("edit"),
-    ["o"] = tree_cb("edit"),
-    ["<2-LeftMouse>"] = tree_cb("edit"),
-    ["<2-RightMouse>"] = tree_cb("cd"),
-    ["<C-]>"] = tree_cb("cd"),
-    ["v"] = tree_cb("vsplit"),
-    ["s"] = tree_cb("split"),
-    ["<C-t>"] = tree_cb("tabnew"),
-    ["h"] = tree_cb("close_node"),
-    ["<BS>"] = tree_cb("close_node"),
-    ["<S-CR>"] = tree_cb("close_node"),
-    ["<Tab>"] = tree_cb("preview"),
-    ["I"] = tree_cb("toggle_ignored"),
-    ["H"] = tree_cb("toggle_dotfiles"),
-    ["R"] = tree_cb("refresh"),
-    ["a"] = tree_cb("create"),
-    ["d"] = tree_cb("remove"),
-    ["r"] = tree_cb("rename"),
-    ["<C-r>"] = tree_cb("full_rename"),
-    ["x"] = tree_cb("cut"),
-    ["c"] = tree_cb("copy"),
-    ["p"] = tree_cb("paste"),
-    ["[c"] = tree_cb("prev_git_item"),
-    ["]c"] = tree_cb("next_git_item"),
-    ["-"] = tree_cb("dir_up"),
-    ["q"] = tree_cb("close")
-}
-vim.g.nvim_tree_icons = {
-    default = '',
-    symlink = '',
-    git = {
-        unstaged = "",
-        staged = "",
-        unmerged = "",
-        renamed = "➜",
-        untracked = "",
-        -- ignored = "◌"
-    },
-    folder = {
-        default = "",
-        open = "",
-        empty = "",
-        empty_open = "",
-        symlink = ""
-    }
-}
diff --git a/lua/nv-quickscope/init.lua b/lua/nv-quickscope/init.lua
deleted file mode 100644
index 817bc6dc..00000000
--- a/lua/nv-quickscope/init.lua
+++ /dev/null
@@ -1,4 +0,0 @@
--- Trigger a highlight in the appropriate direction when pressing these keys:
--- vim.cmd('let g:qs_highlight_on_keys = [\'f\', \'F\', \'t\', \'T\']')
-vim.g.qs_highlight_on_keys = {'f', 'F', 't', 'T'}
-vim.g.qs_max_chars=150
diff --git a/lua/nv-rnvimr/init.lua b/lua/nv-rnvimr/init.lua
deleted file mode 100644
index 5a9f2b8a..00000000
--- a/lua/nv-rnvimr/init.lua
+++ /dev/null
@@ -1,24 +0,0 @@
--- Make Ranger replace netrw and be the file explorer
-vim.g.rnvimr_ex_enable = 1
-vim.g.rnvimr_draw_border = 1
-
--- Make Ranger to be hidden after picking a file
-vim.g.rnvimr_pick_enable = 1
-
--- Make Neovim to wipe the buffers corresponding to the files deleted by Ranger
-vim.g.rnvimr_bw_enable = 1
-
--- vim.cmd('nmap <leader>r :RnvimrToggle<CR>')
-
---[[ let g:rnvimr_ranger_cmd = 'ranger --cmd="set column_ratios 1,1"'
-            " \ --cmd="set draw_borders separators"'
-
-" let g:rnvimr_layout = { 'relative': 'editor',
-"             \ 'width': float2nr(round(0.6 * &columns)),
-"             \ 'height': float2nr(round(0.6 * &lines)),
-"             \ 'col': float2nr(round(0.2 * &columns)),
-"             \ 'row': float2nr(round(0.2 * &lines)),
-"             \ 'style': 'minimal' }
-
-let g:rnvimr_presets = [
-            \ {'width': 0.800, 'height': 0.800}] ]]
diff --git a/lua/nv-startify/init.lua b/lua/nv-startify/init.lua
deleted file mode 100644
index d7a65bc6..00000000
--- a/lua/nv-startify/init.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-vim.g.startify_custom_header = {
-    '   ███╗   ██╗██╗   ██╗ ██████╗ ██████╗ ██████╗ ███████╗',
-    '   ████╗  ██║██║   ██║██╔════╝██╔═══██╗██╔══██╗██╔════╝',
-    '   ██╔██╗ ██║██║   ██║██║     ██║   ██║██║  ██║█████╗',
-    '   ██║╚██╗██║╚██╗ ██╔╝██║     ██║   ██║██║  ██║██╔══╝',
-    '   ██║ ╚████║ ╚████╔╝ ╚██████╗╚██████╔╝██████╔╝███████╗',
-    '   ╚═╝  ╚═══╝  ╚═══╝   ╚═════╝ ╚═════╝ ╚═════╝ ╚══════╝'
-}
-
-vim.g.webdevicons_enable_startify = 1
-vim.g.startify_enable_special = 0
-vim.g.startify_session_dir = '~/.config/nvim/session'
-vim.g.startify_session_autoload = 1
-vim.g.startify_session_delete_buffers = 1
-vim.g.startify_change_to_vcs_root = 1
-vim.g.startify_fortune_use_unicode = 1
-vim.g.startify_session_persistence = 1
-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\' }, { \'c\': \'~/.config/nvim/lua/config.lua\' }, { \'z\': \'~/.zshrc\' }, { \'r\': \'~/.config/nvim/README.md\' }]',
-    true)
-
-vim.cmd([[
-function! StartifyEntryFormat()
-        return 'WebDevIconsGetFileTypeSymbol(absolute_path) ." ". entry_path'
-endfunction
-]])
-
diff --git a/lua/nv-surround/init.lua b/lua/nv-surround/init.lua
deleted file mode 100644
index e69de29b..00000000
--- a/lua/nv-surround/init.lua
+++ /dev/null
diff --git a/lua/nv-vim-rooter/init.lua b/lua/nv-vim-rooter/init.lua
deleted file mode 100644
index a8731945..00000000
--- a/lua/nv-vim-rooter/init.lua
+++ /dev/null
@@ -1,2 +0,0 @@
--- TODO create file
-vim.g.rooter_silent_chdir = 1
diff --git a/lua/plugins.lua b/lua/plugins.lua
index 2a48b66b..6bed60a3 100644
--- a/lua/plugins.lua
+++ b/lua/plugins.lua
@@ -1,4 +1,3 @@
--- vim.cmd [[packadd packer.nvim]]
 local execute = vim.api.nvim_command
 local fn = vim.fn
 
@@ -9,167 +8,98 @@ if fn.empty(fn.glob(install_path)) > 0 then
     execute 'packadd packer.nvim'
 end
 
-local my = function(file) require(file) end
+--- Check if a file or directory exists in this path
+local function require_plugin(plugin)
+    local plugin_prefix = fn.stdpath('data') .. '/site/pack/packer/opt/'
+
+    local plugin_path = plugin_prefix .. plugin .. '/'
+    --	print('test '..plugin_path)
+    local ok, err, code = os.rename(plugin_path, plugin_path)
+    if not ok then
+        if code == 13 then
+            -- Permission denied, but it exists
+            return true
+        end
+    end
+    --	print(ok, err, code)
+    if ok then vim.cmd('packadd ' .. plugin) end
+    return ok, err, code
+end
 
 vim.cmd 'autocmd BufWritePost plugins.lua PackerCompile' -- Auto compile when there are changes in plugins.lua
 
--- require('packer').init({display = {non_interactive = true}})
-require('packer').init({display = {auto_clean = false}})
-
 return require('packer').startup(function(use)
     -- Packer can manage itself as an optional plugin
     use 'wbthomason/packer.nvim'
 
-    -- Information
-    -- use 'nanotee/nvim-lua-guide'
-
-    -- Quality of life improvements
-    -- use 'norcalli/nvim_utils'
+    -- TODO refactor all of this (for now it works, but yes I know it could be wrapped in a simpler function)
+    use {'neovim/nvim-lspconfig', opt=true}
+    use {'glepnir/lspsaga.nvim', opt=true}
+    use {'onsails/lspkind-nvim', opt=true}
+    use {'kabouzeid/nvim-lspinstall', opt=true}
 
-    -- LSP
-    use 'neovim/nvim-lspconfig'
-    use 'glepnir/lspsaga.nvim'
-    use 'onsails/lspkind-nvim'
-    use 'kosayoda/nvim-lightbulb'
-    use 'mfussenegger/nvim-jdtls'
-    use 'kabouzeid/nvim-lspinstall'
+    -- Tlescope
+    use {'nvim-lua/popup.nvim', opt=true}
+    use {'nvim-lua/plenary.nvim', opt=true}
+    use {'nvim-telescope/telescope.nvim', opt=true}
 
-    -- Debugging
-    use 'mfussenegger/nvim-dap'
+    -- Dbugging
+    use {'mfussenegger/nvim-dap', opt=true}
 
-    -- Autocomplete
-    use 'hrsh7th/nvim-compe'
-    use 'mattn/emmet-vim'
-    use 'hrsh7th/vim-vsnip'
-    use "rafamadriz/friendly-snippets"
-    use 'ChristianChiarulli/html-snippets'
+    -- Atocomplete
+    use {'hrsh7th/nvim-compe', opt=true}
+    use {'hrsh7th/vim-vsnip', opt=true}
+    use {"rafamadriz/friendly-snippets", opt=true}
 
-    -- Treesitter
+    -- Teesitter
     use {'nvim-treesitter/nvim-treesitter', run = ':TSUpdate'}
-    use 'p00f/nvim-ts-rainbow'
-    use {'lukas-reineke/indent-blankline.nvim', branch = 'lua'}
-    use 'nvim-treesitter/playground'
-    use 'JoosepAlviste/nvim-ts-context-commentstring'
-    use 'windwp/nvim-ts-autotag'
+    use {'windwp/nvim-ts-autotag', opt=true}
 
-    -- Icons
-    use 'kyazdani42/nvim-web-devicons'
-    use 'ryanoasis/vim-devicons'
+    -- Eplorer
+    use 'kyazdani42/nvim-tree.lua'
+    -- TODO remove when open on dir is supported by nvimtree
+    use 'kevinhwang91/rnvimr'
 
-    -- Status Line and Bufferline
-    use { 'glepnir/galaxyline.nvim' }
-    -- use { 'glepnir/galaxyline.nvim', config = function() require'nv-galaxyline' end } -- inline fn alternative
-    use 'romgrk/barbar.nvim'
+-- use {'lukas-reineke/indent-blankline.nvim', opt=true, branch = 'lua'}
+    use {'lewis6991/gitsigns.nvim', opt = true}
+    use {'liuchengxu/vim-which-key', opt = true}
+    use {'ChristianChiarulli/dashboard-nvim', opt = true}
+    use {'windwp/nvim-autopairs', opt = true}
+    use {'terrortylor/nvim-comment', opt = true}
+    use {'kevinhwang91/nvim-bqf', opt = true}
 
-    -- Telescope
-    use 'nvim-lua/popup.nvim'
-    use 'nvim-lua/plenary.nvim'
-    use 'nvim-telescope/telescope.nvim'
-    use 'nvim-telescope/telescope-media-files.nvim'
+    -- Color
+    use {'christianchiarulli/nvcode-color-schemes.vim', opt = true}
 
-    -- Explorer
-    use 'kyazdani42/nvim-tree.lua'
+    -- Icons
+    use {'kyazdani42/nvim-web-devicons', opt = true}
 
-    -- Color
-    use 'christianchiarulli/nvcode-color-schemes.vim'
-    use 'norcalli/nvim-colorizer.lua'
-    use 'sheerun/vim-polyglot'
-
-    -- Git
-    -- use 'TimUntersberger/neogit'
-    use {'lewis6991/gitsigns.nvim', requires = {'nvim-lua/plenary.nvim'}}
-    use 'f-person/git-blame.nvim'
-    use 'tpope/vim-fugitive'
-    use 'tpope/vim-rhubarb'
-
-    -- Easily Create Gists
-    use 'mattn/vim-gist'
-    use 'mattn/webapi-vim'
-
-    -- Webdev
-    -- TODO add back when I learn it better 
-    -- use 'gennaro-tedesco/nvim-jqx'
-    -- use 'turbio/bracey.vim'
-
-    -- Php
-    use 'phpactor/phpactor'
-
-    -- Flutter
-    use 'thosakwe/vim-flutter'
-
-    -- Dependency assistent
-    use 'akinsho/dependency-assist.nvim'
-
-    -- Registers
-    -- use 'gennaro-tedesco/nvim-peekup'
-
-    -- Navigation
-    use 'unblevable/quick-scope' -- hop may replace you
-    use 'phaazon/hop.nvim'
-    use 'kevinhwang91/rnvimr' -- telescope may fully replace you
-
-    -- General Plugins
-    use 'liuchengxu/vim-which-key'
-    use 'kevinhwang91/nvim-bqf'
-    use 'airblade/vim-rooter'
-    use 'ChristianChiarulli/dashboard-nvim'
-    use 'metakirby5/codi.vim'
-    use {'iamcco/markdown-preview.nvim', run = 'cd app && npm install'}
-    use 'voldikss/vim-floaterm'
-    use 'terrortylor/nvim-comment'
-    use 'monaqa/dial.nvim'
-    use 'junegunn/goyo.vim'
-    use 'andymass/vim-matchup'
-    use 'MattesGroeger/vim-bookmarks'
-    use 'windwp/nvim-autopairs'
-    use 'mbbill/undotree'
-	use 'nacro90/numb.nvim'
-	use 'turbio/bracey.vim'
-
-    -- Database
-    use 'tpope/vim-dadbod'
-    use 'kristijanhusak/vim-dadbod-ui'
-    use 'kristijanhusak/vim-dadbod-completion'
-
-    -- Documentation Generator
-    use {'kkoomen/vim-doge', run = ':call doge#install()'}
-
-    -- TODO put this back when stable for indent lines
-    -- vim.g.indent_blankline_space_char = ''
-    -- use 'b3nj5m1n/kommentary'
-    -- use {
-    --     'glacambre/firenvim',
-    --     run = function()
-    --         vim.fn['firenvim#install'](1)
-    --     end
-    -- }
-    -- use 'glepnir/dashboard-nvim'
-    -- use 'mhinz/vim-startify'
-    -- use 'cstrap/python-snippets'
-    -- use 'ylcnfrht/vscode-python-snippet-pack'
-    -- use 'norcalli/snippets.nvim'
-    -- use {'akinsho/nvim-bufferline.lua', requires = 'kyazdani42/nvim-web-devicons'}
-    -- use 'SirVer/ultisnips'
-    -- use 'honza/vim-snippets'
-    -- vim.g.UltiSnipsExpandTrigger="<CR>"
-    -- vim.g.UltiSnipsJumpForwardTrigger="<Tab>"
-    -- vim.g.UltiSnipsJumpBackwardTrigger="<S-Tab>"
-    -- use 'blackcauldron7/surround.nvim'
-    -- use 'ChristianChiarulli/java-snippets'
-    -- use 'xabikos/vscode-javascript'
-    -- use 'dsznajder/vscode-es7-javascript-react-snippets'
-    -- use 'golang/vscode-go'
-    -- use 'rust-lang/vscode-rust'
-    -- use 'ChristianChiarulli/python-snippets'
-    -- use 'kshenoy/vim-signature'
-    -- use 'nelstrom/vim-visual-star-search'
-    -- TODO switch back when config support snips
-    -- use 'cohama/lexima.vim'
-    -- use 'bfredl/nvim-miniyank'
-    -- use 'brooth/far.vim'
-    -- use 'liuchengxu/vista.vim'
-    -- use 'psliwka/vim-smoothie'
-    -- use 'nvim-treesitter/nvim-treesitter-refactor'
-    -- use 'nvim-treesitter/playground'
-    -- use 'moll/vim-bbye'
+    -- Status Line and Bufferline
+    use {'glepnir/galaxyline.nvim', opt = true}
+    use {'romgrk/barbar.nvim', opt = true}
+
+    require_plugin('nvim-lspconfig')
+    require_plugin('lspsaga.nvim')
+    require_plugin('lspkind-nvim')
+    require_plugin('nvim-lspinstall')
+    require_plugin('popup.nvim')
+    require_plugin('plenary.nvim')
+    require_plugin('telescope.nvim')
+    require_plugin('nvim-dap')
+    require_plugin('nvim-compe')
+    require_plugin('vim-vsnip')
+    require_plugin('nvim-treesitter')
+    require_plugin('nvim-ts-autotag')
+    require_plugin('nvim-tree.lua')
+    require_plugin('gitsigns.nvim')
+    require_plugin('vim-which-key')
+    require_plugin('dashboard-nvim')
+    require_plugin('nvim-autopairs')
+    require_plugin('nvim-comment')
+    require_plugin('nvim-bqf')
+    require_plugin('nvcode-color-schemes.vim')
+    require_plugin('nvim-web-devicons')
+    require_plugin('galaxyline.nvim')
+    require_plugin('barbar.nvim')
 end)
+