format with stylua

lua/config/lazy.lua

@@ -17,7 +17,7 @@ require('lazy').setup({
   },
   spec = {
     { import = 'plugins' },
-    { import = 'themes' }
+    { import = 'themes' },
   },
   change_detection = {
     -- automatically check for config file changes and reload the ui

lua/config/options.lua

@@ -90,7 +90,7 @@ opt.completeopt = 'menu,menuone,noselect'
 opt.expandtab = true
 opt.smartindent = true
 opt.title = true
-opt.titlestring = '%(%{fnamemodify(getcwd(),\":t\")}%) Neovim'
+opt.titlestring = '%(%{fnamemodify(getcwd(),":t")}%) Neovim'
 opt.laststatus = 3 -- for lualine
 opt.background = 'dark'
 

lua/my_autocommands.lua

@@ -78,16 +78,11 @@ vim.api.nvim_create_autocmd('BufReadPost', {
   end,
 })
 
-
 -- Check if we need to reload the file when it changed
-api.nvim_create_autocmd({ 'FocusGained', 'BufEnter' },
+api.nvim_create_autocmd({ 'FocusGained', 'BufEnter' }, { command = [[if !bufexists("[Command Line]") | checktime | endif]] })
-  { command = [[if !bufexists("[Command Line]") | checktime | endif]] })
 
 -- windows to close with "q"
-api.nvim_create_autocmd(
+api.nvim_create_autocmd('FileType', { pattern = { 'help', 'startuptime', 'qf', 'lspinfo' }, command = [[nnoremap <buffer><silent> q :close<CR>]] })
-  'FileType',
-  { pattern = { 'help', 'startuptime', 'qf', 'lspinfo' }, command = [[nnoremap <buffer><silent> q :close<CR>]] }
-)
 api.nvim_create_autocmd('FileType', { pattern = 'man', command = [[nnoremap <buffer><silent> q :quit<CR>]] })
 
 -- don't auto comment new line

lua/my_keymappings.lua

@@ -53,7 +53,6 @@ vim.keymap.set('x', "'", 'y/\\V<C-R>"<CR>N', { noremap = true, silent = true, de
 
 vim.keymap.set('n', '<space>x', 'za', { desc = 'Toggle fold' })
 
-
 vim.keymap.set({ 'n', 'x' }, '<leader>y', '"+y', { desc = 'Copy from system clipboard' })
 vim.keymap.set({ 'n', 'x' }, '<leader>Y', '"+yg_', { desc = 'Copy from system clipboard' })
 vim.keymap.set({ 'n', 'x' }, '<leader>p', '"+p', { desc = 'Paste from system clipboard' })
@@ -68,9 +67,16 @@ if vim.g.neovide then
     vim.g.neovide_scale_factor = vim.g.neovide_scale_factor * delta
     print(string.format('scaling: %f', vim.g.neovide_scale_factor))
   end
-  vim.keymap.set('n', '<C-=>', function() change_scale_factor(1.25) end)
+  vim.keymap.set('n', '<C-=>', function()
-  vim.keymap.set('n', '<C-->', function() change_scale_factor(1 / 1.25) end)
+    change_scale_factor(1.25)
-  vim.keymap.set('n', '<C-ScrollWheelUp>', function() change_scale_factor(1.25) end)
+  end)
-  vim.keymap.set('n', '<C-ScrollWheelDown>', function() change_scale_factor(1 / 1.25) end)
+  vim.keymap.set('n', '<C-->', function()
+    change_scale_factor(1 / 1.25)
+  end)
+  vim.keymap.set('n', '<C-ScrollWheelUp>', function()
+    change_scale_factor(1.25)
+  end)
+  vim.keymap.set('n', '<C-ScrollWheelDown>', function()
+    change_scale_factor(1 / 1.25)
+  end)
 end
-

lua/overseer/template/user/clang/clang-tidy.lua

@@ -14,7 +14,8 @@ return {
         { 'on_output_parse', problem_matcher = '$gcc' },
         { 'on_result_diagnostics', remove_on_restart = true },
         { 'restart_on_save' },
-        'default' },
+        'default',
+      },
     }
   end,
   condition = {

lua/overseer/template/user/cmake/build.lua

@@ -1,26 +1,22 @@
-
 return {
   name = 'CMake Build for nvim',
   builder = function()
     return {
       cmd = { 'cmake' },
-      args = { '--build', '.',
+      args = { '--build', '.', '--', '-j8' },
-        '--', '-j8' },
       cwd = 'build_nvim',
       -- components = {"on_output_parse", problem_matcher = "$gcc"}
       -- components = {'on_output_quickfix', set_diagnostics = true, open = true}
-      components = { { "on_output_quickfix", open = true, open_on_match = true },
+      components = { { 'on_output_quickfix', open = true, open_on_match = true }, { 'on_output_parse', problem_matcher = '$gcc' }, 'default' },
-        { 'on_output_parse', problem_matcher = '$gcc' },
-        'default' },
     }
   end,
   condition = {
     callback = function(opts)
-      if vim.fn.executable("cmake") == 0 then
+      if vim.fn.executable('cmake') == 0 then
         return false, 'Command "cmake" not found'
       end
-      if vim.fn.findfile("CMakeLists.txt", opts.dir .. ";") == "" then
+      if vim.fn.findfile('CMakeLists.txt', opts.dir .. ';') == '' then
-        return false, "No CMakeLists.txt found"
+        return false, 'No CMakeLists.txt found'
       end
       return true
     end,

lua/overseer/template/user/cmake/clean.lua

@@ -1,21 +1,19 @@
-
 return {
   name = 'CMake Clean for nvim',
   builder = function()
     return {
       cmd = { 'cmake' },
-      args = { '--build', '.',
+      args = { '--build', '.', '-t', 'clean' },
-        '-t', 'clean' },
       cwd = 'build_nvim',
     }
   end,
   condition = {
     callback = function(opts)
-      if vim.fn.executable("cmake") == 0 then
+      if vim.fn.executable('cmake') == 0 then
         return false, 'Command "cmake" not found'
       end
-      if vim.fn.findfile("CMakeLists.txt", opts.dir .. ";") == "" then
+      if vim.fn.findfile('CMakeLists.txt', opts.dir .. ';') == '' then
-        return false, "No CMakeLists.txt found"
+        return false, 'No CMakeLists.txt found'
       end
       return true
     end,

lua/overseer/template/user/cmake/cmake.lua

@@ -2,5 +2,6 @@ return {
   'builtin',
   'user.cmake.configure',
   'user.cmake.build',
-'user.cmake.clean'}
+  'user.cmake.clean',
+}
 -- https://gitlab.com/ranjithshegde/dotbare/-/tree/master/.config/nvim/lua/overseer

lua/overseer/template/user/cmake/configure.lua

@@ -4,19 +4,17 @@ return {
     local cwd = vim.fn.getcwd()
     return {
       cmd = { 'cmake' },
-      args = { '-B', 'build_nvim',
+      args = { '-B', 'build_nvim', '-S', cwd, '-G', 'Ninja' },
-        '-S', cwd,
-        '-G', 'Ninja' },
       cwd = build_nvim,
     }
   end,
   condition = {
     callback = function(opts)
-      if vim.fn.executable("cmake") == 0 then
+      if vim.fn.executable('cmake') == 0 then
         return false, 'Command "cmake" not found'
       end
-      if vim.fn.findfile("CMakeLists.txt", opts.dir .. ";") == "" then
+      if vim.fn.findfile('CMakeLists.txt', opts.dir .. ';') == '' then
-        return false, "No CMakeLists.txt found"
+        return false, 'No CMakeLists.txt found'
       end
       return true
     end,

lua/plugins/aerial.lua

@@ -4,7 +4,7 @@ return {
     require('aerial').setup({
       backends = { 'lsp', 'treesitter', 'markdown' },
       layout = {
-        default_direction = 'prefer_left'
+        default_direction = 'prefer_left',
       },
       filter_kind = false,
       show_guides = true,
@@ -18,6 +18,6 @@ return {
         require('aerial').toggle()
       end,
       desc = 'Symbols outline',
-    }
+    },
-  }
+  },
 }

lua/plugins/cmake-tools.lua

@@ -31,7 +31,7 @@ return {
       function()
         require('cmake-tools').debug({})
       end,
-      desc = 'Run and debug target from cmake'
+      desc = 'Run and debug target from cmake',
-    }
+    },
-  }
+  },
 }

lua/plugins/cmp.lua

@@ -70,18 +70,19 @@ return {
           else
             fallback()
           end
-        end, { 'i', 's', }),
+        end, { 'i', 's' }),
-        ['<c-x>'] = cmp.mapping(cmp.mapping.complete(
+        ['<c-x>'] = cmp.mapping(
-          {
+          cmp.mapping.complete({
             config = {
               sources = {
                 {
-                  name = 'cmdline_history'
+                  name = 'cmdline_history',
-                }
+                },
-              }
+              },
-            }
+            },
-          }
+          }),
-        ), { 'c' }),
+          { 'c' }
+        ),
       },
       snippet = {
         expand = function(args)
@@ -95,9 +96,9 @@ return {
           name = 'nvim_lsp',
           option = {
             markdown_oxide = {
-              keyword_pattern = [[\(\k\| \|\/\|#\)\+]]
+              keyword_pattern = [[\(\k\| \|\/\|#\)\+]],
-            }
+            },
-          }
+          },
         },
         { name = 'nvim_lsp_signature_help', priority = 7 },
         -- { name = 'treesitter',              priority = 6 },
@@ -111,8 +112,8 @@ return {
                 bufs[vim.api.nvim_win_get_buf(win)] = true
               end
               return vim.tbl_keys(bufs)
-            end
+            end,
-          }
+          },
         },
         -- { name = 'nvim_lua' },
         -- { name = 'look' },

lua/plugins/comment.lua

@@ -8,14 +8,14 @@ return {
     {
       '<c-c>',
       '<Plug>(comment_toggle_linewise_current)',
-      desc = 'Toggle comment'
+      desc = 'Toggle comment',
     },
 
     {
       '<c-c>',
       '<Plug>(comment_toggle_linewise_visual)gv',
       mode = 'v',
-      desc = 'Toggle comment'
+      desc = 'Toggle comment',
-    }
+    },
-  }
+  },
 }

lua/plugins/dap.lua

@@ -6,8 +6,8 @@ return {
     {
       'rcarriga/nvim-dap-ui',
       dependencies = {
-        'nvim-neotest/nvim-nio'
+        'nvim-neotest/nvim-nio',
-      }
+      },
     },
     'rcarriga/cmp-dap',
   },
@@ -17,63 +17,63 @@ return {
       function()
         require('dap').continue()
       end,
-      desc = 'DAP start or continue'
+      desc = 'DAP start or continue',
     },
     {
       '<S-F5>',
       function()
         require('dap').run_last()
       end,
-      desc = 'DAP run last'
+      desc = 'DAP run last',
     },
     {
       '<F6>',
       function()
         loadConfigs()
       end,
-      desc = 'DAP configs'
+      desc = 'DAP configs',
     },
     {
       '<F7>',
       function()
         require('dap').goto_()
       end,
-      desc = 'DAP goto'
+      desc = 'DAP goto',
     },
     {
       '<F8>',
       function()
         require('dap.ui.widgets').hover()
       end,
-      desc = 'DAP Hover'
+      desc = 'DAP Hover',
     },
     {
       '<F9>',
       function()
         require('dap').toggle_breakpoint()
       end,
-      desc = 'DAP breakpoint'
+      desc = 'DAP breakpoint',
     },
     {
       '<F10>',
       function()
         require('dap').step_over()
       end,
-      desc = 'DAP step_over'
+      desc = 'DAP step_over',
     },
     {
       '<F11>',
       function()
         require('dap').step_into()
       end,
-      desc = 'DAP step_into'
+      desc = 'DAP step_into',
     },
     {
       '<S-F11>',
       function()
         require('dap').step_out()
       end,
-      desc = 'DAP step_out'
+      desc = 'DAP step_out',
     },
   },
   config = function()
@@ -81,14 +81,13 @@ return {
     vim.fn.sign_define('DapBreakpoint', { text = '🛑', texthl = '', linehl = '', numhl = '' })
     require('cmp_dap').is_dap_buffer()
 
-
     -- make sure we can exit the terminal with esc
     vim.api.nvim_create_autocmd({ 'TermOpen' }, {
       pattern = { '*dap-terminal*' },
       callback = function()
         local opts = { noremap = true }
         vim.api.nvim_buf_set_keymap(0, 't', '<esc>', [[<C-\><C-n>]], opts)
-      end
+      end,
     })
 
     local pythonVenv = require('utils.python_venv')
@@ -135,7 +134,7 @@ return {
         justMyCode = false,
         program = '${file}',
         cwd = vim.fn.getcwd(),
-        pythonPath = pythonVenv.getPythonEnv
+        pythonPath = pythonVenv.getPythonEnv,
       },
     }
 
@@ -155,12 +154,12 @@ return {
       type = 'server',
       port = '${port}',
       executable = {
-        command = require 'mason-core.path'.bin_prefix 'codelldb',
+        command = require('mason-core.path').bin_prefix('codelldb'),
         args = { '--port', '${port}' },
 
         -- On windows you may have to uncomment this:
         detached = false,
-      }
+      },
     }
 
     dap.adapters.cppdbg = {
@@ -178,7 +177,7 @@ return {
           return os.getenv('SCOOP') .. '/apps/llvm/current/bin/lldb-vscode.exe'
         end
       end,
-      name = 'lldb'
+      name = 'lldb',
     }
 
     dap.configurations.cpp = {

lua/plugins/diffview.lua

@@ -1,20 +1,20 @@
 return {
   'sindrets/diffview.nvim',
   dependencies = {
-    'nvim-lua/plenary.nvim'
+    'nvim-lua/plenary.nvim',
   },
   opts = {
     keymaps = {
       view = {
-        ['<leader>b'] = false
+        ['<leader>b'] = false,
       },
       file_panel = {
-        ['<leader>b'] = false
+        ['<leader>b'] = false,
       },
       file_history_panel = {
-        ['<leader>b'] = false
+        ['<leader>b'] = false,
+      },
     },
-    }
   },
   cmd = 'DiffviewOpen',
   keys = {
@@ -33,5 +33,5 @@ return {
       '<cmd>DiffviewOpen origin/master...<cr>',
       desc = 'Diffview vs master',
     },
-  }
+  },
 }

lua/plugins/dressing.lua

@@ -1,3 +1,3 @@
 return {
-  'stevearc/dressing.nvim'
+  'stevearc/dressing.nvim',
 }

lua/plugins/flash.lua

@@ -5,12 +5,12 @@ return {
   opts = {
     modes = {
       search = {
-        enabled = false
+        enabled = false,
       },
       char = {
         keys = { 'f', 'F', 't', 'T', ';' },
-      }
+      },
-    }
+    },
   },
   keys = {
     {
@@ -20,7 +20,7 @@ return {
         -- default options: exact mode, multi window, all directions, with a backdrop
         require('flash').jump()
       end,
-      desc = 'Flash jump'
+      desc = 'Flash jump',
     },
     {
       'S',
@@ -28,7 +28,7 @@ return {
       function()
         require('flash').treesitter()
       end,
-      desc = 'Flash treesitter'
+      desc = 'Flash treesitter',
     },
   },
 }

lua/plugins/fzf-lua.lua

@@ -2,7 +2,7 @@ return {
   'ibhagwan/fzf-lua',
   dependencies = { 'nvim-tree/nvim-web-devicons' },
   config = function()
-    local actions = require 'fzf-lua.actions'
+    local actions = require('fzf-lua.actions')
     require('fzf-lua').setup({
       'borderless_full',
       actions = {
@@ -20,9 +20,9 @@ return {
           ['ctrl-s'] = actions.buf_split,
           ['ctrl-v'] = actions.buf_vsplit,
           ['ctrl-t'] = actions.buf_tabedit,
-          ['ctrl-x']  = actions.buf_split
+          ['ctrl-x'] = actions.buf_split,
-        }
+        },
-      }
+      },
     })
   end,
   cmd = 'FzfLua',
@@ -121,5 +121,5 @@ return {
       mode = { 'n', 'v', 'i' },
       desc = 'Fuzzy complete path',
     },
-  }
+  },
 }

lua/plugins/gitsigns.lua

@@ -9,5 +9,5 @@ return {
       delay = 1000,
       ignore_whitespace = false,
     },
-  }
+  },
 }

lua/plugins/indent_blankline.lua

@@ -21,7 +21,7 @@ return {
       'RainbowCyan',
     }
 
-    local hooks = require 'ibl.hooks'
+    local hooks = require('ibl.hooks')
     -- create the highlight groups in the highlight setup hook, so they are reset
     -- every time the colorscheme changes
     hooks.register(hooks.type.HIGHLIGHT_SETUP, function()
@@ -35,12 +35,12 @@ return {
     end)
 
     vim.g.rainbow_delimiters = { highlight = highlight }
-    require('ibl').setup {
+    require('ibl').setup({
       scope = {
         highlight = highlight,
-        show_start = false
+        show_start = false,
-      }
+      },
-    }
+    })
 
     hooks.register(hooks.type.SCOPE_HIGHLIGHT, hooks.builtin.scope_highlight_from_extmark)
   end,

lua/plugins/init.lua

@@ -1,2 +1 @@
-return {
+return {}
-}

lua/plugins/lazydev.lua

@@ -12,7 +12,7 @@ return {
   },
   {
     'Bilal2453/luvit-meta',
-    lazy = true
+    lazy = true,
   }, -- optional `vim.uv` typings
   { -- optional completion source for require statements and module annotations
     'hrsh7th/nvim-cmp',

lua/plugins/lspconfig.lua

@@ -1,65 +1,48 @@
 local lspKeys = function(client, bufnr)
   local fzf = require('fzf-lua')
   local options = { noremap = true, silent = false, buffer = bufnr }
-  vim.keymap.set('n', '<space>,', vim.diagnostic.goto_prev,
+  vim.keymap.set('n', '<space>,', vim.diagnostic.goto_prev, vim.tbl_extend('error', options, { desc = 'Diag prev' }))
-    vim.tbl_extend('error', options, { desc = 'Diag prev' }))
+  vim.keymap.set('n', '<space>;', vim.diagnostic.goto_next, vim.tbl_extend('error', options, { desc = 'Diag next' }))
-  vim.keymap.set('n', '<space>;', vim.diagnostic.goto_next,
+  vim.keymap.set({ 'n', 'x' }, '<space>a', vim.lsp.buf.code_action, vim.tbl_extend('error', options, { desc = 'Code action' }))
-    vim.tbl_extend('error', options, { desc = 'Diag next' }))
+  vim.keymap.set('n', '<space>d', function()
-  vim.keymap.set({ 'n', 'x' }, '<space>a', vim.lsp.buf.code_action,
+    fzf.lsp_definitions({ jump_to_single_result = true })
-    vim.tbl_extend('error', options, { desc = 'Code action' }))
+  end, vim.tbl_extend('error', options, { desc = 'Definition' }))
-  vim.keymap.set('n', '<space>d', function() fzf.lsp_definitions({ jump_to_single_result = true }) end,
+  vim.keymap.set('n', '<space>e', vim.lsp.buf.declaration, vim.tbl_extend('error', options, { desc = 'Declaration' }))
-    vim.tbl_extend('error', options, { desc = 'Definition' }))
+  vim.keymap.set('n', '<space>h', function()
-  vim.keymap.set('n', '<space>e',
+    require('pretty_hover').hover()
-    vim.lsp.buf.declaration, vim.tbl_extend('error', options, { desc = 'Declaration' }))
+  end, vim.tbl_extend('error', options, { desc = 'Hover' }))
-  vim.keymap.set('n', '<space>h', function() require('pretty_hover').hover() end,
+  vim.keymap.set('n', '<space>c', vim.lsp.buf.outgoing_calls, vim.tbl_extend('error', options, { desc = 'Outgoing calls' }))
-    vim.tbl_extend('error', options, { desc = 'Hover' }))
+  vim.keymap.set('n', '<space>C', vim.lsp.buf.incoming_calls, vim.tbl_extend('error', options, { desc = 'Incoming calls' }))
-  vim.keymap.set('n', '<space>c', vim.lsp.buf.outgoing_calls,
+  vim.keymap.set('n', '<space>m', vim.lsp.buf.rename, vim.tbl_extend('error', options, { desc = 'Rename' }))
-    vim.tbl_extend('error', options, { desc = 'Outgoing calls' }))
+  vim.keymap.set('n', '<C-t>', fzf.lsp_live_workspace_symbols, vim.tbl_extend('error', options, { desc = 'Workspace symbols' }))
-  vim.keymap.set('n', '<space>C', vim.lsp.buf.incoming_calls,
+  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition, vim.tbl_extend('error', options, { desc = 'Type definition' }))
-    vim.tbl_extend('error', options, { desc = 'Incoming calls' }))
+  vim.keymap.set({ 'n', 'i', 'x' }, '<C-k>', vim.lsp.buf.signature_help, vim.tbl_extend('error', options, { desc = 'Signature help' }))
-  vim.keymap.set('n', '<space>m', vim.lsp.buf.rename,
+  vim.keymap.set('n', '<space>r', fzf.lsp_references, vim.tbl_extend('error', options, { desc = 'References' }))
-    vim.tbl_extend('error', options, { desc = 'Rename' }))
+  vim.keymap.set('n', '<A-m>', fzf.lsp_document_symbols, vim.tbl_extend('error', options, { desc = 'Document symbols' }))
-  vim.keymap.set('n', '<C-t>', fzf.lsp_live_workspace_symbols,
+  vim.keymap.set('n', '<space>s', fzf.lsp_live_workspace_symbols, vim.tbl_extend('error', options, { desc = 'Workspace symbols' }))
-    vim.tbl_extend('error', options, { desc = 'Workspace symbols' }))
+  vim.keymap.set('n', '<space>v', vim.diagnostic.open_float, vim.tbl_extend('error', options, { desc = 'Diagnostics Float' }))
-  vim.keymap.set('n', '<space>D', vim.lsp.buf.type_definition,
+  vim.keymap.set('n', '<space>V', fzf.diagnostics_document, vim.tbl_extend('error', options, { desc = 'Diagnostics' }))
-    vim.tbl_extend('error', options, { desc = 'Type definition' }))
+  vim.keymap.set('n', '<A-o>', '<cmd>ClangdSwitchSourceHeader<CR>', vim.tbl_extend('error', options, { desc = 'Switch Source/Header' }))
-  vim.keymap.set({ 'n', 'i', 'x' }, '<C-k>', vim.lsp.buf.signature_help,
-    vim.tbl_extend('error', options, { desc = 'Signature help' }))
-  vim.keymap.set('n', '<space>r', fzf.lsp_references,
-    vim.tbl_extend('error', options, { desc = 'References' }))
-  vim.keymap.set('n', '<A-m>', fzf.lsp_document_symbols,
-    vim.tbl_extend('error', options, { desc = 'Document symbols' }))
-  vim.keymap.set('n', '<space>s', fzf.lsp_live_workspace_symbols,
-    vim.tbl_extend('error', options, { desc = 'Workspace symbols' }))
-  vim.keymap.set('n', '<space>v', vim.diagnostic.open_float,
-    vim.tbl_extend('error', options, { desc = 'Diagnostics Float' }))
-  vim.keymap.set('n', '<space>V', fzf.diagnostics_document,
-    vim.tbl_extend('error', options, { desc = 'Diagnostics' }))
-  vim.keymap.set('n', '<A-o>', '<cmd>ClangdSwitchSourceHeader<CR>',
-    vim.tbl_extend('error', options, { desc = 'Switch Source/Header' }))
 
   -- Set some keybinds conditional on server capabilities
   if client.server_capabilities.documentFormattingProvider then
     vim.keymap.set('n', '<space>f', function()
       vim.lsp.buf.format({ timeout_ms = 10000 })
-      end,
+    end, { noremap = true, silent = false, desc = 'Format file', buffer = bufnr })
-      { noremap = true, silent = false, desc = 'Format file', buffer = bufnr })
   end
   if client.server_capabilities.documentRangeFormattingProvider then
     vim.keymap.set('x', '<space>f', function()
       vim.lsp.buf.format({ timeout_ms = 10000 })
-      end,
+    end, { noremap = true, silent = false, desc = 'Format visual', buffer = bufnr })
-      { noremap = true, silent = false, desc = 'Format visual', buffer = bufnr })
   end
   if client.supports_method('inlayHintProvider') then
     vim.keymap.set('n', '<space>i', function()
       vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled({ bufnr = bufnr }), { bufnr = bufnr })
-      end,
+    end, {
-      {
       noremap = true,
       silent = false,
       desc = 'Toggle inlay hints',
-        buffer = bufnr
+      buffer = bufnr,
     })
   end
 end
@@ -88,10 +71,10 @@ local document_highlight = function(bufnr)
     buffer = bufnr,
     callback = function()
       vim.lsp.buf.clear_references()
-      vim.api.nvim_clear_autocmds {
+      vim.api.nvim_clear_autocmds({
         group = group,
-        buffer = bufnr
+        buffer = bufnr,
-      }
+      })
     end,
   })
 end
@@ -127,8 +110,8 @@ return {
   config = function()
     require('mason').setup({
       ui = {
-        border = 'rounded'
+        border = 'rounded',
-      }
+      },
     })
     require('mason-lspconfig').setup({
       automatic_installation = false,
@@ -141,7 +124,7 @@ return {
         'lua_ls',
         'jsonls',
         -- 'groovyls', -- Doesn't work in WSL
-      }
+      },
     })
     local lspconfig = require('lspconfig')
 
@@ -179,13 +162,12 @@ return {
       vim.diagnostic.open_float({ focusable = false, width = 80 })
     end
 
-
     -- lspconfig['pyright'].setup {
     --   capabilities = capabilities,
     --   on_attach = on_attach,
     -- }
 
-    lspconfig['basedpyright'].setup {
+    lspconfig['basedpyright'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
       settings = {
@@ -193,12 +175,12 @@ return {
           typeCheckingMode = 'standard',
         },
       },
-    }
+    })
 
-    lspconfig['groovyls'].setup {
+    lspconfig['groovyls'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
-    }
+    })
 
     -- lspconfig['cmake'].setup {
     --   capabilities = capabilities,
@@ -215,8 +197,8 @@ return {
             return lspconfig.util.find_git_ancestor(fname)
           end,
           single_file_support = true, -- suggested
-          on_attach = on_attach       -- on_attach is the on_attach function you defined
+          on_attach = on_attach, -- on_attach is the on_attach function you defined
-        }
+        },
       }
       lspconfig.neocmake.setup({})
     end
@@ -224,48 +206,42 @@ return {
     local clangd_capabilities = capabilities
     clangd_capabilities.textDocument.semanticHighlighting = true
     clangd_capabilities.offsetEncoding = { 'utf-16' }
-    lspconfig['clangd'].setup {
+    lspconfig['clangd'].setup({
       capabilities = clangd_capabilities,
       on_attach = on_attach,
-      cmd = { 'clangd',
+      cmd = {
+        'clangd',
         '--compile-commands-dir=build_nvim',
-        '--query-driver', '/opt/cortex-a78-2022.08-gcc12.1-linux5.15/bin/aarch64-linux-gnu-g*',
+        '--query-driver',
+        '/opt/cortex-a78-2022.08-gcc12.1-linux5.15/bin/aarch64-linux-gnu-g*',
         '--clang-tidy',
         '--background-index',
         '--use-dirty-headers',
-        '--completion-style=detailed' },
+        '--completion-style=detailed',
-      root_dir = lspconfig.util.root_pattern(
+      },
-        '.clangd',
+      root_dir = lspconfig.util.root_pattern('.clangd', '.clang-tidy', '.clang-format', 'compile_flags.txt', 'configure.ac', '.git', 'build_nvim'),
-        '.clang-tidy',
+    })
-        '.clang-format',
-        'compile_flags.txt',
-        'configure.ac',
-        '.git',
-        'build_nvim'
-      )
-    }
 
     require('clangd_extensions').setup({
-      extensions =
+      extensions = {
-      {
         inlay_hints = {
           -- Only show inlay hints for the current line
           only_current_line = true,
-        }
+        },
-      }
+      },
     })
 
-    lspconfig['jsonls'].setup {
+    lspconfig['jsonls'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
-    }
+    })
 
     -- lspconfig['rust_analyzer'].setup {
     --   capabilities = capabilities,
     --   on_attach = on_attach,
     -- }
 
-    lspconfig['lua_ls'].setup {
+    lspconfig['lua_ls'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
       settings = {
@@ -274,7 +250,7 @@ return {
             checkThirdParty = false,
           },
           completion = {
-            callSnippet = 'Replace'
+            callSnippet = 'Replace',
           },
           -- Do not send telemetry data containing a randomized but unique identifier
           telemetry = {
@@ -286,36 +262,36 @@ return {
               indent_style = 'space',
               indent_size = '2',
               quote_style = 'single',
-            }
-          }
             },
-      }
+          },
-    }
+        },
+      },
+    })
 
-    lspconfig['dockerls'].setup {
+    lspconfig['dockerls'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
-    }
+    })
 
-    lspconfig['markdown_oxide'].setup {
+    lspconfig['markdown_oxide'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
-    }
+    })
 
     -- lspconfig['marksman'].setup {
     --   capabilities = capabilities,
     --   on_attach = on_attach,
     -- }
 
-    lspconfig['yamlls'].setup {
+    lspconfig['yamlls'].setup({
       capabilities = capabilities,
       on_attach = on_attach,
       settings = {
         yaml = {
-          validate = true
+          validate = true,
-        }
+        },
-      }
+      },
-    }
+    })
 
     local prettier = require('efmls-configs.formatters.prettier')
     local stylua = require('efmls-configs.formatters.stylua')
@@ -352,15 +328,10 @@ return {
       float = {
         border = 'single',
         format = function(diagnostic)
-          return string.format(
+          return string.format('%s (%s) [%s]', diagnostic.message, diagnostic.source, diagnostic.code or diagnostic.user_data.lsp.code)
-            '%s (%s) [%s]',
-            diagnostic.message,
-            diagnostic.source,
-            diagnostic.code or diagnostic.user_data.lsp.code
-          )
         end,
       },
     })
   end,
-  event = 'VeryLazy'
+  event = 'VeryLazy',
 }

lua/plugins/lualine.lua

@@ -2,10 +2,10 @@ return {
   'nvim-lualine/lualine.nvim',
   dependencies = {
     'nvim-tree/nvim-web-devicons',
-    'Isrothy/lualine-diagnostic-message'
+    'Isrothy/lualine-diagnostic-message',
   },
   config = function()
-    require('lualine').setup {
+    require('lualine').setup({
       options = {
         theme = 'bamboo',
         disabled_filetypes = {
@@ -22,17 +22,17 @@ return {
           'diff',
           {
             'diagnostics',
-            sources = { 'nvim_diagnostic' }
+            sources = { 'nvim_diagnostic' },
-          }
+          },
         },
         lualine_c = {
           'hostname',
           'getcwd',
-          { 'filename', path = 1, file_status = true }
+          { 'filename', path = 1, file_status = true },
         },
         lualine_y = {
           'searchcount',
-          'progress'
+          'progress',
         },
       },
       inactive_sections = {
@@ -41,9 +41,9 @@ return {
           {
             'filename',
             path = 1,
-            file_status = true
+            file_status = true,
-          }
+          },
-        }
+        },
       },
       winbar = {
         lualine_a = {
@@ -65,15 +65,13 @@ return {
               warn = ' ',
               info = ' ',
               hint = ' ',
-            }
-          }
             },
-        lualine_c = {
           },
+        },
+        lualine_c = {},
         lualine_x = {},
         lualine_y = {},
-        lualine_z = {
+        lualine_z = {},
-        }
       },
       inactive_winbar = {
         lualine_a = {
@@ -82,7 +80,7 @@ return {
             path = 0,
             file_status = true,
             separator = { left = '', right = '' },
-          }
+          },
         },
         lualine_b = {
           {
@@ -92,7 +90,7 @@ return {
         lualine_c = {},
         lualine_x = {},
         lualine_y = {},
-        lualine_z = {}
+        lualine_z = {},
       },
       tabline = {
         lualine_a = {},
@@ -101,12 +99,12 @@ return {
           {
             'tabs',
             mode = 2,
-          }
+          },
         },
         lualine_x = {},
         lualine_y = {},
-        lualine_z = {}
+        lualine_z = {},
       },
-    }
+    })
   end,
 }

lua/plugins/luasnip-snippets.lua

@@ -5,5 +5,5 @@ return {
     -- Mandatory setup function
     require('luasnip_snippets.common.snip_utils').setup()
   end,
-  enabled = false
+  enabled = false,
 }

lua/plugins/luasnip.lua

@@ -44,29 +44,68 @@ return {
 
     ls.snippets = {
       cpp = {
-        s('TEST_F_getset',
+        s('TEST_F_getset', {
-          {
+          t('TEST_F('),
-            t('TEST_F('), i(1, 'TestClass'), t(' ,test_'), p(getRegA, false), t({ '_set_get)', '{', '  ' }),
+          i(1, 'TestClass'),
-            i(2, 'm_object'), t('.set'), p(getRegA, true), t('('), i(3, '32.F'), t({ ');', '  ' }),
+          t(' ,test_'),
-            i(4, 'EXPECT_EQ('), rep(3), t(', '), rep(2), t('.get'), p(getRegA, true), t({ '());', '' }),
+          p(getRegA, false),
-            t({ '', '}', '' })
+          t({ '_set_get)', '{', '  ' }),
+          i(2, 'm_object'),
+          t('.set'),
+          p(getRegA, true),
+          t('('),
+          i(3, '32.F'),
+          t({ ');', '  ' }),
+          i(4, 'EXPECT_EQ('),
+          rep(3),
+          t(', '),
+          rep(2),
+          t('.get'),
+          p(getRegA, true),
+          t({ '());', '' }),
+          t({ '', '}', '' }),
         }),
-        s('TEST_fn_getset',
+        s('TEST_fn_getset', {
-          {
+          t('void '),
-            t('void '), p(getRegA, false), t('_'), i(1, 'get'), t('_'), i(2, 'set'), t({ '()', '{', '  ' }),
+          p(getRegA, false),
-            i(3, 'm_object'), t('.set'), p(getRegA, true), t('('), i(4, '32.F'), t({ ');', '  ' }),
+          t('_'),
-            i(5, 'EXPECT_EQ('), rep(4), t(', '), rep(3), t('.get'), p(getRegA, true), t({ '());', '' }),
+          i(1, 'get'),
+          t('_'),
+          i(2, 'set'),
+          t({ '()', '{', '  ' }),
+          i(3, 'm_object'),
+          t('.set'),
+          p(getRegA, true),
+          t('('),
+          i(4, '32.F'),
+          t({ ');', '  ' }),
+          i(5, 'EXPECT_EQ('),
+          rep(4),
+          t(', '),
+          rep(3),
+          t('.get'),
+          p(getRegA, true),
+          t({ '());', '' }),
           t({ '', '}', '', '' }),
 
-            t('TEST_F('), i(5), t(' ,test_'), p(getRegA, false), t({ '_set_get)', '{', '  ' }),
+          t('TEST_F('),
-            p(getRegA, false), t('_'), rep(1), t('_'), rep(2), t({ '();' }),
+          i(5),
+          t(' ,test_'),
+          p(getRegA, false),
+          t({ '_set_get)', '{', '  ' }),
+          p(getRegA, false),
+          t('_'),
+          rep(1),
+          t('_'),
+          rep(2),
+          t({ '();' }),
           t({ '', '}' }),
-          })
+        }),
       },
     }
 
     require('luasnip.loaders.from_vscode').lazy_load()
     require('luasnip.loaders.from_vscode').lazy_load({ paths = { './my-snippets' } })
   end,
-  cmd = 'LuaSnipListAvailable'
+  cmd = 'LuaSnipListAvailable',
 }

lua/plugins/markdown-preview.lua

@@ -3,7 +3,7 @@ return {
   cmd = {
     'MarkdownPreviewToggle',
     'MarkdownPreview',
-    'MarkdownPreviewStop'
+    'MarkdownPreviewStop',
   },
   branch = 'master',
   ft = { 'markdown' },
@@ -15,5 +15,5 @@ return {
     vim.g.mkdp_auto_start = 1
     vim.g.mkdp_combine_preview = 1
     vim.g.mkdp_combine_preview_auto_refresh = 1
-  end
+  end,
 }

lua/plugins/neogen.lua

@@ -28,7 +28,7 @@ return {
         require('neogen').generate({})
       end,
       desc = 'Add comment',
-    }
     },
-  cmd = 'Neogen'
+  },
+  cmd = 'Neogen',
 }

lua/plugins/neogit.lua

@@ -2,26 +2,26 @@ return {
   'TimUntersberger/neogit',
   dependencies = {
     'nvim-lua/plenary.nvim',
-    'sindrets/diffview.nvim'
+    'sindrets/diffview.nvim',
   },
   config = function()
     local neogit = require('neogit')
-    neogit.setup {
+    neogit.setup({
       integrations = {
         diffview = true,
         telescope = false,
-        fzf_lua = true
+        fzf_lua = true,
       },
-      graph_style = "unicode",
+      graph_style = 'unicode',
-    }
+    })
   end,
   keys = {
     {
       '<space>t',
       function()
         require('neogit').open()
-      end
+      end,
-    }
     },
-  cmd = { 'Neogit ' }
+  },
+  cmd = { 'Neogit ' },
 }

lua/plugins/neotest.lua

@@ -4,7 +4,7 @@ return {
     'nvim-lua/plenary.nvim',
     'nvim-treesitter/nvim-treesitter',
     'antoinemadec/FixCursorHold.nvim',
-    'nvim-neotest/neotest-python'
+    'nvim-neotest/neotest-python',
   },
   config = function()
     local pythonVenv = require('utils.python_venv')
@@ -12,12 +12,12 @@ return {
       adapters = {
         require('neotest-python')({
           dap = {
-            justMyCode = false
+            justMyCode = false,
           },
           runner = 'pytest',
-          python = pythonVenv.getPythonEnv
+          python = pythonVenv.getPythonEnv,
-        })
+        }),
-      }
+      },
     })
   end,
   keys = {
@@ -26,14 +26,14 @@ return {
       function()
         require('neotest').run.run()
       end,
-      desc = 'Run nearest test'
+      desc = 'Run nearest test',
     },
     {
       '<S-F3>',
       function()
         require('neotest').run.run({ strategy = 'dap' })
       end,
-      desc = 'Run nearest test'
+      desc = 'Run nearest test',
-    }
+    },
-  }
+  },
 }

lua/plugins/nvim-highlight-colors.lua

@@ -5,5 +5,5 @@ return {
     render = 'background', -- or 'foreground' or 'virtual',
     enable_named_colors = true,
   },
-  cmd = { 'HighlightColors' }
+  cmd = { 'HighlightColors' },
 }

lua/plugins/nvim-lint.lua

@@ -2,7 +2,7 @@ return {
   'mfussenegger/nvim-lint',
   config = function()
     require('lint').linters_by_ft = {
-      cpp = { 'clangtidy', }
+      cpp = { 'clangtidy' },
     }
     vim.api.nvim_create_autocmd({ 'BufWritePost' }, {
       callback = function()
@@ -15,5 +15,5 @@ return {
         -- require('lint').try_lint('cspell')
       end,
     })
-  end
+  end,
 }

lua/plugins/nvim-rooter.lua

@@ -1,7 +1,8 @@
 return {
   'notjedi/nvim-rooter.lua',
   opts = {
-    rooter_patterns = { '.git',
+    rooter_patterns = {
+      '.git',
       '_darcs',
       '.hg',
       '.bzr',
@@ -10,6 +11,7 @@ return {
       'package.json',
       'build_nvim',
       'real_path.txt',
-      'conaninfo.txt' },
+      'conaninfo.txt',
-  }
+    },
+  },
 }

lua/plugins/nvim-surround.lua

@@ -6,5 +6,5 @@ return {
     require('nvim-surround').setup({
       -- Configuration here, or leave empty to use defaults
     })
-  end
+  end,
 }

lua/plugins/oil.lua

@@ -26,6 +26,6 @@ return {
         require('oil').open()
       end,
       desc = 'Open oil',
-    }
+    },
-  }
+  },
 }

lua/plugins/overseer.lua

@@ -28,6 +28,6 @@ return {
     'OverseerBuild',
     'OverseerQuickAction',
     'OverseerTaskAction',
-    'OverseerClearCache'
+    'OverseerClearCache',
-  }
+  },
 }

lua/plugins/rainbow-delimiters.lua

@@ -1,5 +1,5 @@
 return {
   'HiPhish/rainbow-delimiters.nvim',
   dependencies = 'nvim-treesitter/nvim-treesitter',
-  event = 'VeryLazy'
+  event = 'VeryLazy',
 }

lua/plugins/rustaceanvim.lua

@@ -6,8 +6,9 @@ return {
       server = {
         on_attach = function(client, bufnr)
           local options = { noremap = true, silent = false, buffer = bufnr }
-          vim.keymap.set('n', '<space>y', function() vim.cmd.RustLsp { 'hover', 'actions' } end,
+          vim.keymap.set('n', '<space>y', function()
-            vim.tbl_extend('error', options, { desc = 'Hover' }))
+            vim.cmd.RustLsp({ 'hover', 'actions' })
+          end, vim.tbl_extend('error', options, { desc = 'Hover' }))
 
           local group = vim.api.nvim_create_augroup('lsp_document_highlight', { clear = false })
           vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
@@ -31,14 +32,14 @@ return {
             buffer = bufnr,
             callback = function()
               vim.lsp.buf.clear_references()
-              vim.api.nvim_clear_autocmds {
+              vim.api.nvim_clear_autocmds({
                 group = group,
-                buffer = bufnr
+                buffer = bufnr,
-              }
+              })
             end,
           })
-        end
+        end,
+      },
     }
-    }
+  end,
-  end
 }

lua/plugins/toggleterm.lua

@@ -3,7 +3,7 @@ return {
   config = function()
     function _G.set_terminal_keymaps(term)
       local opts = { noremap = true }
-      if (term.cmd ~= 'lazygit') then
+      if term.cmd ~= 'lazygit' then
         vim.api.nvim_buf_set_keymap(term.bufnr, 't', '<esc>', [[<C-\><C-n>]], opts)
       end
       vim.api.nvim_buf_set_keymap(term.bufnr, 't', 'jk', [[<C-\><C-n>]], opts)
@@ -14,7 +14,7 @@ return {
     end
 
     require('toggleterm').setup({
-      on_open = set_terminal_keymaps
+      on_open = set_terminal_keymaps,
     })
 
     local Terminal = require('toggleterm.terminal').Terminal
@@ -46,8 +46,8 @@ return {
       function()
         _lazygit_toggle()
       end,
-      desc = 'LazyGit'
+      desc = 'LazyGit',
-    }
+    },
   },
   cmd = 'ToggleTerm',
 }

lua/plugins/treesitter.lua

@@ -12,7 +12,7 @@ return {
       ignore_install = {},
       highlight = {
         enable = true,
-        additional_vim_regex_highlighting = { 'markdown' }
+        additional_vim_regex_highlighting = { 'markdown' },
       },
       rainbow = {
         enable = true,
@@ -22,7 +22,7 @@ return {
         -- termcolors = {} -- table of colour name strings
       },
       indent = {
-        enable = false -- maybe buggy
+        enable = false, -- maybe buggy
       },
       textobjects = {
         select = {
@@ -51,5 +51,5 @@ return {
     })
     vim.treesitter.language.register('groovy', 'java')
     require('nvim-treesitter.install').prefer_git = false
-  end
+  end,
 }

lua/plugins/which-key.lua

@@ -6,8 +6,8 @@ return {
       marks = false,
       registers = false,
       presets = {
-        operators = false
+        operators = false,
-      }
+      },
-    }
+    },
-  }
+  },
 }

lua/plugins/workspaces.lua

@@ -16,8 +16,7 @@ return {
             cb(e['name'])
           end
           cb()
-          end,
+        end, {
-          {
           actions = {
             ['default'] = {
               function(selected)
@@ -29,17 +28,17 @@ return {
               function(selected)
                 workspaces.remove(selected[1])
               end,
-                fzf_lua.actions.resume
+              fzf_lua.actions.resume,
             },
             ['ctrl-a'] = {
               function()
                 workspaces.add()
               end,
-                fzf_lua.actions.resume
+              fzf_lua.actions.resume,
-              }
+            },
-            }
+          },
         })
-      end
+      end,
-    }
+    },
-  }
+  },
 }

lua/themes/astrodark.lua

@@ -21,15 +21,12 @@ return {
       },
 
       palettes = {
-        global = {
+        global = {},
-        },
+        astrodark = {},
-        astrodark = {
-        },
       },
       highlights = {
         global = {
-          modify_hl_groups = function(hl, c)
+          modify_hl_groups = function(hl, c) end,
-          end,
         },
         astrodark = {
           modify_hl_groups = function(hl, c) -- modify_hl_groups function allows you to modify hl groups,
@@ -57,10 +54,10 @@ return {
           ['TelescopeTitle'] = { bg = C.surface0 },
           ['TelescopePromptNormal'] = { bg = C.surface0 },
           ['TelescopePromptBorder'] = { link = 'TelescopeBorder' },
-        }
+        },
-      }
+      },
     })
     vim.cmd('colorscheme astrodark')
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/bamboo.lua

@@ -4,7 +4,7 @@ return {
   priority = 1000,
   config = function()
     local colors = require('bamboo.palette')
-    require('bamboo').setup {
+    require('bamboo').setup({
       dim_inactive = true, -- Dim inactive windows/buffers
       cmp_itemkind_reverse = true,
       lualine = {
@@ -33,8 +33,8 @@ return {
         ['LspReferenceText'] = { bg = colors.vulgaris.cyan, fg = colors.vulgaris.bg1, fmt = 'nocombine' },
         ['Delimiter'] = { fg = colors.vulgaris.fg },
       },
-    }
+    })
     require('bamboo').load()
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/catppuccin.lua

@@ -1,5 +1,4 @@
-return
+return {
-{
   'catppuccin/nvim',
   name = 'catppuccin',
   lazy = true,
@@ -63,7 +62,7 @@ return
             ['@namespace'] = { fg = colors.red },
             ['@function.builtin'] = { link = 'Function' },
             ['@property'] = { fg = colors.pink },
-            Macro = { fg = colors.rosewater }
+            Macro = { fg = colors.rosewater },
           }
         end,
       },
@@ -100,5 +99,5 @@ return
     })
     vim.cmd('colorscheme catppuccin')
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/everforest.lua

@@ -11,5 +11,5 @@ return {
     })
     require('everforest').load()
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/github-theme.lua

@@ -1,5 +1,4 @@
-return
+return {
-{
   'projekt0n/github-nvim-theme',
   lazy = false, -- make sure we load this during startup if it is your main colorscheme
   priority = 1000, -- make sure to load this before all the other start plugins
@@ -32,7 +31,7 @@ return
           'treesitter',
           'treesitter_context',
           'whichkey',
-        }
+        },
       },
     })
 

lua/themes/gruvbox-baby.lua

@@ -5,5 +5,5 @@ return {
   config = function()
     vim.cmd('colorscheme gruvbox-baby')
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/gruvbox.lua

@@ -33,5 +33,5 @@ return {
     })
     vim.cmd('colorscheme gruvbox')
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/gruvbox_flat.lua

@@ -10,10 +10,10 @@ return {
     }
     vim.g.gruvbox_theme = {
       Pmenu = { bg = 'bg_visual' },
-      NormalFloat = { bg = 'bg_visual' }
+      NormalFloat = { bg = 'bg_visual' },
     }
     vim.g.gruvbox_dark_float = false
     vim.cmd('colorscheme gruvbox-flat')
   end,
-  enabled = false
+  enabled = false,
 }

lua/themes/gruvbox_material.lua

@@ -38,5 +38,5 @@ return {
     vim.cmd('colorscheme gruvbox-material')
     vim.api.nvim_set_hl(0, '@lsp.mod.readonly', { italic = true, fg = 'Purple' })
   end,
-  enabled = false
+  enabled = false,
 }

lua/themes/kanagawa.lua

@@ -28,11 +28,11 @@ return {
       background = {
         -- map the value of 'background' option to a theme
         dark = 'wave', -- try "dragon" !
-        light = 'lotus'
+        light = 'lotus',
       },
     })
 
     vim.cmd('colorscheme kanagawa')
   end,
-  enabled = true
+  enabled = true,
 }

lua/themes/material.lua

@@ -2,7 +2,7 @@ return {
   'marko-cerovac/material.nvim',
   priority = 1000,
   config = function()
-    local colors = require 'material.colors'
+    local colors = require('material.colors')
     require('material').setup({
 
       contrast = {
@@ -15,10 +15,14 @@ return {
       },
 
       styles = { -- Give comments style such as bold, italic, underline etc.
-        comments = { --[[ italic = true ]] },
+        comments = { --[[ italic = true ]]
-        strings = { --[[ bold = true ]] },
+        },
-        keywords = { --[[ underline = true ]] },
+        strings = { --[[ bold = true ]]
-        functions = { --[[ bold = true, undercurl = true ]] },
+        },
+        keywords = { --[[ underline = true ]]
+        },
+        functions = { --[[ bold = true, undercurl = true ]]
+        },
         variables = {},
         operators = {},
         types = {},
@@ -26,23 +30,23 @@ return {
 
       plugins = { -- Uncomment the plugins that you use to highlight them
         -- Available plugins:
-        "dap",
+        'dap',
         -- "dashboard",
-        "gitsigns",
+        'gitsigns',
         -- "hop",
-        "indent-blankline",
+        'indent-blankline',
         -- "lspsaga",
         -- "mini",
         -- "neogit",
         -- "neorg",
-        "nvim-cmp",
+        'nvim-cmp',
-        "nvim-navic",
+        'nvim-navic',
         -- "nvim-tree",
-        "nvim-web-devicons",
+        'nvim-web-devicons',
         -- "sneak",
-        "telescope",
+        'telescope',
         -- "trouble",
-        "which-key",
+        'which-key',
       },
 
       disable = {
@@ -50,12 +54,12 @@ return {
         borders = false, -- Disable borders between verticaly split windows
         background = false, -- Prevent the theme from setting the background (NeoVim then uses your terminal background)
         term_colors = false, -- Prevent the theme from setting terminal colors
-        eob_lines = false -- Hide the end-of-buffer lines
+        eob_lines = false, -- Hide the end-of-buffer lines
       },
 
       high_visibility = {
         lighter = false, -- Enable higher contrast text for lighter style
-        darker = true-- Enable higher contrast text for darker style
+        darker = true, -- Enable higher contrast text for darker style
       },
 
       lualine_style = 'default', -- Lualine style ( can be 'stealth' or 'default' )
@@ -66,8 +70,8 @@ return {
 
       custom_highlights = {}, -- Overwrite highlights with your own
     })
-    vim.g.material_style = "darker"
+    vim.g.material_style = 'darker'
     vim.cmd('colorscheme material')
   end,
-  enabled = false
+  enabled = false,
 }

lua/themes/monokai-pro.lua

@@ -43,9 +43,9 @@ return {
           -- ["@lsp.typemod.interface"] = {},
           -- ["@lsp.typemod.macro"] = {},
           -- ["@lsp.typemod.method"] = {},
-          ["@lsp.typemod.namespace"] = { fg = c.base.red },
+          ['@lsp.typemod.namespace'] = { fg = c.base.red },
           -- ['@lsp.typemod.parameter.declaration'] = { fg = c.base.blue, italic = styles.parameter.italic },
-          ["@lsp.typemod.property"] = { fg = '#9699f2' },
+          ['@lsp.typemod.property'] = { fg = '#9699f2' },
           -- ["@lsp.typemod.struct"] = {},
           -- ["@lsp.typemod.type"] = {},
           -- ["@lsp.typemod.typeParameter"] = {},
@@ -60,5 +60,5 @@ return {
     })
     vim.cmd('colorscheme monokai-pro')
   end,
-  enabled = true
+  enabled = true,
 }

lua/utils/python_venv.lua

@@ -62,14 +62,14 @@ function M.getPythonEnvs()
   if venv ~= nil then
     table.insert(venvs, {
       name = 'VIRTUAL_ENV',
-      path = string.format('%s/%s', venv, M.getVenvSuffix())
+      path = string.format('%s/%s', venv, M.getVenvSuffix()),
     })
   end
   local conda = os.getenv('CONDA_PREFIX')
   if conda ~= nil then
     table.insert(venvs, {
       name = 'CONDA_PREFIX',
-      path = string.format('%s/%s', conda, 'python.exe')
+      path = string.format('%s/%s', conda, 'python.exe'),
     })
   end
 
@@ -79,7 +79,7 @@ function M.getPythonEnvs()
   if jsonVenv ~= nil then
     table.insert(venvs, {
       name = 'pyrightconfig.json',
-      path = jsonVenv .. '/' .. M.getVenvSuffix()
+      path = jsonVenv .. '/' .. M.getVenvSuffix(),
     })
   end
 
@@ -88,20 +88,20 @@ function M.getPythonEnvs()
     if vim.fn.executable(cwd .. '/' .. envDir .. '/' .. M.getVenvSuffix()) == 1 then
       table.insert(venvs, {
         name = envDir,
-        path = cwd .. '/' .. envDir .. '/' .. M.getVenvSuffix()
+        path = cwd .. '/' .. envDir .. '/' .. M.getVenvSuffix(),
       })
     end
   end
   if vim.loop.os_uname().sysname == 'Linux' then
     table.insert(venvs, {
       name = 'system',
-      path = '/usr/bin/python'
+      path = '/usr/bin/python',
     })
   end
   if vim.loop.os_uname().sysname == 'Windows_NT' then
     table.insert(venvs, {
       name = 'system',
-      path = os.getenv('SCOOP') .. '/apps/python/current/python.exe'
+      path = os.getenv('SCOOP') .. '/apps/python/current/python.exe',
     })
   end
   return venvs
@@ -110,7 +110,9 @@ end
 M.pick_venv = function()
   vim.ui.select(M.getPythonEnvs(), {
     prompt = 'Select python venv',
-    format_item = function(item) return string.format('%s (%s)', item.name, item.path) end,
+    format_item = function(item)
+      return string.format('%s (%s)', item.name, item.path)
+    end,
   }, function(choice)
     if not choice then
       return

stylua.toml

@@ -1,4 +1,4 @@
-column_width = 120
+column_width = 160
 line_endings = "Unix"
 indent_type = "Spaces"
 indent_width = 2