lua/custom/plugins/codeium.lua

@@ -0,0 +1,8 @@
+-- Set keymap to open chat in browser
+vim.keymap.set('n', '<leader>cc', ':execute codeium#Chat()<Enter>', { desc = '[C]odeium [C]hat' })
+
+return {
+  -- Free Github Copilot alternative
+  'Exafunction/codeium.vim',
+  event = 'BufEnter',
+}

lua/custom/plugins/conflictmarker.lua

@@ -5,18 +5,17 @@ vim.g.conflict_marker_highlight_group = ''
 vim.g.conflict_marker_begin = '^<<<<<<< .*$'
 vim.g.conflict_marker_end = '^>>>>>>> .*$'
 
+-- Highlight groups
+vim.cmd 'highlight ConflictMarkerBegin guibg=#2f7366'
+vim.cmd 'highlight ConflictMarkerOurs guibg=#2e5049'
+vim.cmd 'highlight ConflictMarkerTheirs guibg=#344f69'
+vim.cmd 'highlight ConflictMarkerEnd guibg=#2f628e'
+vim.cmd 'highlight ConflictMarkerCommonAncestorsHunk guibg=#754a81'
+
 -- Git conflict marker management plugin
 return {
-  {
   'rhysd/conflict-marker.vim',
   config = function()
-      -- Highlight groups
-      vim.cmd 'highlight ConflictMarkerBegin guibg=#2f7366'
-      vim.cmd 'highlight ConflictMarkerOurs guibg=#2e5049'
-      vim.cmd 'highlight ConflictMarkerTheirs guibg=#344f69'
-      vim.cmd 'highlight ConflictMarkerEnd guibg=#2f628e'
-      vim.cmd 'highlight ConflictMarkerCommonAncestorsHunk guibg=#754a81'
-
     -- Read all lines in buffer, check if there is any conflict marker
     function git_conflict_detection()
       local lines = vim.api.nvim_buf_get_lines(0, 0, -1, false)
@@ -42,5 +41,4 @@ return {
       callback = git_conflict_detection,
     })
   end,
-  },
 }

lua/custom/plugins/fugitive.lua

@@ -1,5 +1,15 @@
+-- Switch in fugitive.vim status window with the current one
+vim.keymap.set('n', '<leader>gs', '<cmd>Gedit :<cr>', { desc = '[G]it [S]tatus' })
+-- Fetch all changes
+vim.keymap.set('n', '<leader>gF', '<cmd>Git fetch<cr>', { desc = '[G]it [F]etch' })
+-- Push changes
+vim.keymap.set('n', '<leader>gP', '<cmd>Git push<cr>', { desc = '[G]it [P]ush' })
+-- Pull changes
+vim.keymap.set('n', '<leader>gp', '<cmd>Git pull<cr>', { desc = '[G]it [P]ull' })
+-- Open history graph
+vim.keymap.set('n', '<leader>gl', '<cmd>Flogsplit<cr><cmd>wincmd k<cr><cmd>q<cr>', { desc = '[G]it [L]og' })
+
 return {
-  {
   -- Git related plugins
   'tpope/vim-fugitive',
   dependencies = {
@@ -10,17 +20,4 @@ return {
     },
     'idanarye/vim-merginal',
   },
-    config = function()
-      -- Switch in fugitive.vim status window with the current one
-      vim.keymap.set('n', '<leader>gs', '<cmd>Gedit :<cr>', { desc = '[G]it [S]tatus' })
-      -- Fetch all changes
-      vim.keymap.set('n', '<leader>gF', '<cmd>Git fetch<cr>', { desc = '[G]it [F]etch' })
-      -- Push changes
-      vim.keymap.set('n', '<leader>gP', '<cmd>Git push<cr>', { desc = '[G]it [P]ush' })
-      -- Pull changes
-      vim.keymap.set('n', '<leader>gp', '<cmd>Git pull<cr>', { desc = '[G]it [P]ull' })
-      -- Open history graph
-      vim.keymap.set('n', '<leader>gl', '<cmd>Flogsplit<cr><cmd>wincmd k<cr><cmd>q<cr>', { desc = '[G]it [L]og' })
-    end,
-  },
 }

lua/custom/plugins/lastplace.lua

@@ -1,6 +1,4 @@
 -- Plugin to intelligently reopen files at last edit position
 return {
-  {
   'farmergreg/vim-lastplace',
-  },
 }

lua/custom/plugins/lualine.lua

@@ -1,5 +1,4 @@
 return {
-  {
   -- Set lualine as statusline
   'nvim-lualine/lualine.nvim',
   -- See `:help lualine.txt`
@@ -11,5 +10,4 @@ return {
       component_separators = { left = '', right = '' },
     },
   },
-  },
 }

lua/custom/plugins/markdown.lua

@@ -1,6 +1,5 @@
 -- Markdown preview plugin
 return {
-  {
   'iamcco/markdown-preview.nvim',
   cmd = { 'MarkdownPreviewToggle', 'MarkdownPreview', 'MarkdownPreviewStop' },
   build = 'cd app; npm install',
@@ -8,5 +7,4 @@ return {
     vim.g.mkdp_filetypes = { 'markdown' }
   end,
   ft = { 'markdown' },
-  },
 }

lua/custom/plugins/neoscroll.lua

@@ -1,6 +1,5 @@
 -- Smooth scroll plugin and keymaps
 return {
-  {
   'karb94/neoscroll.nvim',
   enabled = not vim.g.neovide,
   config = function()
@@ -26,5 +25,4 @@ return {
       ['zb'] = { 'zb', { '40' } },
     }
   end,
-  },
 }

lua/custom/plugins/oil.lua

@@ -9,25 +9,12 @@ vim.api.nvim_create_autocmd('BufLeave', {
 })
 
 return {
-  {
   'stevearc/oil.nvim',
+  opts = {},
   -- Optional dependencies
   dependencies = { 'nvim-tree/nvim-web-devicons' },
   config = function()
-      local oil = require 'oil'
-      oil.setup {
-        view_options = {
-          show_hidden = true,
-        },
-      }
-
-      vim.keymap.set('n', '<leader>fe', function()
-        if vim.bo.filetype == 'oil' then
-          oil.close()
-        else
-          oil.open()
-        end
-      end, { desc = '[F]ile [E]xplorer' })
+    require('oil').setup()
+    vim.keymap.set('n', '<leader>fe', require('oil').open, { desc = '[F]ile [E]xplorer' })
   end,
-  },
 }

lua/custom/plugins/overseer.lua

@@ -1,5 +1,4 @@
 return {
-  {
   -- Simple task runner plugin
   'stevearc/overseer.nvim',
   opts = {},
@@ -45,5 +44,4 @@ return {
     -- Run task by listing all in floating
     vim.keymap.set('n', '<leader>or', '<cmd>OverseerRun<cr>', { desc = '[O]verseer [R]un' })
   end,
-  },
 }

lua/options.lua

@@ -4,7 +4,7 @@
 --  For more options, you can see `:help option-list`
 
 -- Set display language
-vim.cmd 'language en_US'
+vim.cmd('language en_US', {})
 
 -- Shell options
 -- Sets the shell to use for system() and ! commands in windows