10 files changed, 8 insertions, 227 deletions
diff --git a/after/ftplugin/c.lua b/after/ftplugin/c.lua
new file mode 100644
index 0000000..f3bcf24
--- /dev/null
+++ b/after/ftplugin/c.lua
@@ -0,0 +1 @@
+vim.opt.cinoptions = 'l1(0'
diff --git a/after/ftplugin/cpp.lua b/after/ftplugin/cpp.lua
new file mode 100644
index 0000000..f3bcf24
--- /dev/null
+++ b/after/ftplugin/cpp.lua
@@ -0,0 +1 @@
+vim.opt.cinoptions = 'l1(0'
diff --git a/after/ftplugin/netrw.lua b/after/ftplugin/netrw.lua
new file mode 100644
index 0000000..3036211
--- /dev/null
+++ b/after/ftplugin/netrw.lua
@@ -0,0 +1,6 @@
+vim.opt.number = true
+vim.opt.relativenumber = true
+
+vim.keymap.set('n', "h", "<Plug>NetrwBrowseUpDir", { buffer = true})
+vim.keymap.set('n', "l", "<Plug>NetrwLocalBrowseCheck", { buffer = true})
+
diff --git a/after/plugin/colors.lua b/after/plugin/colors.lua
deleted file mode 100644
index 6757b21..0000000
--- a/after/plugin/colors.lua
+++ /dev/null
@@ -1,3 +0,0 @@
-vim.o.background = "dark"
-
-vim.cmd("colorscheme vscode")
diff --git a/after/plugin/fugitive.lua b/after/plugin/fugitive.lua
deleted file mode 100644
index a8aa35c..0000000
--- a/after/plugin/fugitive.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
-vim.keymap.set("n", "<leader>gb", ":Git blame<CR>")
--- see docs for more details
-vim.keymap.set("n", "<leader>gk", ":diffget //3<CR>") -- get diff from upstream (merge)
-vim.keymap.set("n", "<leader>gj", ":diffget //2<CR>") -- get diff from downstream (target)
diff --git a/after/plugin/harpoon.lua b/after/plugin/harpoon.lua
deleted file mode 100644
index a24b20d..0000000
--- a/after/plugin/harpoon.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-local mark = require("harpoon.mark")
-local ui = require("harpoon.ui")
-
-vim.keymap.set("n", "<leader>a", mark.add_file)
-vim.keymap.set("n", "<C-e>", ui.toggle_quick_menu)
-
-vim.keymap.set("n", "<C-f>1", function() ui.nav_file(1) end)
-vim.keymap.set("n", "<C-f>2", function() ui.nav_file(2) end)
-vim.keymap.set("n", "<C-f>3", function() ui.nav_file(3) end)
-vim.keymap.set("n", "<C-f>4", function() ui.nav_file(4) end)
diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua
deleted file mode 100644
index c806032..0000000
--- a/after/plugin/lsp.lua
+++ /dev/null
@@ -1,125 +0,0 @@
-local lsp = require('lsp-zero').preset({})
-
--- @notes on Lsp and Cmp configs here:
---[[
-
-# LSP 
-1. Renamed the keymaps to what I use
-2. Added a custom handler for formatting files.
-   It checks the explicitly defined language servers passed and if they allow formatting, only then will it attempt
-   to format the buffer
-3. Since python lsp does not come with formatting, we need to handle that separately
-
-## Formatting
-1. This is handled in 2 ways:
-  a. By the lsp using vlf (for vl(LSP)f(Format))
-  b. By some tool, then defined in the specific language server by using vcf (for vc(Custom)f(Format)
-
-# Complete
-Completion is done by nvim-cmp. The setup for that does a few things.
-1. Defines the sources to use for autocompletion:
-  a. LSP server
-  b. nvim-lua: only active in lua file I think
-  c. buffer: uses the current file for auto-completion (similar to default nvim behavior)
-2. By default it pops up a list for auto-completion, we have that disabled.
-3. When having auto-complete disabled, it takes extra steps to trigger autocomplete, due
-   to this we need to have it preselect the first item upon triggering autocomplete.
-4. We define some custom mappings
---]]
-
-local function allow_format(servers)
-  return function(client) return vim.tbl_contains(servers, client.name) end
-end
-
-lsp.on_attach(function(client, bufnr)
-  -- see :help lsp-zero-keybindings
-  -- to learn the available actions
-  local opts = {buffer = bufnr, remap = false}
-  vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
-  vim.keymap.set("n", "gD", function() vim.lsp.buf.declaration() end, opts)
-  vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts)
-  vim.keymap.set("n", "<leader>vws", function() vim.lsp.buf.workspace_symbol() end, opts)
-  vim.keymap.set("n", "<leader>vd", function() vim.diagnostic.open_float() end, opts)
-  vim.keymap.set("n", "[d", function() vim.diagnostic.goto_prev() end, opts)
-  vim.keymap.set("n", "]d", function() vim.diagnostic.goto_next() end, opts)
-  vim.keymap.set("n", "<leader>vca", function() vim.lsp.buf.code_action() end, opts)
-  vim.keymap.set("n", "<leader>vrr", function() vim.lsp.buf.references() end, opts)
-  vim.keymap.set("n", "<leader>vrn", function() vim.lsp.buf.rename() end, opts)
-  vim.keymap.set("n", "<leader>vlf", function()
-    vim.lsp.buf.format({
-      async = false,
-      timeout_ms = 10000,
-      filter = allow_format({'rust_analyzer', 'tsserver', 'gopls', 'clangd', 'html-lsp'}),
-    })
-  end, opts)
-  vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
-end)
-
-
--- specific setup for python as it's lsp does not come with formatting
-require('lspconfig').pyright.setup({
-  single_file_support = false,
-  on_attach = function(_, bufnr)
-    local opts = {buffer = bufnr, remap = false}
-    vim.keymap.set({'n', 'x'}, '<leader>vcf', function()
-      local filename = GetCurrFileName()
-      vim.cmd(":silent !autopep8 -i " .. filename)
-      vim.cmd(":silent !isort " .. filename)
-    end, opts)
-  end,
-})
-
-require('lspconfig').lua_ls.setup({
-  settings = {
-    Lua = {
-      diagnostics = {
-        globals = { 'vim' }
-      }
-    }
-  }
-})
-
-lsp.setup()
-
--- @todo: Look at luasnip and why I would require it
-
-local cmp = require('cmp')
-local cmp_action = require('lsp-zero').cmp_action()
-
-cmp.setup({
-  sources = {
-    { name = 'nvim_lsp' },
-    { name = 'nvim_lua' },
-    { name = 'buffer' },
-  },
-  preselect = 'item',
-  completion = {
-    autocomplete = false,
-    completeopt = 'menu,menuone,noinsert'
-  },
-  mapping = cmp.mapping.preset.insert({
-    -- Ctrl+Space to trigger completion menu
-    ['<C-Space>'] = cmp.mapping.complete(),
-
-    -- Navigate between snippet placeholder
-    -- @note: don't know what this is
-    ['<C-f>'] = cmp_action.luasnip_jump_forward(),
-    ['<C-b>'] = cmp_action.luasnip_jump_backward(),
-
-    -- Scroll up and down in the completion documentation
-    ['<C-u>'] = cmp.mapping.scroll_docs(-4),
-    ['<C-d>'] = cmp.mapping.scroll_docs(4),
-  }),
-  snippet = {
-    expand = function(args)
-      require('luasnip').lsp_expand(args.body)
-    end,
-  },
-})
-
---cmp.setup.filetype({ 'sql' }, {
---  sources = {
---    { name = 'vim-dadbod-completion' },
---    { name = 'buffer'},
---  },
---})
diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua
deleted file mode 100644
index 5c1ec30..0000000
--- a/after/plugin/telescope.lua
+++ /dev/null
@@ -1,5 +0,0 @@
-local builtin = require('telescope.builtin')
-vim.keymap.set('n', '<leader>pf', builtin.find_files)
-vim.keymap.set('n', '<C-p>', builtin.git_files)
-vim.keymap.set('n', '<leader>ps', builtin.live_grep)
-vim.keymap.set('n', '<leader>gw', builtin.grep_string)
diff --git a/after/plugin/undotree.lua b/after/plugin/undotree.lua
deleted file mode 100644
index a346462..0000000
--- a/after/plugin/undotree.lua
+++ /dev/null
@@ -1 +0,0 @@
-vim.keymap.set('n', '<leader>u', vim.cmd.UndotreeToggle)
diff --git a/after/plugin/vim-gutentags.lua b/after/plugin/vim-gutentags.lua
deleted file mode 100644
index 3a4b4cc..0000000
--- a/after/plugin/vim-gutentags.lua
+++ /dev/null
@@ -1,78 +0,0 @@
-vim.g.gutentags_ctags_exclude = {
-  '*.git',
-  '*.svg',
-  '*.hg',
-  '*/tests/*',
-  'build',
-  'dist',
-  '*sites/*/files/*',
-  'bin',
-  'node_modules',
-  'bower_components',
-  'cache',
-  'compiled',
-  'docs',
-  'example',
-  'bundle',
-  'vendor',
-  '*.md',
-  '*-lock.json',
-  '*.lock',
-  '*bundle*.js',
-  '*build*.js',
-  '.*rc*',
-  '*.json',
-  '*.min.*',
-  '*.map',
-  '*.bak',
-  '*.zip',
-  '*.pyc',
-  '*.class',
-  '*.sln',
-  '*.Master',
-  '*.csproj',
-  '*.tmp',
-  '*.csproj.user',
-  '*.cache',
-  '*.pdb',
-  'tags*',
-  'cscope.*',
-  '*.css',
-  '*.less',
-  '*.scss',
-  '*.exe',
-  '*.dll',
-  '*.mp3',
-  '*.ogg',
-  '*.flac',
-  '*.swp',
-  '*.swo',
-  '*.bmp',
-  '*.gif',
-  '*.ico',
-  '*.jpg',
-  '*.png',
-  '*.rar',
-  '*.zip',
-  '*.tar',
-  '*.tar.gz',
-  '*.tar.xz',
-  '*.tar.bz2',
-  '*.pdf',
-  '*.doc',
-  '*.docx',
-  '*.ppt',
-  '*.pptx',
-}
-
-vim.opt.tags = './tags'
-vim.g.gutentags_add_default_project_roots = false
-vim.g.gutentags_project_root = { '.git' }
-
-vim.g.gutentags_generate_on_write = true
-vim.g.gutentags_generate_on_new = true
-vim.g.gutentags_generate_on_missing = true
-vim.g.gutentags_generate_on_write = true
-vim.g.gutentags_generate_on_empty_buffer = false
-vim.g.gutentags_ctags_extra_args = { '--tag-relative=yes', '--fields=+ailmnS' }
-vim.g.gutentags_ctags_exclude_wildignore = true