refactored the entire config

8 files changed, 217 insertions, 16 deletions

diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
index fed96e4..f4766db 100644
--- a/lua/plugins/cmp.lua
+++ b/lua/plugins/cmp.lua
@@ -1,11 +1,159 @@
 return {
-  'neovim/nvim-lspconfig',
-  'hrsh7th/cmp-nvim-lsp',
-  'hrsh7th/cmp-buffer',
-  'hrsh7th/cmp-path',
-  'hrsh7th/nvim-cmp',
-  'hrsh7th/vim-vsnip',
-  'L3MON4D3/LuaSnip',
-  'octaltree/cmp-look',
-  'saadparwaiz1/cmp_luasnip',
+  {
+    'hrsh7th/nvim-cmp',
+    dependencies = {
+      'nvim-lua/popup.nvim',
+      'nvim-lua/plenary.nvim',
+      'saadparwaiz1/cmp_luasnip',
+      "hrsh7th/cmp-emoji",
+      'hrsh7th/cmp-nvim-lsp',
+      'hrsh7th/cmp-buffer',
+      'hrsh7th/cmp-path',
+      'hrsh7th/vim-vsnip',
+      'octaltree/cmp-look',
+      'folke/trouble.nvim',
+      'folke/lazydev.nvim',
+      {
+        'L3MON4D3/LuaSnip',
+        config = function()
+          vim.keymap.set(
+          {"i", "s"},
+          "<leader><Tab>",
+          function() require('luasnip').jump(1) end,
+          {silent = true}
+          )
+          vim.keymap.set(
+          {"i", "s"},
+          "<leader><S-Tab>",
+          function() require('luasnip').jump(-1) end,
+          {silent = true}
+          )
+        end,
+      },
+    },
+
+    config = function()
+      require('trouble').setup()
+      require('lazydev').setup()
+
+      local cmp = require'cmp'
+      cmp.setup({
+        snippet = {
+          -- REQUIRED - you must specify a snippet engine
+          expand = function(args)
+            require('luasnip').lsp_expand(args.body) -- For `luasnip` users.
+            -- vim.snippet.expand(args.body) -- For native neovim snippets (Neovim v0.10+)
+          end,
+        },
+        window = {
+          completion = cmp.config.window.bordered(),
+          documentation = cmp.config.window.bordered(),
+        },
+        mapping = cmp.mapping.preset.insert({
+          ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+          ['<C-f>'] = cmp.mapping.scroll_docs(4),
+          ['<C-Space>'] = cmp.mapping.complete(),
+          ['<C-e>'] = cmp.mapping.abort(),
+          ['<CR>'] = cmp.mapping.confirm({ select = true }), -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
+        }),
+        sources = cmp.config.sources({
+          { name = 'nvim_lsp' },
+          { name = 'luasnip' }, -- For luasnip users.
+        }, {
+          { name = 'buffer' },
+        })
+      })
+    end
+  },
+  {
+    'neovim/nvim-lspconfig',
+    dependencies = {
+      { "folke/neodev.nvim" }
+    },
+    config = function()
+      -- Set up lspconfig.
+      local keymap = vim.keymap
+      local on_attach = function(client, bufnr)
+        local opts = { noremap = true, silent = true, buffer = bufnr }
+        keymap.set("n", "gf", "<cmd>Lspsaga lsp_finder<CR>", opts) -- show definition, references
+        keymap.set("n", "gD", "<Cmd>Lspsaga goto_definition<CR>", opts) -- got to declaration
+        keymap.set("n", "gd", "<cmd>Lspsaga peek_definition<CR>", opts) -- see definition and make edits in window
+        keymap.set("n", "gi", "<cmd>lua vim.lsp.buf.implementation()<CR>", opts) -- go to implementation
+        keymap.set("n", "<leader>ca", "<cmd>Lspsaga code_action<CR>", opts) -- see available code actions
+        keymap.set("n", "<leader>rn", "<cmd>Lspsaga rename<CR>", opts) -- smart rename
+        keymap.set("n", "<leader>D", "<cmd>Lspsaga show_line_diagnostics<CR>", opts) -- show  diagnostics for line
+        keymap.set("n", "<leader>d", "<cmd>Lspsaga show_cursor_diagnostics<CR>", opts) -- show diagnostics for cursor
+        keymap.set("n", "[d", "<cmd>Lspsaga diagnostic_jump_prev<CR>", opts) -- jump to previous diagnostic in buffer
+        keymap.set("n", "]d", "<cmd>Lspsaga diagnostic_jump_next<CR>", opts) -- jump to next diagnostic in buffer
+        keymap.set("n", "K", "<cmd>Lspsaga hover_doc<CR>", opts) -- show documentation for what is under cursor
+        keymap.set("n", "<leader>o", "<cmd>LSoutlineToggle<CR>", opts) -- see outline on right hand side
+        keymap.set("n", "gr", "<cmd>lua vim.lsp.buf.references()<CR>", opts)
+        vim.keymap.set("n", "<C-n>", ":cnext<CR>")
+        vim.keymap.set("n", "<C-p>", ":cprev<CR>")
+      end
+
+      local capabilities = require("cmp_nvim_lsp").default_capabilities()
+
+      -- # Language Servers
+      --   https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
+      for _,server in ipairs({
+        'bitbake_language_server',
+        "clangd",         -- C/C++ | clang
+        "tsserver",       -- javascript | typescript-language-server
+        "lua_ls",         -- lua (but not init.lua entirely, hence why neodev)
+        "jdtls",
+        "html",
+        "cssls",          -- ccs | vscode-css-languageserver
+        "rust_analyzer",  -- rust | rust-analyzer 
+        "eslint",         -- javascript | eslint
+        'vimls',          -- vimscript | vim-language-server
+        'html',           -- html
+        'jsonls',         -- jsonls
+        "pyright",        -- python
+        "bashls",         -- bash | bash-language-server
+        "gopls",
+        "emmet_ls",
+        "marksman"}) do
+        require("lspconfig")[server].setup({
+          capabilities = capabilities,
+          on_attach = on_attach
+        })
+      end
+
+      -- # specialized config for some LSPs which have non-ideal defaults
+      --
+      -- require('lspconfig')['java_language_server'].setup{ cmd = { "/usr/share/java/java-language-server/lang_server_linux.sh" }, root_dir = function () return vim.fn.getcwd() end }
+      -- configure html server
+      require('lspconfig')["html"].setup({
+        init_options = {
+          configurationSection = { "html", "css", "javascript" },
+          embeddedLanguages = {
+            css = true,
+            javascript = true,
+          },
+          provideFormatter = true,
+        },
+      })
+      require('lspconfig')['pylsp'].setup{
+        settings = {
+          pylsp = {
+            plugins = {
+              pycodestyle = {
+                ignore = {'W391'},
+                maxLineLength = 100
+              }
+            }
+          }
+        }
+      }
+      require("lspconfig").clangd.setup {
+        on_attach = on_attach,
+        capabilities = capabilities,
+        cmd = {
+          "clangd",
+          "--offset-encoding=utf-16",
+        },
+      }
+    end
+  }
 }
diff --git a/lua/plugins/colorizer.lua b/lua/plugins/colorizer.lua
new file mode 100644
index 0000000..416f2d1
--- /dev/null
+++ b/lua/plugins/colorizer.lua
@@ -0,0 +1,6 @@
+return {
+  'norcalli/nvim-colorizer.lua',
+  config = function()
+    require('colorizer').setup()
+  end,
+}
diff --git a/lua/plugins/devicons.lua b/lua/plugins/devicons.lua
new file mode 100644
index 0000000..9e69c5f
--- /dev/null
+++ b/lua/plugins/devicons.lua
@@ -0,0 +1,11 @@
+
+return {
+  'nvim-tree/nvim-web-devicons',
+  config = function()
+    require'nvim-web-devicons'.setup {
+      color_icons = true;
+      default = true;
+      strict = true;
+    }
+  end,
+}
diff --git a/lua/plugins/gitsigns.lua b/lua/plugins/gitsigns.lua
new file mode 100644
index 0000000..d88bf68
--- /dev/null
+++ b/lua/plugins/gitsigns.lua
@@ -0,0 +1,6 @@
+return {
+  'lewis6991/gitsigns.nvim',
+  config = function()
+    require('gitsigns').setup()
+  end,
+}
diff --git a/lua/plugins/orgmode.lua b/lua/plugins/orgmode.lua
index fe09f3e..a9d6ea0 100644
--- a/lua/plugins/orgmode.lua
+++ b/lua/plugins/orgmode.lua
@@ -3,15 +3,9 @@ return {
   event = 'VeryLazy',

   ft = { 'org' },

   config = function()

-    -- Setup orgmode

     require('orgmode').setup({

       org_agenda_files = '~/orgfiles/**/*',

       org_default_notes_file = '~/orgfiles/refile.org',

     })

-    require('cmp').setup({

-      sources = {

-        { name = 'orgmode' }

-      }

-    })

   end,

 }

diff --git a/lua/plugins/popup.lua b/lua/plugins/popup.lua
new file mode 100644
index 0000000..0ff2e3a
--- /dev/null
+++ b/lua/plugins/popup.lua
@@ -0,0 +1,5 @@
+return {
+  'nvim-lua/plenary.nvim',
+  'nvim-lua/popup.nvim',
+}
+
diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua
index ed65c3f..fee09df 100644
--- a/lua/plugins/telescope.lua
+++ b/lua/plugins/telescope.lua
@@ -1,4 +1,15 @@
 return {
   'nvim-telescope/telescope.nvim',
-  'nvim-telescope/telescope-media-files.nvim',
+  dependencies = {
+    'nvim-telescope/telescope-media-files.nvim'
+  },
+  config = function()
+    require('telescope').load_extension('media_files')
+
+    local builtin = require('telescope.builtin')
+    vim.keymap.set('n', '<leader>ff', builtin.find_files, {})
+    vim.keymap.set('n', '<leader>fg', builtin.live_grep, {})
+    vim.keymap.set('n', '<leader>fb', builtin.buffers, {})
+    vim.keymap.set('n', '<leader>fh', builtin.help_tags, {})
+  end,
 }
diff --git a/lua/plugins/treesitter.lua b/lua/plugins/treesitter.lua
new file mode 100644
index 0000000..9673f63
--- /dev/null
+++ b/lua/plugins/treesitter.lua
@@ -0,0 +1,20 @@
+return {
+  -- treesitter is experimental and breaks indentation on xml, html with `=`
+  -- treesitter is optional for orgmode, but without it syntax highlighting in
+  -- org files is broken
+  'nvim-treesitter/nvim-treesitter',
+  config = function()
+     require'nvim-treesitter.configs'.setup {
+       ensure_installed = {"c", "html", "css", "javascript", "org"},
+       sync_install = false,
+       auto_install = true,
+       ignore_install = {},
+       disable = { },
+       modules = { "all" },
+       highlight = {
+        enable = true,
+      }
+     }
+  end
+}
+