fix bug and add yank paths

init.lua

@@ -325,6 +325,7 @@ require('lazy').setup({
         { '<leader>w', group = '[W]orkspace' },
         { '<leader>t', group = '[T]oggle' },
         { '<leader>h', group = 'Git [H]unk', mode = { 'n', 'v' } },
+        { '<leader>y', group = '[Y]ank' },
       },
       triggers = {
         { '<leader>', mode = 'nixsotc' },

lua/custom/plugins/flash.lua

@@ -10,9 +10,9 @@ return {
         },
       },
     }
-    vim.keymap.set('n', 'f', '<cmd>lua require("flash").jump()<CR>', { noremap = true, desc = 'flash search' })
+    vim.keymap.set({'n', 'v', 'o'}, 'f', '<cmd>lua require("flash").jump()<CR>', { noremap = true, desc = 'flash search' })
     vim.keymap.set(
-      'n',
+      {'n', 'v', 'o'},
       'F',
       '<cmd>lua require("flash").jump({search = { forward = false, wrap = false, multi_window = false }})<CR>',
       { noremap = true, desc = 'flash search backwards' }

lua/custom/plugins/lspconfig.lua

@@ -1,135 +1,220 @@
 return {
-  "neovim/nvim-lspconfig",
+  -- Main LSP Configuration
-  event = { "BufReadPre", "BufNewFile" },
+  'neovim/nvim-lspconfig',
   dependencies = {
-    "hrsh7th/cmp-nvim-lsp",
+    -- Automatically install LSPs and related tools to stdpath for Neovim
-    { "antosha417/nvim-lsp-file-operations", config = true },
+    { 'williamboman/mason.nvim', config = true }, -- NOTE: Must be loaded before dependants
+    'williamboman/mason-lspconfig.nvim',
+    'WhoIsSethDaniel/mason-tool-installer.nvim',
+
+    -- Useful status updates for LSP.
+    -- NOTE: `opts = {}` is the same as calling `require('fidget').setup({})`
+    { 'j-hui/fidget.nvim', opts = {} },
+
+    -- Allows extra capabilities provided by nvim-cmp
+    'hrsh7th/cmp-nvim-lsp',
   },
   config = function()
-    -- import lspconfig plugin
+    -- Brief aside: **What is LSP?**
-    local lspconfig = require("lspconfig")
+    --
+    -- LSP is an initialism you've probably heard, but might not understand what it is.
+    --
+    -- LSP stands for Language Server Protocol. It's a protocol that helps editors
+    -- and language tooling communicate in a standardized fashion.
+    --
+    -- In general, you have a "server" which is some tool built to understand a particular
+    -- language (such as `gopls`, `lua_ls`, `rust_analyzer`, etc.). These Language Servers
+    -- (sometimes called LSP servers, but that's kind of like ATM Machine) are standalone
+    -- processes that communicate with some "client" - in this case, Neovim!
+    --
+    -- LSP provides Neovim with features like:
+    --  - Go to definition
+    --  - Find references
+    --  - Autocompletion
+    --  - Symbol Search
+    --  - and more!
+    --
+    -- Thus, Language Servers are external tools that must be installed separately from
+    -- Neovim. This is where `mason` and related plugins come into play.
+    --
+    -- If you're wondering about lsp vs treesitter, you can check out the wonderfully
+    -- and elegantly composed help section, `:help lsp-vs-treesitter`
 
-    -- import mason_lspconfig plugin
+    --  This function gets run when an LSP attaches to a particular buffer.
-    local mason_lspconfig = require("mason-lspconfig")
+    --    That is to say, every time a new file is opened that is associated with
-
+    --    an lsp (for example, opening `main.rs` is associated with `rust_analyzer`) this
-    -- import cmp-nvim-lsp plugin
+    --    function will be executed to configure the current buffer
-    local cmp_nvim_lsp = require("cmp_nvim_lsp")
+    vim.api.nvim_create_autocmd('LspAttach', {
-
+      group = vim.api.nvim_create_augroup('kickstart-lsp-attach', { clear = true }),
-    local keymap = vim.keymap -- for conciseness
+      callback = function(event)
-
+        -- NOTE: Remember that Lua is a real programming language, and as such it is possible
-    vim.api.nvim_create_autocmd("LspAttach", {
+        -- to define small helper and utility functions so you don't have to repeat yourself.
-      group = vim.api.nvim_create_augroup("UserLspConfig", {}),
+        --
-      callback = function(ev)
+        -- In this case, we create a function that lets us more easily define mappings specific
-        -- Buffer local mappings.
+        -- for LSP related items. It sets the mode, buffer and description for us each time.
-        -- See `:help vim.lsp.*` for documentation on any of the below functions
+        local map = function(keys, func, desc, mode)
-        local opts = { buffer = ev.buf, silent = true }
+          mode = mode or 'n'
-
+          vim.keymap.set(mode, keys, func, { buffer = event.buf, desc = 'LSP: ' .. desc })
-        -- set keybinds
-        opts.desc = "Show LSP references"
-        keymap.set("n", "gR", "<cmd>Telescope lsp_references<CR>", opts) -- show definition, references
-
-        opts.desc = "Go to declaration"
-        keymap.set("n", "gD", vim.lsp.buf.declaration, opts) -- go to declaration
-
-        opts.desc = "Show LSP definitions"
-        keymap.set("n", "gd", "<cmd>Telescope lsp_definitions<CR>", opts) -- show lsp definitions
-
-        opts.desc = "Show LSP implementations"
-        keymap.set("n", "gi", "<cmd>Telescope lsp_implementations<CR>", opts) -- show lsp implementations
-
-        opts.desc = "Show LSP type definitions"
-        keymap.set("n", "gt", "<cmd>Telescope lsp_type_definitions<CR>", opts) -- show lsp type definitions
-
-        opts.desc = "See available code actions"
-        keymap.set({ "n", "v" }, "<leader>ca", vim.lsp.buf.code_action, opts) -- see available code actions, in visual mode will apply to selection
-
-        opts.desc = "Smart rename"
-        keymap.set("n", "<leader>rn", vim.lsp.buf.rename, opts) -- smart rename
-
-        opts.desc = "Show buffer diagnostics"
-        keymap.set("n", "<leader>D", "<cmd>Telescope diagnostics bufnr=0<CR>", opts) -- show  diagnostics for file
-
-        opts.desc = "Show line diagnostics"
-        keymap.set("n", "<leader>d", vim.diagnostic.open_float, opts) -- show diagnostics for line
-
-        opts.desc = "Go to previous diagnostic"
-        keymap.set("n", "[d", vim.diagnostic.goto_prev, opts) -- jump to previous diagnostic in buffer
-
-        opts.desc = "Go to next diagnostic"
-        keymap.set("n", "]d", vim.diagnostic.goto_next, opts) -- jump to next diagnostic in buffer
-
-        opts.desc = "Show documentation for what is under cursor"
-        keymap.set("n", "K", vim.lsp.buf.hover, opts) -- show documentation for what is under cursor
-
-        opts.desc = "Restart LSP"
-        keymap.set("n", "<leader>rs", ":LspRestart<CR>", opts) -- mapping to restart lsp if necessary
-      end,
-    })
-
-    -- used to enable autocompletion (assign to every lsp server config)
-    local capabilities = cmp_nvim_lsp.default_capabilities()
-
-    -- Change the Diagnostic symbols in the sign column (gutter)
-    -- (not in youtube nvim video)
-    local signs = { Error = " ", Warn = " ", Hint = "󰠠 ", Info = " " }
-    for type, icon in pairs(signs) do
-      local hl = "DiagnosticSign" .. type
-      vim.fn.sign_define(hl, { text = icon, texthl = hl, numhl = "" })
         end
 
-    mason_lspconfig.setup_handlers({
+        -- Jump to the definition of the word under your cursor.
-      -- default handler for installed servers
+        --  This is where a variable was first declared, or where a function is defined, etc.
-      function(server_name)
+        --  To jump back, press <C-t>.
-        lspconfig[server_name].setup({
+        map('gd', require('telescope.builtin').lsp_definitions, '[G]oto [D]efinition')
-          capabilities = capabilities,
+
+        -- Find references for the word under your cursor.
+        map('gr', require('telescope.builtin').lsp_references, '[G]oto [R]eferences')
+
+        -- Jump to the implementation of the word under your cursor.
+        --  Useful when your language has ways of declaring types without an actual implementation.
+        map('gI', require('telescope.builtin').lsp_implementations, '[G]oto [I]mplementation')
+
+        -- Jump to the type of the word under your cursor.
+        --  Useful when you're not sure what type a variable is and you want to see
+        --  the definition of its *type*, not where it was *defined*.
+        map('<leader>D', require('telescope.builtin').lsp_type_definitions, 'Type [D]efinition')
+
+        -- Fuzzy find all the symbols in your current document.
+        --  Symbols are things like variables, functions, types, etc.
+        map('<leader>ds', require('telescope.builtin').lsp_document_symbols, '[D]ocument [S]ymbols')
+
+        -- Fuzzy find all the symbols in your current workspace.
+        --  Similar to document symbols, except searches over your entire project.
+        map('<leader>ws', require('telescope.builtin').lsp_dynamic_workspace_symbols, '[W]orkspace [S]ymbols')
+
+        -- Rename the variable under your cursor.
+        --  Most Language Servers support renaming across files, etc.
+        map('<leader>rn', vim.lsp.buf.rename, '[R]e[n]ame')
+
+        -- Execute a code action, usually your cursor needs to be on top of an error
+        -- or a suggestion from your LSP for this to activate.
+        map('<leader>ca', vim.lsp.buf.code_action, '[C]ode [A]ction', { 'n', 'x' })
+
+        -- WARN: This is not Goto Definition, this is Goto Declaration.
+        --  For example, in C this would take you to the header.
+        map('gD', vim.lsp.buf.declaration, '[G]oto [D]eclaration')
+
+        -- The following two autocommands are used to highlight references of the
+        -- word under your cursor when your cursor rests there for a little while.
+        --    See `:help CursorHold` for information about when this is executed
+        --
+        -- When you move your cursor, the highlights will be cleared (the second autocommand).
+        local client = vim.lsp.get_client_by_id(event.data.client_id)
+        if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_documentHighlight) then
+          local highlight_augroup = vim.api.nvim_create_augroup('kickstart-lsp-highlight', { clear = false })
+          vim.api.nvim_create_autocmd({ 'CursorHold', 'CursorHoldI' }, {
+            buffer = event.buf,
+            group = highlight_augroup,
+            callback = vim.lsp.buf.document_highlight,
           })
-      end,
+
-      ["svelte"] = function()
+          vim.api.nvim_create_autocmd({ 'CursorMoved', 'CursorMovedI' }, {
-        -- configure svelte server
+            buffer = event.buf,
-        lspconfig["svelte"].setup({
+            group = highlight_augroup,
-          capabilities = capabilities,
+            callback = vim.lsp.buf.clear_references,
-          on_attach = function(client, bufnr)
+          })
-            vim.api.nvim_create_autocmd("BufWritePost", {
+
-              pattern = { "*.js", "*.ts" },
+          vim.api.nvim_create_autocmd('LspDetach', {
-              callback = function(ctx)
+            group = vim.api.nvim_create_augroup('kickstart-lsp-detach', { clear = true }),
-                -- Here use ctx.match instead of ctx.file
+            callback = function(event2)
-                client.notify("$/onDidChangeTsOrJsFile", { uri = ctx.match })
+              vim.lsp.buf.clear_references()
+              vim.api.nvim_clear_autocmds { group = 'kickstart-lsp-highlight', buffer = event2.buf }
             end,
           })
+        end
+
+        -- The following code creates a keymap to toggle inlay hints in your
+        -- code, if the language server you are using supports them
+        --
+        -- This may be unwanted, since they displace some of your code
+        if client and client.supports_method(vim.lsp.protocol.Methods.textDocument_inlayHint) then
+          map('<leader>th', function()
+            vim.lsp.inlay_hint.enable(not vim.lsp.inlay_hint.is_enabled { bufnr = event.buf })
+          end, '[T]oggle Inlay [H]ints')
+        end
       end,
     })
-      end,
+
-      ["graphql"] = function()
+    -- LSP servers and clients are able to communicate to each other what features they support.
-        -- configure graphql language server
+    --  By default, Neovim doesn't support everything that is in the LSP specification.
-        lspconfig["graphql"].setup({
+    --  When you add nvim-cmp, luasnip, etc. Neovim now has *more* capabilities.
-          capabilities = capabilities,
+    --  So, we create new capabilities with nvim cmp, and then broadcast that to the servers.
-          filetypes = { "graphql", "gql", "svelte", "typescriptreact", "javascriptreact" },
+    local capabilities = vim.lsp.protocol.make_client_capabilities()
-        })
+    capabilities = vim.tbl_deep_extend('force', capabilities, require('cmp_nvim_lsp').default_capabilities())
-      end,
+
-      ["emmet_ls"] = function()
+    -- Enable the following language servers
-        -- configure emmet language server
+    --  Feel free to add/remove any LSPs that you want here. They will automatically be installed.
-        lspconfig["emmet_ls"].setup({
+    --
-          capabilities = capabilities,
+    --  Add any additional override configuration in the following tables. Available keys are:
-          filetypes = { "html", "typescriptreact", "javascriptreact", "css", "sass", "scss", "less", "svelte" },
+    --  - cmd (table): Override the default command used to start the server
-        })
+    --  - filetypes (table): Override the default list of associated filetypes for the server
-      end,
+    --  - capabilities (table): Override fields in capabilities. Can be used to disable certain LSP features.
-      ["lua_ls"] = function()
+    --  - settings (table): Override the default settings passed when initializing the server.
-        -- configure lua server (with special settings)
+    --        For example, to see the options for `lua_ls`, you could go to: https://luals.github.io/wiki/settings/
-        lspconfig["lua_ls"].setup({
+    local servers = {
-          capabilities = capabilities,
+      -- clangd = {},
+      -- gopls = {},
+      -- pyright = {},
+      -- rust_analyzer = {},
+      -- ... etc. See `:help lspconfig-all` for a list of all the pre-configured LSPs
+      --
+      -- Some languages (like typescript) have entire language plugins that can be useful:
+      --    https://github.com/pmizio/typescript-tools.nvim
+      --
+      -- But for many setups, the LSP (`ts_ls`) will work just fine
+      ts_ls = {},
+      --
+      html = { filetypes = { 'html', 'twig', 'hbs' } },
+      cssls = {},
+      tailwindcss = {},
+      dockerls = {},
+      sqlls = {},
+      jsonls = {},
+      yamlls = {},
+
+      lua_ls = {
+        -- cmd = {...},
+        -- filetypes = { ...},
+        -- capabilities = {},
         settings = {
           Lua = {
-              -- make the language server recognize "vim" global
-              diagnostics = {
-                globals = { "vim" },
-              },
             completion = {
-                callSnippet = "Replace",
+              callSnippet = 'Replace',
+            },
+            -- You can toggle below to ignore Lua_LS's noisy `missing-fields` warnings
+            -- diagnostics = { disable = { 'missing-fields' } },
           },
         },
       },
+    }
+
+    -- Ensure the servers and tools above are installed
+    --  To check the current status of installed tools and/or manually install
+    --  other tools, you can run
+    --    :Mason
+    --
+    --  You can press `g?` for help in this menu.
+    require('mason').setup()
+
+    -- You can add other tools here that you want Mason to install
+    -- for you, so that they are available from within Neovim.
+    local ensure_installed = vim.tbl_keys(servers or {})
+    vim.list_extend(ensure_installed, {
+      'stylua', -- Used to format Lua code
     })
+    require('mason-tool-installer').setup { ensure_installed = ensure_installed }
+
+    require('mason-lspconfig').setup {
+      handlers = {
+        function(server_name)
+          local server = servers[server_name] or {}
+          -- This handles overriding only values explicitly passed
+          -- by the server configuration above. Useful when disabling
+          -- certain features of an LSP (for example, turning off formatting for ts_ls)
+          server.capabilities = vim.tbl_deep_extend('force', {}, capabilities, server.capabilities or {})
+          require('lspconfig')[server_name].setup(server)
         end,
-    })
+      },
+    }
   end,
 }

lua/custom/plugins/treesitter.lua

@@ -1,16 +1,21 @@
-return {{
+return {
-  "nvim-treesitter/nvim-treesitter",
+  {
-  event = { "BufReadPre", "BufNewFile" },
+    'nvim-treesitter/nvim-treesitter',
-  build = ":TSUpdate",
+    event = { 'BufReadPre', 'BufNewFile' },
+    build = ':TSUpdate',
     dependencies = {
-    "windwp/nvim-ts-autotag",
+      'windwp/nvim-ts-autotag',
     },
     config = function()
       -- import nvim-treesitter plugin
-    local treesitter = require("nvim-treesitter.configs")
+      local treesitter = require 'nvim-treesitter.configs'
 
       -- configure treesitter
-    treesitter.setup({ -- enable syntax highlighting
+      treesitter.setup { -- enable syntax highlighting
+        modules = {},
+        ignore_install = {},
+        sync_install = false,
+        auto_install = true,
         highlight = {
           enable = true,
         },
@@ -22,46 +27,35 @@ return {{
         },
         -- ensure these language parsers are installed
         ensure_installed = {
-        "json",
+          'json',
-        "javascript",
+          'javascript',
-        "typescript",
+          'typescript',
-        "tsx",
+          'tsx',
-        "yaml",
+          'yaml',
-        "html",
+          'html',
-        "css",
+          'css',
-        "prisma",
+          'prisma',
-        "markdown",
+          'markdown',
-        "markdown_inline",
+          'markdown_inline',
-        "graphql",
+          'graphql',
-        "bash",
+          'bash',
-        "lua",
+          'lua',
-        "vim",
+          'vim',
-        "dockerfile",
+          'dockerfile',
-        "gitignore",
+          'gitignore',
-        "query",
+          'query',
-        "vimdoc",
+          'vimdoc',
-        "c",
+          'c',
         },
         incremental_selection = {
           enable = true,
           keymaps = {
-          init_selection = "<C-space>",
+            init_selection = '<C-space>',
-          node_incremental = "<C-space>",
+            node_incremental = '<C-space>',
             scope_incremental = false,
-          node_decremental = "<bs>",
+            node_decremental = '<bs>',
           },
         },
-    })
-  end,
-},
-{
-  "nvim-treesitter/nvim-treesitter-textobjects",
-  lazy = true,
-  dependencies = {
-    "nvim-treesitter/nvim-treesitter",
-  },
-  config = function()
-    require("nvim-treesitter.configs").setup({
         textobjects = {
           select = {
             enable = true,
@@ -71,14 +65,14 @@ return {{
 
             keymaps = {
               -- You can use the capture groups defined in textobjects.scm
-            ["af"] = "@function.outer",
+              ['af'] = '@function.outer',
-            ["if"] = "@function.inner",
+              ['if'] = '@function.inner',
-            ["ac"] = "@class.outer",
+              ['ac'] = '@class.outer',
               -- You can optionally set descriptions to the mappings (used in the desc parameter of
               -- nvim_buf_set_keymap) which plugins like which-key display
-            ["ic"] = { query = "@class.inner", desc = "Select inner part of a class region" },
+              ['ic'] = { query = '@class.inner', desc = 'Select inner part of a class region' },
               -- You can also use captures from other query groups like `locals.scm`
-            ["as"] = { query = "@scope", query_group = "locals", desc = "Select language scope" },
+              ['as'] = { query = '@scope', query_group = 'locals', desc = 'Select language scope' },
             },
             selection_modes = {
               ['@parameter.outer'] = 'v', -- charwise
@@ -88,7 +82,11 @@ return {{
             include_surrounding_whitespace = true,
           },
         },
-    })
+      }
     end,
-}
+  },
+  {
+    'nvim-treesitter/nvim-treesitter-textobjects',
+    build = ':TSUpdate',
+  },
 }

lua/myconfigs.lua

@@ -44,6 +44,9 @@ vim.keymap.set('n', '<leader>w', '<cmd>:w<CR>', { noremap = true, desc = 'Save f
 vim.keymap.set('i', '<C-k>', vim.lsp.buf.signature_help, { noremap = true, desc = 'Signature Help' })
 vim.keymap.set('n', '<leader>ff', vim.lsp.buf.format, { noremap = true, desc = 'LSP format' })
 
+vim.api.nvim_set_keymap('n', '<leader>yr', ":let @+=expand('%:.%:t')<CR>", { noremap = true, silent = true, desc = 'Copy Relative Path' })
+vim.api.nvim_set_keymap('n', '<leader>ya', ":let @+=expand('%:P%:t')<CR>", { noremap = true, silent = true, desc = 'Copy Absolute Path' })
+
 vim.g.diagnostics_active = false
 function _G.toggle_diagnostics()
   if vim.g.diagnostics_active then