vim config changes

.config/nvim/after/plugin/orgmode.lua

@@ -16,6 +16,6 @@ require('nvim-treesitter.configs').setup {
 }
 
 require('orgmode').setup({
-    org_agenda_files = { '~/Nextcloud/Documents/uni/**/*'},
-    org_default_notes_file = '~/Nextcloud/Documents/uni/refile.org',
+    org_agenda_files = { '~/Nextcloud/org/**/*'},
+    org_default_notes_file = '~/Nextcloud/org/refile.org',
 })

.config/nvim/lua/tsousa/packer.lua

@@ -39,7 +39,6 @@ return require('packer').startup(function(use)
     use("williamboman/mason-lspconfig.nvim")
     use("hrsh7th/cmp-nvim-lsp")
     use("neovim/nvim-lspconfig")
-    use("mfussenegger/nvim-jdtls")
     use("jose-elias-alvarez/null-ls.nvim")
     use({
         "L3MON4D3/LuaSnip",

.config/nvim/tsousa/packer.lua

@@ -1,13 +1,9 @@
 return require('packer').startup(function(use)
     -- Packer can manage itself
-    use("wbthomason/packer.nvim")
-
     use("nvim-lua/plenary.nvim")
     use("nvim-lua/popup.nvim")
     use("nvim-telescope/telescope.nvim")
     use("tpope/vim-surround")
-    use("tpope/vim-fugitive")
-    use("theprimeagen/harpoon")
     use("mbbill/undotree")
 
     -- fidget change when rewrite version comes out
@@ -25,15 +21,6 @@ return require('packer').startup(function(use)
 
     use("lervag/vimtex")
 
-    use({
-        "hrsh7th/nvim-cmp",
-        requires = {
-            "hrsh7th/cmp-nvim-lsp", -- lsp
-            "hrsh7th/cmp-buffer",   --buffer completions
-            "hrsh7th/cmp-path",     --path completions
-            "hrsh7th/cmp-cmdline"   --cmdline completions
-        },
-    })
 
     use("williamboman/mason.nvim")
     use("williamboman/mason-lspconfig.nvim")
@@ -52,10 +39,6 @@ return require('packer').startup(function(use)
         run = ":TSUpdate"
     })
 
-
-    use("nvim-orgmode/orgmode")
-    use('nvim-lualine/lualine.nvim')
-
     use("nvim-treesitter/playground")
     use("romgrk/nvim-treesitter-context")
 

.config/nvim/tsousa/plugins/cmp.lua

@@ -1,5 +1,6 @@
 return {
     "hrsh7th/nvim-cmp",
+    event = "InsertEnter",
     dependencies = {
             'hrsh7th/cmp-nvim-lsp',                -- lsp
             'hrsh7th/cmp-nvim-lua',                -- Nvim API completions
@@ -11,7 +12,7 @@ return {
             'rafamadriz/friendly-snippets',
             'saadparwaiz1/cmp_luasnip',
         },
-    opts = function(_, opts)
+    config = function()
         local cmp_status_ok, cmp = pcall(require, "cmp")
         if not cmp_status_ok then
             return

.config/nvim/tsousa/plugins/fugitive.lua

@@ -1 +1,6 @@
+return {
+    "tpope/vim-fugitive",
+    config = function()
         vim.keymap.set("n", "<leader>gs", vim.cmd.Git)
+    end
+}

.config/nvim/tsousa/plugins/harpoon.lua

@@ -1,3 +1,6 @@
+return {
+    "theprimeagen/harpoon",
+    config = function()
         local mark = require("harpoon.mark")
         local ui = require("harpoon.ui")
 
@@ -8,3 +11,5 @@ vim.keymap.set("n", "<C-j>", function () ui.nav_file(1) end)
         vim.keymap.set("n", "<C-k>", function() ui.nav_file(2) end)
         vim.keymap.set("n", "<C-l>", function() ui.nav_file(3) end)
         vim.keymap.set("n", "<C-;>", function() ui.nav_file(4) end)
+    end
+}

.config/nvim/tsousa/plugins/orgmode.lua

@@ -1,3 +1,6 @@
+return {
+    "nvim-orgmode/orgmode",
+    config = function()
         -- -- Load custom treesitter grammar for org filetype
         require('orgmode').setup_ts_grammar()
 
@@ -19,3 +22,5 @@ require('orgmode').setup({
             org_agenda_files = { '~/Nextcloud/Documents/uni/**/*' },
             org_default_notes_file = '~/Nextcloud/Documents/uni/refile.org',
         })
+    end
+}

.config/nvim/tsousa/plugins/statusline.lua

@@ -1,3 +1,6 @@
+return {
+    "nvim-lualine/lualine.nvim",
+    config = function()
         require('lualine').setup {
             options = {
                 icons_enabled = true,
@@ -38,3 +41,5 @@ require('lualine').setup {
             inactive_winbar = {},
             extensions = {}
         }
+    end
+}

.config/nvim/tsousa/plugins/treesitter.lua

@@ -1,4 +1,8 @@
-require'nvim-treesitter.configs'.setup {
+return {
+    "nvim-treesitter/nvim-treesitter",
+    run = "TSUpdate",
+    config = function()
+        endrequire 'nvim-treesitter.configs'.setup {
             ensure_installed = { "lua", "vim", "python", "rust", "haskell", "c", "java", "bash", "go" },
             sync_install = false,
 
@@ -7,3 +11,5 @@ require'nvim-treesitter.configs'.setup {
                 additional_vim_regex_highlighting = false,
             },
         }
+    end
+}