Add new config

2024-12-29 11:20:41 -06:00
parent f5274dee16
commit c1fb781f6e
15 changed files with 671 additions and 175 deletions
--- a/configs/dotfiles/nvim/lazy-lock.json
+++ b/configs/dotfiles/nvim/lazy-lock.json
@ -1,36 +1,40 @@
 {
-  "LuaSnip": { "branch": "master", "commit": "ce0a05ab4e2839e1c48d072c5236cce846a387bc" },
-  "barbar.nvim": { "branch": "master", "commit": "79f7d16578a167bdf5355725551ef7d90613a601" },
+  "LuaSnip": { "branch": "master", "commit": "33b06d72d220aa56a7ce80a0dd6f06c70cd82b9d" },
+  "barbar.nvim": { "branch": "master", "commit": "53b5a2f34b68875898f0531032fbf090e3952ad7" },
  "cloak.nvim": { "branch": "main", "commit": "648aca6d33ec011dc3166e7af3b38820d01a71e4" },
  "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
-  "cmp-nvim-lsp": { "branch": "main", "commit": "39e2eda76828d88b773cc27a3f61d2ad782c922d" },
+  "cmp-nvim-lsp": { "branch": "main", "commit": "99290b3ec1322070bcfb9e846450a46f6efa50f0" },
  "cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
  "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
-  "cmp_luasnip": { "branch": "master", "commit": "05a9ab28b53f71d1aece421ef32fee2cb857a843" },
-  "friendly-snippets": { "branch": "main", "commit": "00ebcaa159e817150bd83bfe2d51fa3b3377d5c4" },
-  "gitsigns.nvim": { "branch": "main", "commit": "f4928ba14eb6c667786ac7d69927f6aee6719f1e" },
-  "image.nvim": { "branch": "master", "commit": "61c76515cfc3cdac8123ece9e9761b20c3dc1315" },
-  "lazy.nvim": { "branch": "main", "commit": "9a374a0fb4d3ac42dac4a129d4bead7252473c77" },
-  "lsp-zero.nvim": { "branch": "v3.x", "commit": "87701af045b3032515776abeb47eb8c2ddb5e679" },
-  "lualine.nvim": { "branch": "master", "commit": "544dd1583f9bb27b393f598475c89809c4d5e86b" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "58bc9119ca273c0ce5a66fad1927ef0f617bd81b" },
+  "cmp_luasnip": { "branch": "master", "commit": "98d9cb5c2c38532bd9bdb481067b20fea8f32e90" },
+  "friendly-snippets": { "branch": "main", "commit": "efff286dd74c22f731cdec26a70b46e5b203c619" },
+  "gitsigns.nvim": { "branch": "main", "commit": "5f808b5e4fef30bd8aca1b803b4e555da07fc412" },
+  "image.nvim": { "branch": "master", "commit": "b991fc7f845bc6ab40c6ec00b39750dcd5190010" },
+  "lazy.nvim": { "branch": "main", "commit": "7e6c863bc7563efbdd757a310d17ebc95166cef3" },
+  "leetcode.nvim": { "branch": "master", "commit": "db7e1cd6b9191b34b4c1f2f96e4e3949cde9f951" },
+  "lsp-zero.nvim": { "branch": "v3.x", "commit": "ab2a3413646fedd77aa0eab4214a6473e62f6a64" },
+  "lualine.nvim": { "branch": "master", "commit": "2a5bae925481f999263d6f5ed8361baef8df4f83" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "c6c686781f9841d855bf1b926e10aa5e19430a38" },
  "mason.nvim": { "branch": "main", "commit": "e2f7f9044ec30067bc11800a9e266664b88cda22" },
-  "neo-tree.nvim": { "branch": "v3.x", "commit": "29f7c215332ba95e470811c380ddbce2cebe2af4" },
-  "nerdcommenter": { "branch": "master", "commit": "7bb1f72e802a80e37bdda5f6906c69b5a93de1eb" },
-  "nui.nvim": { "branch": "main", "commit": "61574ce6e60c815b0a0c4b5655b8486ba58089a1" },
-  "nvim-cmp": { "branch": "main", "commit": "d818fd0624205b34e14888358037fb6f5dc51234" },
-  "nvim-lspconfig": { "branch": "master", "commit": "e26da408cf955afa8e9ddbadd510e84ea8976cd7" },
-  "nvim-treesitter": { "branch": "master", "commit": "667b9dbbfa2d0071c5677c429ddcf89fb931b53f" },
-  "nvim-treesitter-context": { "branch": "master", "commit": "2aba92ceb1479485953007f4d5adf34d0b66917e" },
-  "nvim-web-devicons": { "branch": "master", "commit": "e612de3d3a41a6b7be47f51e956dddabcbf419d9" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "a77af2e764c5ed4038d27d1c463fa49cd4794e07" },
+  "nerdcommenter": { "branch": "master", "commit": "66c07e4083ab02ed2540ac289cc602c70b858c13" },
+  "nui.nvim": { "branch": "main", "commit": "53e907ffe5eedebdca1cd503b00aa8692068ca46" },
+  "nvim-autopairs": { "branch": "master", "commit": "b464658e9b880f463b9f7e6ccddd93fb0013f559" },
+  "nvim-cmp": { "branch": "main", "commit": "b555203ce4bd7ff6192e759af3362f9d217e8c89" },
+  "nvim-lspconfig": { "branch": "master", "commit": "ff2b85abaa810f6611233dbe6d31c07510ebf43d" },
+  "nvim-notify": { "branch": "master", "commit": "fbef5d32be8466dd76544a257d3f3dce20082a07" },
+  "nvim-treesitter": { "branch": "master", "commit": "17678b00fa5c2712890a0ec2e269d0a4de1207df" },
+  "nvim-treesitter-context": { "branch": "master", "commit": "2bcf700b59bc92850ca83a1c02e86ba832e0fae0" },
+  "nvim-ts-autotag": { "branch": "main", "commit": "1cca23c9da708047922d3895a71032bc0449c52d" },
+  "nvim-web-devicons": { "branch": "master", "commit": "63f552a7f59badc6e6b6d22e603150f0d5abebb7" },
  "nvim-window-picker": { "branch": "main", "commit": "41cfaa428577c53552200a404ae9b3a0b5719706" },
  "playground": { "branch": "master", "commit": "ba48c6a62a280eefb7c85725b0915e021a1a0749" },
-  "plenary.nvim": { "branch": "master", "commit": "a3e3bc82a3f95c5ed0d7201546d5d2c19b20d683" },
-  "refactoring.nvim": { "branch": "master", "commit": "8ef9cfb8199bed4be4d609cc4b5dbfb5416b3ca6" },
-  "supermaven-nvim": { "branch": "main", "commit": "d71257f431e190d9236d7f30da4c2d659389e91f" },
+  "plenary.nvim": { "branch": "master", "commit": "2d9b06177a975543726ce5c73fca176cedbffe9d" },
+  "refactoring.nvim": { "branch": "master", "commit": "2db6d378e873de31d18ade549c2edba64ff1c2e3" },
+  "supermaven-nvim": { "branch": "main", "commit": "07d20fce48a5629686aefb0a7cd4b25e33947d50" },
  "telescope.nvim": { "branch": "master", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
-  "tokyonight.nvim": { "branch": "main", "commit": "1471dab694ad88351185758bb4275624d8b798ec" },
-  "trouble.nvim": { "branch": "main", "commit": "ad8ef38666834e9e438f84bd446657445bc2a71e" },
-  "undotree": { "branch": "master", "commit": "56c684a805fe948936cda0d1b19505b84ad7e065" },
-  "vim-fugitive": { "branch": "master", "commit": "0444df68cd1cdabc7453d6bd84099458327e5513" }
+  "tokyonight.nvim": { "branch": "main", "commit": "45d22cf0e1b93476d3b6d362d720412b3d34465c" },
+  "trouble.nvim": { "branch": "main", "commit": "46cf952fc115f4c2b98d4e208ed1e2dce08c9bf6" },
+  "undotree": { "branch": "master", "commit": "78b5241191852ffa9bb5da5ff2ee033160798c3b" },
+  "vim-fugitive": { "branch": "master", "commit": "fcb4db52e7f65b95705aa58f0f2df1312c1f2df2" }
 }
--- a/configs/dotfiles/nvim/lua/gib_nvim/init.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/init.lua
@ -4,7 +4,6 @@ require("gib_nvim.set")
 require("gib_nvim.colors")
 require("gib_nvim.cloak")
 require("gib_nvim.fugitive")
--require("gib_nvim.harpoon")
 require("gib_nvim.lsp")
 require("gib_nvim.lualine")
 require("gib_nvim.neotree")
--- a/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/lazy.lua
@ -12,122 +12,194 @@ end
 vim.opt.rtp:prepend(lazypath)

 require("lazy").setup({
-    {
-        'nvim-telescope/telescope.nvim', tag = '0.1.5',
-        dependencies = { 'nvim-lua/plenary.nvim' }
-    },
-    {
-        'folke/tokyonight.nvim',
-        priority = 1000,
-    },
-    {
-        'folke/trouble.nvim', dependencies =
-        { 'nvim-tree/nvim-web-devicons' }
-    },
-    {
-        'nvim-treesitter/nvim-treesitter',
-        build = ':TSUpdate'
-    },
-    {
-        'nvim-treesitter/playground'
-    },
-    {
-        'nvim-treesitter/nvim-treesitter-context'
-    },
-    --{
-        --'theprimeagen/harpoon'
-    --},
-    {
-      "ThePrimeagen/refactoring.nvim",
-      dependencies = {
-        "nvim-lua/plenary.nvim",
-        "nvim-treesitter/nvim-treesitter",
-      }
-    },
-    {
-        'mbbill/undotree'
-    },
-    {
-        'tpope/vim-fugitive'
-    },
-    {
-        'VonHeikemen/lsp-zero.nvim', branch = 'v3.x'
-    },
-    {'williamboman/mason.nvim'},
-    {'williamboman/mason-lspconfig.nvim'},
-    {'neovim/nvim-lspconfig'},
-    {'hrsh7th/cmp-nvim-lsp'},
-    {'hrsh7th/nvim-cmp'},
-    {'hrsh7th/cmp-path'},
-    {'hrsh7th/cmp-buffer'},
-    {'hrsh7th/cmp-nvim-lua'},
-    {'L3MON4D3/LuaSnip'},
-    {'saadparwaiz1/cmp_luasnip'},
-    {'rafamadriz/friendly-snippets'},
-    {
-        --'github/copilot.vim'
-        'supermaven-inc/supermaven-nvim',
+  {
+    'nvim-telescope/telescope.nvim', tag = '0.1.5',
+    dependencies = { 'nvim-lua/plenary.nvim' }
+  },
+  {
+    'folke/tokyonight.nvim',
+    priority = 1000,
+  },
+  {
+    'folke/trouble.nvim', dependencies =
+    { 'nvim-tree/nvim-web-devicons' }
+  },
+  {
+    'nvim-treesitter/nvim-treesitter',
+    build = ':TSUpdate'
+  },
+  {
+    'nvim-treesitter/playground'
+  },
+  {
+    'nvim-treesitter/nvim-treesitter-context'
+  },
+  {
+    "ThePrimeagen/refactoring.nvim",
+    dependencies = {
+      "nvim-lua/plenary.nvim",
+      "nvim-treesitter/nvim-treesitter",
+    }
+  },
+  {
+    'mbbill/undotree'
+  },
+  {
+    'tpope/vim-fugitive'
+  },
+  {
+    'VonHeikemen/lsp-zero.nvim', branch = 'v3.x'
+  },
+  {'williamboman/mason.nvim'},
+  {'williamboman/mason-lspconfig.nvim'},
+  {'neovim/nvim-lspconfig'},
+  {'hrsh7th/cmp-nvim-lsp'},
+  {'hrsh7th/nvim-cmp'},
+  {'hrsh7th/cmp-path'},
+  {'hrsh7th/cmp-buffer'},
+  {'hrsh7th/cmp-nvim-lua'},
+  {'L3MON4D3/LuaSnip'},
+  {'saadparwaiz1/cmp_luasnip'},
+  {'rafamadriz/friendly-snippets'},
+  {
+    'supermaven-inc/supermaven-nvim',
+    config = function()
+      require('supermaven-nvim').setup({
+        keymaps = {
+          accept_suggestion = '<Tab>',
+          clear_suggestion = '<C-]>',
+          accept_word = '<C-.>',
+        },
+        disable_inline_completion = false, -- for cmp
+      })
+    end,
+  },
+  {
+    'laytan/cloak.nvim'
+  },
+  {
+    'nvim-lualine/lualine.nvim',
+    dependencies = {
+      'nvim-tree/nvim-web-devicons',
+      'folke/tokyonight.nvim',
+    }
+  },
+  {
+    'scrooloose/nerdcommenter'
+  },
+  {
+    'nvim-neo-tree/neo-tree.nvim',
+    branch = 'v3.x',
+    dependencies = {
+      'nvim-lua/plenary.nvim',
+      'nvim-tree/nvim-web-devicons',
+      'MunifTanjim/nui.nvim',
+      '3rd/image.nvim',
+      {
+        's1n7ax/nvim-window-picker',
+        version = '2.*',
        config = function()
-          require('supermaven-nvim').setup({
-            keymaps = {
-              accept_suggestion = '<Tab>',
-              clear_suggestion = '<C-]>',
-              accept_word = '<C-.>',
+          require 'window-picker'.setup({
+            filter_rules = {
+              include_current_win = false,
+              autoselect_one = true,
+              bo = {
+                filetype = { 'neo-tree', "neo-tree-popup", "notify" },
+                buftype = { 'terminal', "quickfix" },
+              },
            },
-            disable_inline_completion = false, -- for cmp
-            condition = function()
-              return true
-            end,
          })
        end,
+      },
    },
-    {
-        'laytan/cloak.nvim'
-    },
-    {
-        'nvim-lualine/lualine.nvim',
-        dependencies = {
-            'nvim-tree/nvim-web-devicons',
-            'folke/tokyonight.nvim',
+    config = function()
+      require('neo-tree').setup({
+        close_if_last_window = true,
+        popup_border_style = "rounded",
+        enable_git_status = true,
+        enable_diagnostics = true,
+        default_component_configs = {
+          container = {
+            enable_character_fade = true
+          },
+          indent = {
+            indent_size = 2,
+            padding = 1,
+          }
        }
+      })
+    end,
+  },
+  {
+    'romgrk/barbar.nvim', dependencies = {
+      'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
+      'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
    },
-    {
-        'scrooloose/nerdcommenter'
+    init = function() vim.g.barbar_auto_setup = false end,
+    opts = {
+      animation = true,
+      insert_at_start = true,
    },
-    {
-        'nvim-neo-tree/neo-tree.nvim', branch = 'v3.x',
-        dependencies = {
-            'nvim-lua/plenary.nvim',
-            'nvim-tree/nvim-web-devicons',
-            'MunifTanjim/nui.nvim',
-            '3rd/image.nvim',
-            {
-                's1n7ax/nvim-window-picker', version = '2.*',
-                config = function()
-                    require 'window-picker'.setup({
-                        filter_rules = {
-                            include_current_win = false,
-                            autoselect_one = true,
-                            bo = {
-                                filetype = { 'neo-tree', "neo-tree-popup", "notify" },
-                                buftype = { 'terminal', "quickfix" },
-                            },
-                        },
-                    })
-                    end,
-            },
+    version = '^1.0.0',
+  },
+  {
+    'windwp/nvim-autopairs',
+    event = "InsertEnter",
+    config = true
+  },
+  {
+    'windwp/nvim-ts-autotag',
+    config = function ()
+      require('nvim-ts-autotag').setup()
+    end
+  },
+  {
+    'kawre/leetcode.nvim',
+    build = ':TSUpdate html',
+    dependencies = {
+      'nvim-telescope/telescope.nvim',
+      'nvim-lua/plenary.nvim',
+      'MunifTanjim/nui.nvim',
+      'nvim-treesitter/nvim-treesitter',
+      'rcarriga/nvim-notify',
+      'nvim-tree/nvim-web-devicons',
+      '3rd/image.nvim',
+    },
+    opts = {
+      arg = "lc",
+      lang = "typescript",
+      image_support = false,
+    },
+  },
+  {
+    "3rd/image.nvim",
+    event = "VeryLazy",
+    dependencies = {
+      "nvim-treesitter/nvim-treesitter",
+    },
+    opts = {
+      backend = "kitty",
+      integrations = {
+        markdown = {
+          enabled = true,
+          clear_in_insert_mode = false,
+          download_remote_images = true,
+          only_render_image_at_cursor = false,
+          filetypes = { "markdown", "vimwiki" }, -- markdown extensions (ie. quarto) can go here
        },
-    },
-    {
-        'romgrk/barbar.nvim', dependencies = {
-          'lewis6991/gitsigns.nvim', -- OPTIONAL: for git status
-          'nvim-tree/nvim-web-devicons', -- OPTIONAL: for file icons
+        neorg = {
+          enabled = true,
+          clear_in_insert_mode = false,
+          download_remote_images = true,
+          only_render_image_at_cursor = false,
+          filetypes = { "norg" },
        },
-        init = function() vim.g.barbar_auto_setup = false end,
-        opts = {
-            animation = true,
-            insert_at_start = true,
-        },
-        version = '^1.0.0',
+      },
+      max_width = nil,
+      max_height = nil,
+      max_width_window_percentage = nil,
+      max_height_window_percentage = 50,
+      kitty_method = "normal",
    },
+  },
 })
--- a/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/lsp.lua
@ -1,6 +1,8 @@
-local lsp_zero = require('lsp-zero')
+local lsp = require('lsp-zero')

-lsp_zero.on_attach(function(client, bufnr)
+lsp.preset('recommended')
+
+lsp.on_attach(function(client, bufnr)
  local opts = {buffer = bufnr, remap = false}

  vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts)
@ -15,35 +17,37 @@ lsp_zero.on_attach(function(client, bufnr)
  vim.keymap.set("i", "<C-h>", function() vim.lsp.buf.signature_help() end, opts)
 end)

-require('mason').setup({})
+require('mason').setup({
+  ui = {
+    icons = {
+      package_installed = "✓",
+      package_pending = "➜",
+      package_uninstalled = "✗"
+    }
+  }
+})
 require('mason-lspconfig').setup({
  ensure_installed = {
  'bashls',
-  'clangd',
-  'cmake',
  'cssls',
  'cssmodules_ls',
  'docker_compose_language_service',
  'dockerls',
  'eslint',
-  'graphql',
  'intelephense',
  'jsonls',
-  'kotlin_language_server',
  'lua_ls',
  'pyright',
  'rust_analyzer',
  'sqlls',
  'svelte',
  'tailwindcss',
-  'tsserver',
  'yamlls',
-  'vimls',
 },
  handlers = {
-    lsp_zero.default_setup,
+    lsp.default_setup,
    lua_ls = function()
-      local lua_opts = lsp_zero.nvim_lua_ls()
+      local lua_opts = lsp.nvim_lua_ls()
      require('lspconfig').lua_ls.setup(lua_opts)
    end,
  }
@ -53,6 +57,11 @@ local cmp = require('cmp')
 local cmp_select = {behavior = cmp.SelectBehavior.Select}

 cmp.setup({
+  snippet = {
+    expand = function(args)
+      require('luasnip').lsp_expand(args.body)
+    end,
+  },
  sources = {
    --{name = 'supermaven'},
    {name = 'path'},
@ -61,7 +70,7 @@ cmp.setup({
    {name = 'luasnip', keyword_length = 2},
    {name = 'buffer', keyword_length = 3},
  },
-  formatting = lsp_zero.cmp_format(),
+  formatting = lsp.cmp_format(),
  mapping = cmp.mapping.preset.insert({
    ['<C-p>'] = cmp.mapping.select_prev_item(cmp_select),
    ['<C-n>'] = cmp.mapping.select_next_item(cmp_select),
@ -70,4 +79,4 @@ cmp.setup({
  }),
 })

-lsp_zero.setup()
+lsp.setup()
--- a/configs/dotfiles/nvim/lua/gib_nvim/remap.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/remap.lua
@ -51,6 +51,9 @@ vim.keymap.set("n", "Q", "<nop>")
 -- Format the current buffer using the language server protocol (LSP)
 vim.keymap.set("n", "<leader>kf", vim.lsp.buf.format)

+-- Toggle Supermaven with :SupermavenToggle
+vim.keymap.set("n", "<leader>sm", ":SupermavenToggle<CR>")
+
 -- Perform a search and replace operation using the word under the cursor
 vim.keymap.set("n", "<leader>sr", [[:%s/\<<C-r><C-w>\>/<C-r><C-w>/gI<Left><Left><Left>]])

--- a/configs/dotfiles/nvim/lua/gib_nvim/set.lua
+++ b/configs/dotfiles/nvim/lua/gib_nvim/set.lua
@ -26,6 +26,6 @@ vim.opt.isfname:append("@-@")

 vim.opt.updatetime = 50

-vim.opt.colorcolumn = "90"
+vim.opt.colorcolumn = "120"
 vim.o.background = "dark" -- or "light" for light mode
 vim.cmd([[colorscheme tokyonight-moon]])