NERD FONT

2024-05-21 15:52:06 +05:30
parent 3eb552602c
commit c52c3790dd
49 changed files with 135 additions and 162 deletions
--- a/nvim/init.lua
+++ b/nvim/init.lua
@@ -26,29 +26,30 @@ I hope you enjoy your Neovim journey,

 vim.g.mapleader = " "
 vim.g.maplocalleader = " "
+
 -- netrw settings
 vim.g.netrw_banner = 0
 vim.g.netrw_browse_split = 0
 vim.g.netrw_winsize = 25
 vim.g.have_nerd_font = true

-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
+local lazypath = vim.fn.stdpath "data" .. "/lazy/lazy.nvim"
 if not (vim.uv or vim.loop).fs_stat(lazypath) then
-  vim.fn.system({
-    "git",
-    "clone",
-    "--filter=blob:none",
-    "https://github.com/folke/lazy.nvim.git",
-    "--branch=stable", -- latest stable release
-    lazypath,
-  })
+    vim.fn.system {
+        "git",
+        "clone",
+        "--filter=blob:none",
+        "https://github.com/folke/lazy.nvim.git",
+        "--branch=stable", -- latest stable release
+        lazypath,
+    }
 end
 vim.opt.rtp:prepend(lazypath)

 require("lazy").setup({ import = "lilJ/plugins" }, {
-  change_detection = {
-    notify = false
-  }
+    change_detection = {
+        notify = false,
+    },
 })

 -- The line beneath this is called `modeline`. See `:help modeline`
--- a/nvim/lazy-lock.json
+++ b/nvim/lazy-lock.json
@@ -1,42 +1,43 @@
 {
  "Comment.nvim": { "branch": "master", "commit": "0236521ea582747b58869cb72f70ccfa967d2e89" },
-  "LuaSnip": { "branch": "master", "commit": "b152822e1a4bafb6bdf11a16cc26525cbd95ee00" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "8706b99e1253f54f640fbc4f4ae13cdf034c135a" },
+  "LuaSnip": { "branch": "master", "commit": "de1a287c9cb525ae52bc846e8f6207e5ef1da5ac" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "de73a884679a2461c53f96035894ef073a5a7f4f" },
  "catpuccin": { "branch": "main", "commit": "d97387aea8264f484bb5d5e74f2182a06c83e0d8" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "5af77f54de1b16c34b23cba810150689a3a90312" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "conform.nvim": { "branch": "master", "commit": "59d0dd233a2cafacfa1235ab22054c4d80a72319" },
-  "fidget.nvim": { "branch": "main", "commit": "1ba38e4cbb24683973e00c2e36f53ae64da38ef5" },
-  "friendly-snippets": { "branch": "main", "commit": "3e9a3f5a0cfcef1741e352c37bda4e82e5eb846a" },
+  "conform.nvim": { "branch": "master", "commit": "00f9d91391b04b1935e2f15948bd96cc111e7d3a" },
+  "fidget.nvim": { "branch": "main", "commit": "ef99df04a1c53a453602421bc0f756997edc8289" },
+  "friendly-snippets": { "branch": "main", "commit": "dd2fd1281d4b22e7b4a5bfafa3e142d958e251f2" },
  "gitsigns.nvim": { "branch": "main", "commit": "805610a9393fa231f2c2b49cb521bfa413fadb3d" },
-  "indent-blankline.nvim": { "branch": "master", "commit": "3d08501caef2329aba5121b753e903904088f7e6" },
-  "lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
+  "indent-blankline.nvim": { "branch": "master", "commit": "ece00d5fb44d196680a81fd2761062d2fa44663b" },
+  "lazy.nvim": { "branch": "main", "commit": "0de782a6b0ffba599dbd332a4019d852564bf28c" },
  "lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "9ae570e206360e47d30b4c35a4550c165f4ea7b7" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "a4caa0d083aab56f6cd5acf2d42331b74614a585" },
  "mason-nvim-dap.nvim": { "branch": "main", "commit": "67210c0e775adec55de9826b038e8b62de554afc" },
  "mason-tool-installer.nvim": { "branch": "main", "commit": "c1fbdcb0d8d1295314f1612c4a247253e70299d9" },
-  "mason.nvim": { "branch": "main", "commit": "1b3d60405d1d720b2c4927f19672e9479703b00f" },
-  "mini.nvim": { "branch": "main", "commit": "c333187fcc76d7e772dac32c2a440a949fe34be4" },
+  "mason.nvim": { "branch": "main", "commit": "49ff59aded1047a773670651cfa40e76e63c6377" },
+  "mini.nvim": { "branch": "main", "commit": "eb2dd6d187e1ab5fefec66f0d37b1a3dc8633d17" },
  "neodev.nvim": { "branch": "main", "commit": "ce9a2e8eaba5649b553529c5498acb43a6c317cd" },
-  "nvim-cmp": { "branch": "main", "commit": "24122371810089d390847d8ba66325c1f1aa64c0" },
-  "nvim-dap": { "branch": "master", "commit": "615a1b2046e1eaf7995e0ba8e8a65f344201349d" },
+  "nvim-cmp": { "branch": "main", "commit": "5260e5e8ecadaf13e6b82cf867a909f54e15fd07" },
+  "nvim-dap": { "branch": "master", "commit": "5a2f7121869394502521c52b2bc581ab22c69447" },
  "nvim-dap-go": { "branch": "main", "commit": "5faf165f5062187320eaf9d177c3c1f647adc22e" },
-  "nvim-dap-ui": { "branch": "master", "commit": "5934302d63d1ede12c0b22b6f23518bb183fc972" },
-  "nvim-lint": { "branch": "master", "commit": "f3bcc28ffccb768212247294acccc106e029fc3c" },
-  "nvim-lspconfig": { "branch": "master", "commit": "94513a5b246cf32a8f87ca714af50911df63351c" },
+  "nvim-dap-ui": { "branch": "master", "commit": "71bfe9bd6b3465e169b53bea4f83775034d822dd" },
+  "nvim-dap-virtual-text": { "branch": "master", "commit": "3e8e207513e6ef520894950acd76b79902714103" },
+  "nvim-lint": { "branch": "master", "commit": "1f98d6c863f91706369d74aeb2eb3f02b2e96861" },
+  "nvim-lspconfig": { "branch": "master", "commit": "9bda20fb967075355f253911bc066a8b5a03c77e" },
  "nvim-nio": { "branch": "master", "commit": "8765cbc4d0c629c8158a5341e1b4305fd93c3a90" },
  "nvim-tmux-navigation": { "branch": "main", "commit": "4898c98702954439233fdaf764c39636681e2861" },
-  "nvim-treesitter": { "branch": "master", "commit": "cd626dc48e42b2677d501a740622cf4aed43863f" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "dfa4178c0cadb44f687603d72ad0908474c28dd9" },
+  "nvim-treesitter": { "branch": "master", "commit": "7c9c5bed8340031f8a6dad47a58a26eaf15b9a56" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "5f9bf4b1ead7707e4e74e5319ee56bdc81fb73db" },
  "nvim-web-devicons": { "branch": "master", "commit": "e37bb1feee9e7320c76050a55443fa843b4b6f83" },
-  "plenary.nvim": { "branch": "master", "commit": "08e301982b9a057110ede7a735dd1b5285eb341f" },
+  "plenary.nvim": { "branch": "master", "commit": "b5c8de02a44ffeabff678090edd6a132ff8ab77d" },
  "telescope-fzf-native.nvim": { "branch": "main", "commit": "9ef21b2e6bb6ebeaf349a0781745549bbb870d27" },
  "telescope-ui-select.nvim": { "branch": "master", "commit": "6e51d7da30bd139a6950adf2a47fda6df9fa06d2" },
-  "telescope.nvim": { "branch": "0.1.x", "commit": "6312868392331c9c0f22725041f1ec2bef57c751" },
+  "telescope.nvim": { "branch": "0.1.x", "commit": "d829aa64059001ee7b2c8c8aa9c4e6df0b17d893" },
  "todo-comments.nvim": { "branch": "main", "commit": "a7e39ae9e74f2c8c6dc4eea6d40c3971ae84752d" },
  "vim-dadbod": { "branch": "master", "commit": "37523ffe0849b51db07fa7f48430c2aca5420a0e" },
-  "vim-dadbod-completion": { "branch": "master", "commit": "c920cb0ba3dff4b1b0ed373e1c0b3007dec696c2" },
-  "vim-dadbod-ui": { "branch": "master", "commit": "b1675d1f56c12b0abac2ef74b94670fe27adcf93" }
+  "vim-dadbod-completion": { "branch": "master", "commit": "5d5ad196fcde223509d7dabbade0148f7884c5e3" },
+  "vim-dadbod-ui": { "branch": "master", "commit": "49dabb8717a43d757faaa0ceaadc8ee060709422" }
 }
--- a/nvim/lua/lilJ/completions.lua
+++ b/nvim/lua/lilJ/completions.lua
@@ -4,17 +4,36 @@ luasnip.config.setup {
    updateevents = "TextChanged,TextChangedI",
 }

+require("luasnip.loaders.from_vscode").lazy_load()
+
 local lspkind = require "lspkind"
 lspkind.init {}

 local cmp = require "cmp"
 cmp.setup {
+    window = {
+        documentation = {
+            border = "rounded",
+        },
+        completion = {
+            border = "rounded",
+        },
+    },
    sources = {
        { name = "nvim_lsp" },
        { name = "path" },
        { name = "buffer" },
    },
-    completion = { completeopt = "menu, menuone, noinsert, noselect" },
+    completion = {
+        completeopt = "menu, menuone, noinsert, noselect",
+    },
+    formatting = {
+        fields = { "kind", "abbr", "menu" },
+        expandable_indicator = true,
+        format = lspkind.cmp_format {
+            mode = "symbol",
+        },
+    },

    -- No, but seriously. Please read `:help ins-completion`, it is really good!
    mapping = cmp.mapping.preset.insert {
--- a/nvim/lua/lilJ/plugins/conform.lua
+++ b/nvim/lua/lilJ/plugins/conform.lua
@@ -1,18 +1,22 @@
 return {
-	"stevearc/conform.nvim",
-	opts = {
-		notify_on_error = false,
-		format_on_save = function(bufnr)
-		local disable_filetypes = {}
-			return {
-				timeout_ms = 500,
-				lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
-			}
-		end,
-		formatters_by_ft = {
-			c = { "clang-format" },
-			go = { "gofumpt", "goimports_reviser" },
-		    lua = { "stylua" },
-		},
-	},
+    "stevearc/conform.nvim",
+    opts = {
+        notify_on_error = false,
+        format_on_save = function(bufnr)
+            local disable_filetypes = {}
+            return {
+                timeout_ms = 500,
+                lsp_fallback = not disable_filetypes[vim.bo[bufnr].filetype],
+            }
+        end,
+        formatters_by_ft = {
+            c = { "clang-format" },
+            css = { "prettier" },
+            go = { "gofumpt", "goimports_reviser" },
+            html = { "prettier" },
+            lua = { "stylua" },
+            typescript = { "prettier" },
+            typescriptreact = { "prettier" },
+        },
+    },
 }
--- a/nvim/lua/lilJ/plugins/debug.lua
+++ b/nvim/lua/lilJ/plugins/debug.lua
@@ -11,6 +11,7 @@ return {
    dependencies = {
        "rcarriga/nvim-dap-ui",
        "nvim-neotest/nvim-nio",
+        "theHamsta/nvim-dap-virtual-text",
        "williamboman/mason.nvim",
        "jay-babu/mason-nvim-dap.nvim",

@@ -19,7 +20,27 @@ return {
    },
    config = function()
        local dap = require "dap"
-        local dapui = require "dapui"
+        local ui = require "dapui"
+
+        require("dapui").setup()
+        require("dap-go").setup()
+
+        require("nvim-dap-virtual-text").setup {
+            -- This just tries to mitigate the chance that I leak tokens here. Probably won't stop it from happening...
+            display_callback = function(variable)
+                local name = string.lower(variable.name)
+                local value = string.lower(variable.value)
+                if name:match "secret" or name:match "api" or value:match "secret" or value:match "api" then
+                    return "*****"
+                end
+
+                if #variable.value > 15 then
+                    return " " .. string.sub(variable.value, 1, 15) .. "... "
+                end
+
+                return " " .. variable.value
+            end,
+        }

        require("mason-nvim-dap").setup {
            automatic_setup = true,
@@ -33,105 +54,25 @@ return {
        }

        -- Basic debugging keymaps, feel free to change to your liking!
-        vim.keymap.set("n", "<F5>", dap.continue, { desc = "Debug: Start/Continue" })
-        vim.keymap.set("n", "<F1>", dap.step_into, { desc = "Debug: Step Into" })
-        vim.keymap.set("n", "<F2>", dap.step_over, { desc = "Debug: Step Over" })
-        vim.keymap.set("n", "<F3>", dap.step_out, { desc = "Debug: Step Out" })
-        vim.keymap.set("n", "<leader>b", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })
-        vim.keymap.set("n", "<leader>B", function()
-            dap.set_breakpoint(vim.fn.input "Breakpoint condition: ")
-        end, { desc = "Debug: Set Breakpoint" })
+        vim.keymap.set("n", "<leader>dc", dap.continue, { desc = "Debug: Start/Continue" })
+        vim.keymap.set("n", "<F8>", dap.step_into, { desc = "Debug: Step Into" })
+        vim.keymap.set("n", "<F9>", dap.step_over, { desc = "Debug: Step Over" })
+        vim.keymap.set("n", "<F10>", dap.step_out, { desc = "Debug: Step Out" })

-        -- Dap UI setup
-        -- For more information, see |:help nvim-dap-ui|
-        dapui.setup {
-            controls = {
-                element = "repl",
-                enabled = true,
-                icons = {
-                    pause = "⏸",
-                    play = "▶",
-                    step_into = "⏎",
-                    step_over = "⏭",
-                    step_out = "⏮",
-                    step_back = "b",
-                    run_last = "▶▶",
-                    terminate = "⏹",
-                    disconnect = "⏏",
-                },
-            },
-            element_mappings = {},
-            expand_lines = true,
-            floating = {
-                border = "single",
-                mappings = {
-                    close = { "q", "<Esc>" },
-                },
-            },
-            icons = {
-                expanded = "▾",
-                collapsed = "▸",
-                current_frame = "*",
-            },
-            force_buffers = true,
-            layouts = {
-                {
-                    elements = {
-                        {
-                            id = "scopes",
-                            size = 0.25,
-                        },
-                        {
-                            id = "breakpoints",
-                            size = 0.25,
-                        },
-                        {
-                            id = "stacks",
-                            size = 0.25,
-                        },
-                        {
-                            id = "watches",
-                            size = 0.25,
-                        },
-                    },
-                    position = "left",
-                    size = 40,
-                },
-                {
-                    elements = {
-                        {
-                            id = "repl",
-                            size = 0.5,
-                        },
-                        {
-                            id = "console",
-                            size = 0.5,
-                        },
-                    },
-                    position = "bottom",
-                    size = 10,
-                },
-            },
-            mappings = {
-                edit = "e",
-                expand = { "<CR>", "<2-LeftMouse>" },
-                open = "o",
-                remove = "d",
-                repl = "r",
-                toggle = "t",
-            },
-            render = {
-                indent = 1,
-                max_value_lines = 100,
-            },
-        }
+        vim.keymap.set("n", "<leader>dt", dap.toggle_breakpoint, { desc = "Debug: Toggle Breakpoint" })

-        -- Toggle to see last session result. Without this, you can't see session output in case of unhandled exception.
-        vim.keymap.set("n", "<F7>", dapui.toggle, { desc = "Debug: See last session result." })
-
-        dap.listeners.after.event_initialized["dapui_config"] = dapui.open
-        dap.listeners.before.event_terminated["dapui_config"] = dapui.close
-        dap.listeners.before.event_exited["dapui_config"] = dapui.close
+        dap.listeners.before.attach.dapui_config = function()
+            ui.open()
+        end
+        dap.listeners.before.launch.dapui_config = function()
+            ui.open()
+        end
+        dap.listeners.before.event_terminated.dapui_config = function()
+            ui.close()
+        end
+        dap.listeners.before.event_exited.dapui_config = function()
+            ui.close()
+        end

        require("dap-go").setup()
    end,
--- a/nvim/lua/lilJ/plugins/gitsigns.lua
+++ b/nvim/lua/lilJ/plugins/gitsigns.lua
@@ -1,5 +1,6 @@
 return {
    "lewis6991/gitsigns.nvim",
+    event = { "BufReadPre", "BufNewFile" },
    opts = {
        signs = {
            add = { text = "+" },
@@ -7,6 +8,7 @@ return {
            delete = { text = "_" },
            topdelete = { text = "‾" },
            changedelete = { text = "~" },
+            untracked = { text = "┆" },
        },
    },
 }
--- a/nvim/lua/lilJ/plugins/lsp.lua
+++ b/nvim/lua/lilJ/plugins/lsp.lua
@@ -76,6 +76,12 @@ return {
            },
        }

+        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
+
        vim.api.nvim_create_autocmd("LspAttach", {
            group = vim.api.nvim_create_augroup("kickstart-lsp-attach", { clear = true }),
            callback = function(event)
--- a/nvim/lua/lilJ/plugins/treesitter.lua
+++ b/nvim/lua/lilJ/plugins/treesitter.lua
@@ -5,7 +5,7 @@ return {
        "nvim-treesitter/nvim-treesitter-textobjects",
    },
    opts = {
-        ensure_installed = { "c", "go", "html", "javascript", "lua", "python" },
+        ensure_installed = { "c", "go", "html", "lua", "python", "typescript", "tsx" },
        auto_install = true,
        highlight = {
            enable = true,