improved config by splitting it.

6 files changed, 119 insertions, 108 deletions

diff --git a/init.lua b/init.lua
index 7f7887f..5152093 100644
--- a/init.lua
+++ b/init.lua
@@ -13,33 +13,22 @@ if not (vim.uv or vim.loop).fs_stat(lazypath) then
   })
 end
 vim.opt.rtp:prepend(lazypath)
+
 require("lazy").setup({
-  'junegunn/fzf',
-  'junegunn/fzf.vim',
+        spec = {
+        { import = "plugins", },
   'nvim-tree/nvim-web-devicons',
   'lewis6991/gitsigns.nvim',
   'folke/neodev.nvim',
-  'neovim/nvim-lspconfig',
-  'hrsh7th/cmp-nvim-lsp',
-  'hrsh7th/cmp-buffer',
-  'hrsh7th/cmp-path',
-  'hrsh7th/cmp-cmdline',
-  'hrsh7th/nvim-cmp',
-  'hrsh7th/vim-vsnip',
-  'octaltree/cmp-look',
-  'L3MON4D3/LuaSnip',
-  'saadparwaiz1/cmp_luasnip',
-  'RRethy/base16-nvim',
   -- treesitter is experimental and breaks indentation on xml, html with `=`
-  -- 'nvim-treesitter/nvim-treesitter',
+  'nvim-treesitter/nvim-treesitter',
   'nvim-lua/popup.nvim',
   'nvim-lua/plenary.nvim',
-  'nvim-telescope/telescope.nvim',
-  'nvim-telescope/telescope-media-files.nvim',
   'coderonline/vim-fancy-line',
   'coderonline/vim-recently-used',
   'norcalli/nvim-colorizer.lua',
   'folke/trouble.nvim',
+  }
 })
 
 --------------------------------------------------------------------------------
@@ -47,7 +36,7 @@ require("lazy").setup({
 --------------------------------------------------------------------------------
 local configdir = vim.fn.fnamemodify(vim.fn.expand("$MYVIMRC"), ":p:h")
 vim.cmd('source ' .. configdir .. '/vimrc')
-vim.cmd.colorscheme "base16-rebecca"
+-- vim.cmd.colorscheme "base16-rebecca"
 -- vim.cmd.colorscheme "base16-katy"
 
 vim.opt.encoding = 'utf-8'
@@ -184,102 +173,82 @@ cmp.setup({
   })
 })
 
--- Use buffer source for `/` and `?` (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline({ '/', '?' }, {
-  mapping = cmp.mapping.preset.cmdline({
-    ['<Down>'] = { c = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }) },
-    ['<Up>'] = { c = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }) },
-  }),
-  sources = {{ name = 'buffer' }}
-})
-
--- Use cmdline & path source for ':' (if you enabled `native_menu`, this won't work anymore).
-cmp.setup.cmdline(':', {
-  mapping = cmp.mapping.preset.cmdline({
-    ['<Down>'] = { c = cmp.mapping.select_next_item({ behavior = cmp.SelectBehavior.Insert }) },
-    ['<Up>'] = { c = cmp.mapping.select_prev_item({ behavior = cmp.SelectBehavior.Insert }) },
-  }),
-  sources = cmp.config.sources(
-    {{ name = 'path' }},
-    {{ name = 'cmdline' }}
-  ),
-  matching = {
-    disallow_symbol_nonprefix_matching = false,
-    disallow_partial_matching = false,
-    disallow_fullfuzzy_matching = false,
-    disallow_fuzzy_matching = false,
-    disallow_partial_fuzzy_matching = false,
-    disallow_prefix_unmatching = false,
-  }
-})
-
 -- Set up lspconfig.
-local capabilities = require('cmp_nvim_lsp').default_capabilities()
+local cmp_nvim_lsp = require "cmp_nvim_lsp"
+
+require("lspconfig").clangd.setup {
+  on_attach = on_attach,
+  capabilities = cmp_nvim_lsp.default_capabilities(),
+  cmd = {
+    "clangd",
+    "--offset-encoding=utf-16",
+  },
+}
+-- local capabilities = require('cmp_nvim_lsp').default_capabilities()
 
 -- # Language Servers
 --   https://github.com/neovim/nvim-lspconfig/blob/master/doc/server_configurations.md
 
 -- C/C++ | clang
-require('lspconfig')['bitbake_language_server'].setup{capabilities = capabilities}
-require('lspconfig')['clangd'].setup{capabilities = capabilities}
--- lua (but not init.lua entirely, hence why neodev)
-require('lspconfig')['lua_ls'].setup { capabilities = capabilities }
--- 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 }
-require'lspconfig'.jdtls.setup{}
--- bash | bash-language-server
-require('lspconfig')['bashls'].setup{capabilities = capabilities}
--- ccs | vscode-css-languageserver
-require('lspconfig')['cssls'].setup{capabilities = capabilities}
--- rust | rust-analyzer
-require('lspconfig')['rust_analyzer'].setup{capabilities = capabilities}
--- javascript | eslint
-require('lspconfig')['eslint'].setup{capabilities = capabilities}
--- javascript | typescript-language-server
-require('lspconfig')['tsserver'].setup{capabilities = capabilities}
--- vimscript | vim-language-server
-require('lspconfig')['vimls'].setup{capabilities = capabilities}
--- html
-require('lspconfig')['html'].setup{capabilities = capabilities}
--- jsonls
-require('lspconfig')['jsonls'].setup{capabilities = capabilities}
--- C/C++ | clang
-require('lspconfig')['clangd'].setup{capabilities = capabilities}
--- bash | bash-language-server
-require('lspconfig')['bashls'].setup{capabilities = capabilities}
--- ccs | vscode-css-languageserver
-require('lspconfig')['cssls'].setup{capabilities = capabilities}
--- rust | rust-analyzer
-require('lspconfig')['rust_analyzer'].setup{capabilities = capabilities}
--- javascript | eslint
-require('lspconfig')['eslint'].setup{capabilities = capabilities}
--- javascript | typescript-language-server
-require('lspconfig')['tsserver'].setup{capabilities = capabilities}
--- vimscript | vim-language-server
-require('lspconfig')['vimls'].setup{capabilities = capabilities}
--- configure html server
-require('lspconfig')["html"].setup({
-  capabilities = capabilities,
-  -- on_attach = on_attach,
-  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')['bitbake_language_server'].setup{}
+-- require('lspconfig')['clangd'].setup{}
+-- -- lua (but not init.lua entirely, hence why neodev)
+-- require('lspconfig')['lua_ls'].setup {  }
+-- -- 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 }
+-- require'lspconfig'.jdtls.setup{}
+-- -- bash | bash-language-server
+-- require('lspconfig')['bashls'].setup{}
+-- -- ccs | vscode-css-languageserver
+-- require('lspconfig')['cssls'].setup{}
+-- -- rust | rust-analyzer
+-- require('lspconfig')['rust_analyzer'].setup{}
+-- -- javascript | eslint
+-- require('lspconfig')['eslint'].setup{}
+-- -- javascript | typescript-language-server
+-- require('lspconfig')['tsserver'].setup{}
+-- -- vimscript | vim-language-server
+-- require('lspconfig')['vimls'].setup{}
+-- -- html
+-- require('lspconfig')['html'].setup{}
+-- -- jsonls
+-- require('lspconfig')['jsonls'].setup{}
+-- -- C/C++ | clang
+-- require('lspconfig')['clangd'].setup{}
+-- -- bash | bash-language-server
+-- require('lspconfig')['bashls'].setup{}
+-- -- ccs | vscode-css-languageserver
+-- require('lspconfig')['cssls'].setup{}
+-- -- rust | rust-analyzer
+-- require('lspconfig')['rust_analyzer'].setup{}
+-- -- javascript | eslint
+-- require('lspconfig')['eslint'].setup{}
+-- -- javascript | typescript-language-server
+-- require('lspconfig')['tsserver'].setup{}
+-- -- vimscript | vim-language-server
+-- require('lspconfig')['vimls'].setup{}
+-- -- configure html server
+-- require('lspconfig')["html"].setup({
+--   -- on_attach = on_attach,
+--   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
+--         }
+--       }
+--     }
+--   }
+-- }
 
 -- vim: tabstop=2 shiftwidth=2 softtabstop=2
diff --git a/lua/plugins/cmp.lua b/lua/plugins/cmp.lua
new file mode 100644
index 0000000..fed96e4
--- /dev/null
+++ b/lua/plugins/cmp.lua
@@ -0,0 +1,11 @@
+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',
+}
diff --git a/lua/plugins/colorscheme.lua b/lua/plugins/colorscheme.lua
new file mode 100644
index 0000000..a73b1e8
--- /dev/null
+++ b/lua/plugins/colorscheme.lua
@@ -0,0 +1,6 @@
+return {
+  'RRethy/base16-nvim',
+  config = function()
+    vim.cmd.colorscheme "base16-rebecca"
+  end,
+}
diff --git a/lua/plugins/fzf.lua b/lua/plugins/fzf.lua
new file mode 100644
index 0000000..f3fc76b
--- /dev/null
+++ b/lua/plugins/fzf.lua
@@ -0,0 +1,4 @@
+return {
+  'junegunn/fzf',
+  'junegunn/fzf.vim',
+}
diff --git a/lua/plugins/orgmode.lua b/lua/plugins/orgmode.lua
new file mode 100644
index 0000000..fe09f3e
--- /dev/null
+++ b/lua/plugins/orgmode.lua
@@ -0,0 +1,17 @@
+return {

+  'nvim-orgmode/orgmode',

+  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/telescope.lua b/lua/plugins/telescope.lua
new file mode 100644
index 0000000..ed65c3f
--- /dev/null
+++ b/lua/plugins/telescope.lua
@@ -0,0 +1,4 @@
+return {
+  'nvim-telescope/telescope.nvim',
+  'nvim-telescope/telescope-media-files.nvim',
+}