fixed

init.lua

@@ -90,6 +90,11 @@ P.S. You can delete this when you're done too. It's your config now! :)
 vim.g.mapleader = ' '
 vim.g.maplocalleader = ' '
 
+-- set encoding to UTF-8
+vim.g.encoding = 'UTF-8'
+vim.g.fileencoding = 'UTF-8'
+vim.g.scriptencoding = 'UTF-8'
+
 -- Set to true if you have a Nerd Font installed and selected in the terminal
 vim.g.have_nerd_font = false
 
@@ -143,7 +148,20 @@ vim.opt.splitbelow = true
 --  See `:help 'list'`
 --  and `:help 'listchars'`
 vim.opt.list = true
-vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
+vim.opt.listchars = {
+  space = '·',
+  tab = '▸ ',
+  trail = '·',
+  extends = '⟩',
+  precedes = '⟨',
+  nbsp = '⦸',
+}
+-- vim.opt.listchars:append { space = '·' }
+-- vim.opt.listchars:append { eol = '§' }
+-- vim.opt.listchars:append { tab = '¤›' }
+-- vim.opt.listchars:append { extends = '»' }
+-- vim.opt.listchars:append { precedes = '«' }
+-- vim.opt.listchars:append { nbsp = '‡' }
 
 -- Preview substitutions live, as you type!
 vim.opt.inccommand = 'split'
@@ -157,6 +175,9 @@ vim.opt.scrolloff = 10
 -- [[ Basic Keymaps ]]
 --  See `:help vim.keymap.set()`
 
+-- Open NetRW
+vim.keymap.set('n', '<leader>o-', vim.cmd.Explore, { desc = '[O]pen [-]Directory' })
+
 -- Set highlight on search, but clear on pressing <Esc> in normal mode
 vim.opt.hlsearch = true
 vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
@@ -225,6 +246,64 @@ vim.opt.rtp:prepend(lazypath)
 --
 -- NOTE: Here is where you install your plugins.
 require('lazy').setup({
+
+  {
+    -- Theme inspired by Atom
+    'rebelot/kanagawa.nvim',
+    priority = 1000,
+    lazy = false,
+    config = function()
+      vim.cmd.colorscheme 'kanagawa'
+    end,
+  },
+
+  {
+    'ThePrimeagen/harpoon',
+    dependencies = { 'nvim-lua/plenary.nvim' },
+    config = function()
+      local ui = require 'harpoon.ui'
+      local mark = require 'harpoon.mark'
+
+      -- mark page
+      vim.keymap.set('n', '<leader>ha', mark.add_file, { desc = '[H]arpoon [A]dd' })
+
+      -- show menu
+      vim.keymap.set('n', '<leader>hh', ui.toggle_quick_menu, { desc = '[H]arpoon Menu' })
+
+      -- navigation
+      vim.keymap.set('n', '<leader>h1', function()
+        ui.nav_file(1)
+      end, { desc = '[H]arpoon File [1]' })
+      vim.keymap.set('n', '<leader>h2', function()
+        ui.nav_file(2)
+      end, { desc = '[H]arpoon File [2]' })
+      vim.keymap.set('n', '<leader>h3', function()
+        ui.nav_file(3)
+      end, { desc = '[H]arpoon File [3]' })
+      vim.keymap.set('n', '<leader>h4', function()
+        ui.nav_file(4)
+      end, { desc = '[H]arpoon File [4]' })
+      vim.keymap.set('n', '<leader>h5', function()
+        ui.nav_file(5)
+      end, { desc = '[H]arpoon File [5]' })
+      vim.keymap.set('n', '<leader>h6', function()
+        ui.nav_file(6)
+      end, { desc = '[H]arpoon File [6]' })
+      vim.keymap.set('n', '<leader>h7', function()
+        ui.nav_file(7)
+      end, { desc = '[H]arpoon File [7]' })
+      vim.keymap.set('n', '<leader>h8', function()
+        ui.nav_file(8)
+      end, { desc = '[H]arpoon File [8]' })
+      vim.keymap.set('n', '<leader>h9', function()
+        ui.nav_file(9)
+      end, { desc = '[H]arpoon File [9]' })
+      vim.keymap.set('n', '<leader>h0', function()
+        ui.nav_file(0)
+      end, { desc = '[H]arpoon File [0]' })
+    end,
+  },
+
   -- NOTE: Plugins can be added with a link (or for a github repo: 'owner/repo' link).
   'tpope/vim-sleuth', -- Detect tabstop and shiftwidth automatically
 
@@ -237,86 +316,15 @@ require('lazy').setup({
   --  This is equivalent to:
   --    require('Comment').setup({})
 
-  -- Detect tabstop and shiftwidth automatically
+  -- "gc" to comment visual regions/lines
-  'tpope/vim-sleuth',
+  { 'numToStr/Comment.nvim', opts = {} },
-  {
-    'ThePrimeagen/harpoon',
-    dependencies = { 'nvim-lua/plenary.nvim' },
-    config = function()
-      local ui = require('harpoon.ui')
-      local mark = require('harpoon.mark')
 
-      -- mark page
+  -- Here is a more advanced example where we pass configuration
-      vim.keymap.set('n', '<leader>ha', mark.add_file, { desc = "[H]arpoon [A]dd" })
+  -- options to `gitsigns.nvim`. This is equivalent to the following Lua:
-
+  --    require('gitsigns').setup({ ... })
-      -- show menu
+  --
-      vim.keymap.set('n', '<leader>hh', ui.toggle_quick_menu, { desc = "[H]arpoon Menu" })
+  -- See `:help gitsigns` to understand what the configuration keys do
-
+  { -- Adds git related signs to the gutter, as well as utilities for managing changes
-      -- navigation
-      vim.keymap.set('n', '<leader>h1', function() ui.nav_file(1) end, { desc = "[H]arpoon File [1]" })
-      vim.keymap.set('n', '<leader>h2', function() ui.nav_file(2) end, { desc = "[H]arpoon File [2]" })
-      vim.keymap.set('n', '<leader>h3', function() ui.nav_file(3) end, { desc = "[H]arpoon File [3]" })
-      vim.keymap.set('n', '<leader>h4', function() ui.nav_file(4) end, { desc = "[H]arpoon File [4]" })
-      vim.keymap.set('n', '<leader>h5', function() ui.nav_file(5) end, { desc = "[H]arpoon File [5]" })
-      vim.keymap.set('n', '<leader>h6', function() ui.nav_file(6) end, { desc = "[H]arpoon File [6]" })
-      vim.keymap.set('n', '<leader>h7', function() ui.nav_file(7) end, { desc = "[H]arpoon File [7]" })
-      vim.keymap.set('n', '<leader>h8', function() ui.nav_file(8) end, { desc = "[H]arpoon File [8]" })
-      vim.keymap.set('n', '<leader>h9', function() ui.nav_file(9) end, { desc = "[H]arpoon File [9]" })
-      vim.keymap.set('n', '<leader>h0', function() ui.nav_file(0) end, { desc = "[H]arpoon File [0]" })
-    end
-  },
-
-  -- NOTE: This is where your plugins related to LSP can be installed.
-  --  The configuration is done below. Search for lspconfig to find it below.
-  {
-    -- LSP Configuration & Plugins
-    'neovim/nvim-lspconfig',
-    dependencies = {
-      -- Automatically install LSPs to stdpath for neovim
-      { 'williamboman/mason.nvim', config = true },
-      'williamboman/mason-lspconfig.nvim',
-
-      -- Useful status updates for LSP
-      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      { 'j-hui/fidget.nvim',       opts = {} },
-
-      -- Additional lua configuration, makes nvim stuff amazing!
-      'folke/neodev.nvim',
-    },
-  },
-
-  {
-    -- Autocompletion
-    'hrsh7th/nvim-cmp',
-    dependencies = {
-      -- Snippet Engine & its associated nvim-cmp source
-      {
-        'L3MON4D3/LuaSnip',
-        build = (function()
-          -- Build Step is needed for regex support in snippets
-          -- This step is not supported in many windows environments
-          -- Remove the below condition to re-enable on windows
-          if vim.fn.has 'win32' == 1 then
-            return
-          end
-          return 'make install_jsregexp'
-        end)(),
-      },
-      'saadparwaiz1/cmp_luasnip',
-
-      -- Adds LSP completion capabilities
-      'hrsh7th/cmp-nvim-lsp',
-      'hrsh7th/cmp-path',
-
-      -- Adds a number of user-friendly snippets
-      'rafamadriz/friendly-snippets',
-    },
-  },
-
-  -- Useful plugin to show you pending keybinds.
-  { 'folke/which-key.nvim',  opts = {} },
-  {
-    -- Adds git related signs to the gutter, as well as utilities for managing changes
     'lewis6991/gitsigns.nvim',
     opts = {
       signs = {
@@ -329,13 +337,41 @@ require('lazy').setup({
     },
   },
 
-  {
+  -- NOTE: Plugins can also be configured to run Lua code when they are loaded.
-    -- Theme inspired by Atom
+  --
-    'rebelot/kanagawa.nvim',
+  -- This is often very useful to both group configuration, as well as handle
-    priority = 1000,
+  -- lazy loading plugins that don't need to be loaded immediately at startup.
-    lazy = false,
+  --
-    config = function()
+  -- For example, in the following configuration, we use:
-      vim.cmd.colorscheme('kanagawa')
+  --  event = 'VimEnter'
+  --
+  -- which loads which-key before all the UI elements are loaded. Events can be
+  -- normal autocommands events (`:help autocmd-events`).
+  --
+  -- Then, because we use the `config` key, the configuration only runs
+  -- after the plugin has been loaded:
+  --  config = function() ... end
+
+  { -- Useful plugin to show you pending keybinds.
+    'folke/which-key.nvim',
+    event = 'VimEnter', -- Sets the loading event to 'VimEnter'
+    config = function() -- This is the function that runs, AFTER loading
+      require('which-key').setup()
+
+      -- Document existing key chains
+      require('which-key').register {
+        ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
+        ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
+        ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
+        ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
+        ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
+        ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
+        ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
+      }
+      -- visual mode
+      require('which-key').register({
+        ['<leader>h'] = { 'Git [H]unk' },
+      }, { mode = 'v' })
     end,
   },
 
@@ -349,7 +385,8 @@ require('lazy').setup({
   { -- Fuzzy Finder (files, lsp, etc)
     'nvim-telescope/telescope.nvim',
     event = 'VimEnter',
-    branch = '0.1.x',
+    branch = 'master',
+    -- branch = '0.1.x',
     dependencies = {
       'nvim-lua/plenary.nvim',
       { -- If encountering errors, see telescope-fzf-native README for installation instructions
@@ -390,132 +427,16 @@ require('lazy').setup({
       -- Telescope picker. This is really useful to discover what Telescope can
       -- do as well as how to actually do it!
 
-  {
+      -- [[ Configure Telescope ]]
-    -- Highlight, edit, and navigate code
+      -- See `:help telescope` and `:help telescope.setup()`
-    'nvim-treesitter/nvim-treesitter',
+      require('telescope').setup {
-    dependencies = {
+        -- You can put your default mappings / updates / etc. in here
-      'nvim-treesitter/nvim-treesitter-textobjects',
+        --  All the info you're looking for is in `:help telescope.setup()`
-    },
-    build = ':TSUpdate',
-  },
-
-  -- NOTE: Next Step on Your Neovim Journey: Add/Configure additional "plugins" for kickstart
-  --       These are some example plugins that I've included in the kickstart repository.
-  --       Uncomment any of the lines below to enable them.
-  require 'kickstart.plugins.autoformat',
-  require 'kickstart.plugins.debug',
-
-  -- NOTE: The import below can automatically add your own plugins, configuration, etc from `lua/custom/plugins/*.lua`
-  --    You can use this folder to prevent any conflicts with this init.lua if you're interested in keeping
-  --    up-to-date with whatever is in the kickstart repo.
-  --    Uncomment the following line and add your plugins to `lua/custom/plugins/*.lua` to get going.
         --
-  --    For additional information see: https://github.com/folke/lazy.nvim#-structuring-your-plugins
-  -- { import = 'custom.plugins' },
-}, {})
-
--- [[ Setting options ]]
--- See `:help vim.o`
--- NOTE: You can change these options as you wish!
-
--- set encoding to UTF-8
-vim.g.encoding = 'UTF-8'
-vim.g.fileencoding = 'UTF-8'
-vim.g.scriptencoding = 'UTF-8'
-
--- Show Whitespace Characters
-vim.opt.list = true
-vim.opt.listchars:append({ eol = '§' });
-vim.opt.listchars:append({ tab = '¤›' });
-vim.opt.listchars:append({ extends = '»' });
-vim.opt.listchars:append({ precedes = '«' });
-vim.opt.listchars:append({ nbsp = '‡' });
-vim.opt.listchars:append({ space = '·' });
-
--- Set highlight on search
-vim.o.hlsearch = false
-
--- Make line numbers default
-vim.wo.number = true
-
--- Enable mouse mode
-vim.o.mouse = 'a'
-
--- Sync clipboard between OS and Neovim.
---  Remove this option if you want your OS clipboard to remain independent.
---  See `:help 'clipboard'`
-vim.o.clipboard = 'unnamedplus'
-
--- Show Whitespace Characters
-vim.opt.list = true
-vim.opt.listchars:append({ eol = '§' });
-vim.opt.listchars:append({ tab = '¤›' });
-vim.opt.listchars:append({ extends = '»' });
-vim.opt.listchars:append({ precedes = '«' });
-vim.opt.listchars:append({ nbsp = '‡' });
-vim.opt.listchars:append({ space = '·' });
-
--- Enable break indent
-vim.o.breakindent = true
-
--- Save undo history
-vim.o.undofile = true
-
--- Case-insensitive searching UNLESS \C or capital in search
-vim.o.ignorecase = true
-vim.o.smartcase = true
-
--- Keep signcolumn on by default
-vim.wo.signcolumn = 'yes'
-
--- Decrease update time
-vim.o.updatetime = 250
-vim.o.timeoutlen = 300
-
--- Set completeopt to have a better completion experience
-vim.o.completeopt = 'menuone,noselect'
-
--- NOTE: You should make sure your terminal supports this
-vim.o.termguicolors = true
-
--- [[ Basic Keymaps ]]
-
--- Open NetRW
-vim.keymap.set('n', '<leader>o-', vim.cmd.Explore, { desc = '[O]pen [-]Directory' })
-
--- Keymaps for better default experience
--- See `:help vim.keymap.set()`
-vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
-
--- Remap for dealing with word wrap
-vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
-vim.keymap.set('n', 'j', "v:count == 0 ? 'gj' : 'j'", { expr = true, silent = true })
-
--- Diagnostic keymaps
-vim.keymap.set('n', '[d', vim.diagnostic.goto_prev, { desc = 'Go to previous diagnostic message' })
-vim.keymap.set('n', ']d', vim.diagnostic.goto_next, { desc = 'Go to next diagnostic message' })
-vim.keymap.set('n', '<leader>e', vim.diagnostic.open_float, { desc = 'Open floating diagnostic message' })
-vim.keymap.set('n', '<leader>q', vim.diagnostic.setloclist, { desc = 'Open diagnostics list' })
-
--- [[ Highlight on yank ]]
--- See `:help vim.highlight.on_yank()`
-local highlight_group = vim.api.nvim_create_augroup('YankHighlight', { clear = true })
-vim.api.nvim_create_autocmd('TextYankPost', {
-  callback = function()
-    vim.highlight.on_yank()
-  end,
-  group = highlight_group,
-  pattern = '*',
-})
-
--- [[ Configure Telescope ]]
--- See `:help telescope` and `:help telescope.setup()`
-require('telescope').setup {
         defaults = {
           mappings = {
             i = {
-        ['<C-u>'] = false,
+              ['<c-enter>'] = 'to_fuzzy_refine',
-        ['<C-d>'] = false,
               ['<C-j>'] = require('telescope.actions').move_selection_next,
               ['<C-k>'] = require('telescope.actions').move_selection_previous,
             },
@@ -536,116 +457,11 @@ require('telescope').setup {
             end,
           },
         },
-}
+        extensions = {
-
+          ['ui-select'] = {
--- Enable telescope fzf native, if installed
+            require('telescope.themes').get_dropdown(),
-pcall(require('telescope').load_extension, 'fzf')
-
--- Telescope live_grep in git root
--- Function to find the git root directory based on the current buffer's path
-local function find_git_root()
-  -- Use the current buffer's path as the starting point for the git search
-  local current_file = vim.api.nvim_buf_get_name(0)
-  local current_dir
-  local cwd = vim.fn.getcwd()
-  -- If the buffer is not associated with a file, return nil
-  if current_file == '' then
-    current_dir = cwd
-  else
-    -- Extract the directory from the current file's path
-    current_dir = vim.fn.fnamemodify(current_file, ':h')
-  end
-
-  -- Find the Git root directory from the current file's path
-  local git_root = vim.fn.systemlist('git -C ' .. vim.fn.escape(current_dir, ' ') .. ' rev-parse --show-toplevel')[1]
-  if vim.v.shell_error ~= 0 then
-    print 'Not a git repository. Searching on current working directory'
-    return cwd
-  end
-  return git_root
-end
-
--- Custom live_grep function to search in git root
-local function live_grep_git_root()
-  local git_root = find_git_root()
-  if git_root then
-    require('telescope.builtin').live_grep {
-      search_dirs = { git_root },
-    }
-  end
-end
-
-vim.api.nvim_create_user_command('LiveGrepGitRoot', live_grep_git_root, {})
-
--- See `:help telescope.builtin`
-vim.keymap.set('n', '<leader>?', require('telescope.builtin').oldfiles, { desc = '[?] Find recently opened files' })
-vim.keymap.set('n', '<leader><space>', require('telescope.builtin').buffers, { desc = '[ ] Find existing buffers' })
-vim.keymap.set('n', '<leader>/', function()
-  -- You can pass additional configuration to telescope to change theme, layout, etc.
-  require('telescope.builtin').current_buffer_fuzzy_find(require('telescope.themes').get_dropdown {
-    winblend = 10,
-    previewer = false,
-  })
-end, { desc = '[/] Fuzzily search in current buffer' })
-
-local function telescope_live_grep_open_files()
-  require('telescope.builtin').live_grep {
-    grep_open_files = true,
-    prompt_title = 'Live Grep in Open Files',
-  }
-end
-vim.keymap.set('n', '<leader>s/', telescope_live_grep_open_files, { desc = '[S]earch [/] in Open Files' })
-vim.keymap.set('n', '<leader>ss', require('telescope.builtin').builtin, { desc = '[S]earch [S]elect Telescope' })
-vim.keymap.set('n', '<leader>gf', require('telescope.builtin').git_files, { desc = 'Search [G]it [F]iles' })
-vim.keymap.set('n', '<leader>sf', require('telescope.builtin').find_files, { desc = '[S]earch [F]iles' })
-vim.keymap.set('n', '<leader>sh', require('telescope.builtin').help_tags, { desc = '[S]earch [H]elp' })
-vim.keymap.set('n', '<leader>sw', require('telescope.builtin').grep_string, { desc = '[S]earch current [W]ord' })
-vim.keymap.set('n', '<leader>sg', require('telescope.builtin').live_grep, { desc = '[S]earch by [G]rep' })
-vim.keymap.set('n', '<leader>sG', ':LiveGrepGitRoot<cr>', { desc = '[S]earch by [G]rep on Git Root' })
-vim.keymap.set('n', '<leader>sd', require('telescope.builtin').diagnostics, { desc = '[S]earch [D]iagnostics' })
-vim.keymap.set('n', '<leader>sr', require('telescope.builtin').resume, { desc = '[S]earch [R]esume' })
-
--- [[ Configure Treesitter ]]
--- See `:help nvim-treesitter`
--- Defer Treesitter setup after first render to improve startup time of 'nvim {filename}'
-vim.defer_fn(function()
-  require('nvim-treesitter.configs').setup {
-    -- Add languages to be installed here that you want installed for treesitter
-    ensure_installed = { 'c', 'cpp', 'go', 'lua', 'python', 'rust', 'tsx', 'javascript', 'typescript', 'vimdoc', 'vim',
-      'bash' },
-
-    -- Autoinstall languages that are not installed. Defaults to false (but you can change for yourself!)
-    auto_install = false,
-    -- Install languages synchronously (only applied to `ensure_installed`)
-    sync_install = false,
-    -- List of parsers to ignore installing
-    ignore_install = {},
-    -- You can specify additional Treesitter modules here: -- For example: -- playground = {--enable = true,-- },
-    modules = {},
-    highlight = { enable = true },
-    indent = { enable = true },
-    incremental_selection = {
-      enable = true,
-      keymaps = {
-        init_selection = '<c-space>',
-        node_incremental = '<c-space>',
-        scope_incremental = '<c-s>',
-        node_decremental = '<M-space>',
           },
         },
-    textobjects = {
-      select = {
-        enable = true,
-        lookahead = true, -- Automatically jump forward to textobj, similar to targets.vim
-        keymaps = {
-          -- You can use the capture groups defined in textobjects.scm
-          ['aa'] = '@parameter.outer',
-          ['ia'] = '@parameter.inner',
-          ['af'] = '@function.outer',
-          ['if'] = '@function.inner',
-          ['ac'] = '@class.outer',
-          ['ic'] = '@class.inner',
-        },
       }
 
       -- Enable Telescope extensions if they are installed
@@ -683,133 +499,28 @@ vim.defer_fn(function()
         }
       end, { desc = '[S]earch [/] in Open Files' })
 
-  -- See `:help K` for why this keymap
+      -- Shortcut for searching your Neovim configuration files
-  nmap('K', vim.lsp.buf.hover, 'Hover Documentation')
+      vim.keymap.set('n', '<leader>sn', function()
-  nmap('<C-k>', vim.lsp.buf.signature_help, 'Signature Documentation')
+        builtin.find_files { cwd = vim.fn.stdpath 'config' }
-
+      end, { desc = '[S]earch [N]eovim files' })
-  -- Lesser used LSP functionality
-  nmap('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
-  nmap('<leader>wa', vim.lsp.buf.add_workspace_folder, '[W]orkspace [A]dd Folder')
-  nmap('<leader>wr', vim.lsp.buf.remove_workspace_folder, '[W]orkspace [R]emove Folder')
-  nmap('<leader>wl', function()
-    print(vim.inspect(vim.lsp.buf.list_workspace_folders()))
-  end, '[W]orkspace [L]ist Folders')
-
-  -- Create a command `:Format` local to the LSP buffer
-  vim.api.nvim_buf_create_user_command(bufnr, 'Format', function(_)
-    vim.lsp.buf.format()
-  end, { desc = 'Format current buffer with LSP' })
-end
-
--- document existing key chains
-require('which-key').register {
-  ['<leader>c'] = { name = '[C]ode', _ = 'which_key_ignore' },
-  ['<leader>d'] = { name = '[D]ocument', _ = 'which_key_ignore' },
-  ['<leader>g'] = { name = '[G]it', _ = 'which_key_ignore' },
-  ['<leader>h'] = { name = 'Git [H]unk', _ = 'which_key_ignore' },
-  ['<leader>r'] = { name = '[R]ename', _ = 'which_key_ignore' },
-  ['<leader>s'] = { name = '[S]earch', _ = 'which_key_ignore' },
-  ['<leader>t'] = { name = '[T]oggle', _ = 'which_key_ignore' },
-  ['<leader>w'] = { name = '[W]orkspace', _ = 'which_key_ignore' },
-}
--- register which-key VISUAL mode
--- required for visual <leader>hs (hunk stage) to work
-require('which-key').register({
-  ['<leader>'] = { name = 'VISUAL <leader>' },
-  ['<leader>h'] = { 'Git [H]unk' },
-}, { mode = 'v' })
-
--- mason-lspconfig requires that these setup functions are called in this order
--- before setting up the servers.
-require('mason').setup()
-require('mason-lspconfig').setup()
-
--- Enable the following language servers
---  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
---
---  Add any additional override configuration in the following tables. They will be passed to
---  the `settings` field of the server config. You must look up that documentation yourself.
---
---  If you want to override the default filetypes that your language server will attach to you can
---  define the property 'filetypes' to the map in question.
-local servers = {
-  -- clangd = {},
-  gopls = {},
-  terraformls = {},
-  sqlls = {},
-  pyright = {},
-  -- rust_analyzer = {},
-  -- tsserver = {},
-  html = { filetypes = { 'html' } },
-
-  lua_ls = {
-    Lua = {
-      workspace = { checkThirdParty = false },
-      telemetry = { enable = false },
-      -- NOTE: toggle below to ignore Lua_LS's noisy `missing-fields` warnings
-      -- diagnostics = { disable = { 'missing-fields' } },
-    },
-  },
-}
-
--- Setup neovim lua configuration
-require('neodev').setup()
-
--- nvim-cmp supports additional completion capabilities, so broadcast that to servers
-local capabilities = vim.lsp.protocol.make_client_capabilities()
-capabilities = require('cmp_nvim_lsp').default_capabilities(capabilities)
-
--- Ensure the servers above are installed
-local mason_lspconfig = require 'mason-lspconfig'
-
-mason_lspconfig.setup {
-  ensure_installed = vim.tbl_keys(servers),
-}
-
-mason_lspconfig.setup_handlers {
-  function(server_name)
-    require('lspconfig')[server_name].setup {
-      capabilities = capabilities,
-      on_attach = on_attach,
-      settings = servers[server_name],
-      filetypes = (servers[server_name] or {}).filetypes,
-    }
-  end,
-}
-
--- format on save (terraform)
-vim.api.nvim_create_autocmd({ "BufWritePre" }, {
-  pattern = { "*.tf", "*.tfvars" },
-  callback = function()
-    vim.lsp.buf.format()
-  end
-})
-
--- [[ Configure nvim-cmp ]]
--- See `:help cmp`
-local cmp = require 'cmp'
-local luasnip = require 'luasnip'
-require('luasnip.loaders.from_vscode').lazy_load()
-luasnip.config.setup {}
-
-cmp.setup {
-  snippet = {
-    expand = function(args)
-      luasnip.lsp_expand(args.body)
     end,
   },
-  completion = {
+
-    completeopt = 'menu,menuone,noinsert',
+  { -- LSP Configuration & Plugins
-  },
+    'neovim/nvim-lspconfig',
-  mapping = cmp.mapping.preset.insert {
+    dependencies = {
-    ['<C-j>'] = cmp.mapping.select_next_item(),
+      -- Automatically install LSPs and related tools to stdpath for Neovim
-    ['<C-k>'] = cmp.mapping.select_prev_item(),
+      { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
-    ['<C-b>'] = cmp.mapping.scroll_docs(-4),
+      'williamboman/mason-lspconfig.nvim',
-    ['<C-f>'] = cmp.mapping.scroll_docs(4),
+      'WhoIsSethDaniel/mason-tool-installer.nvim',
-    ['<C-Space>'] = cmp.mapping.complete {},
+
-    ['<CR>'] = cmp.mapping.confirm {
+      -- Useful status updates for LSP.
-      behavior = cmp.ConfirmBehavior.Replace,
+      -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
-      select = true,
+      { 'j-hui/fidget.nvim', opts = {} },
+
+      -- `neodev` configures Lua LSP for your Neovim config, runtime and plugins
+      -- used for completion, annotations and signatures of Neovim apis
+      { 'folke/neodev.nvim', opts = {} },
     },
     config = function()
       -- Brief aside: **What is LSP?**
@@ -953,8 +664,11 @@ cmp.setup {
       --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
       local servers = {
         -- clangd = {},
-        -- gopls = {},
+        gopls = {},
-        -- pyright = {},
+        pyright = {},
+        solargraph = {},
+        sqlls = {},
+        html = { filetypes = { 'html' } },
         -- rust_analyzer = {},
         -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
         --
@@ -971,9 +685,11 @@ cmp.setup {
           -- capabilities = {},
           settings = {
             Lua = {
+              workspace = { checkThirdParty = false },
               completion = {
                 callSnippet = 'Replace',
               },
+              telemetry = { enable = false },
               -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
               -- diagnostics = { disable = { 'missing-fields' } },
             },
@@ -1106,8 +822,10 @@ cmp.setup {
         mapping = cmp.mapping.preset.insert {
           -- Select the [n]ext item
           ['<C-n>'] = cmp.mapping.select_next_item(),
+          ['<C-j>'] = cmp.mapping.select_next_item(),
           -- Select the [p]revious item
           ['<C-p>'] = cmp.mapping.select_prev_item(),
+          ['<C-k>'] = cmp.mapping.select_prev_item(),
 
           -- Scroll the documentation window [b]ack / [f]orward
           ['<C-b>'] = cmp.mapping.scroll_docs(-4),
@@ -1116,13 +834,14 @@ cmp.setup {
           -- Accept ([y]es) the completion.
           --  This will auto-import if your LSP supports it.
           --  This will expand snippets if the LSP sent a snippet.
-          ['<C-y>'] = cmp.mapping.confirm { select = true },
+          -- ['<C-y>'] = cmp.mapping.confirm { select = true },
+          ['<C-CR>'] = cmp.mapping.confirm { select = true },
 
           -- If you prefer more traditional completion keymaps,
           -- you can uncomment the following lines
-          --['<CR>'] = cmp.mapping.confirm { select = true },
+          ['<CR>'] = cmp.mapping.confirm { select = true },
-          --['<Tab>'] = cmp.mapping.select_next_item(),
+          ['<Tab>'] = cmp.mapping.select_next_item(),
-          --['<S-Tab>'] = cmp.mapping.select_prev_item(),
+          ['<S-Tab>'] = cmp.mapping.select_prev_item(),
 
           -- Manually trigger a completion from nvim-cmp.
           --  Generally you don't need this, because nvim-cmp will display