refactor: update nvim & vscode

home/apps/nvim/lazy-lock.json

@@ -1,63 +1,67 @@
 {
-  "LazyVim": { "branch": "main", "commit": "abea2807ce13c994d5697f0ff19d80f85f678b1b" },
+  "LazyVim": { "branch": "main", "commit": "aa1cccf230a01bd85d5173f7d87f782fd83caa88" },
-  "LuaSnip": { "branch": "master", "commit": "a658ae2906344a1d2b9c507738e585cf68e685c7" },
+  "LuaSnip": { "branch": "master", "commit": "99a94cc35ec99bf06263d0346128e908a204575c" },
-  "SchemaStore.nvim": { "branch": "main", "commit": "78c53f2ce05b7209bf5e2e2b2e25c72a3c1444b2" },
+  "SchemaStore.nvim": { "branch": "main", "commit": "129914a81535b2c7296c05587c07ac8876fbd3e6" },
-  "alpha-nvim": { "branch": "main", "commit": "9e33db324b8bb7a147bce9ea5496686ee859461d" },
+  "alpha-nvim": { "branch": "main", "commit": "e4fc5e29b731bdf55d204c5c6a11dc3be70f3b65" },
-  "catppuccin": { "branch": "main", "commit": "278bfeb61bd627dc2a8885180a0441a1ebe65a41" },
+  "catppuccin": { "branch": "main", "commit": "490078b1593c6609e6a50ad5001e7902ea601824" },
   "cmp-buffer": { "branch": "main", "commit": "3022dbc9166796b644a841a02de8dd1cc1d311fa" },
   "cmp-emoji": { "branch": "main", "commit": "19075c36d5820253d32e2478b6aaf3734aeaafa0" },
   "cmp-nvim-lsp": { "branch": "main", "commit": "44b16d11215dce86f253ce0c30949813c0a90765" },
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
-  "crates.nvim": { "branch": "main", "commit": "4ce7c51b881e58f1e2f8f437f30e4e583cbac319" },
+  "copilot-cmp": { "branch": "master", "commit": "d631b3afbf26bb17d6cf2b3cd8f3d79e7d5eeca1" },
-  "dressing.nvim": { "branch": "master", "commit": "e6eff7a5a950a853c3903d906dbcea03f778db5f" },
+  "copilot.lua": { "branch": "master", "commit": "50ca36fd766db4d444094de81f5e131b6628f48f" },
-  "friendly-snippets": { "branch": "main", "commit": "6e0afe3be0ba43ef03d495a529de8fb22721c0d0" },
+  "crates.nvim": { "branch": "main", "commit": "d5caf28aba49e81ac4099426231f3cf3c151013a" },
-  "gitsigns.nvim": { "branch": "main", "commit": "dc2962f7fce953a2a98e7c6d3d7fc4c1d1f66758" },
+  "dressing.nvim": { "branch": "master", "commit": "169877dbcae54b23b464b219e053e92854bbb37f" },
+  "friendly-snippets": { "branch": "main", "commit": "bc38057e513458cb2486b6cd82d365fa294ee398" },
+  "gitsigns.nvim": { "branch": "main", "commit": "bae45ef449d8811061cc940459e70e883a3aa83a" },
   "indent-blankline.nvim": { "branch": "master", "commit": "4541d690816cb99a7fc248f1486aa87f3abce91c" },
-  "lazy.nvim": { "branch": "main", "commit": "da8b00581a52f5f87ad2aba9f52171fda7491f18" },
+  "lazy.nvim": { "branch": "main", "commit": "3ad55ae678876516156cca2f361c51f7952a924b" },
-  "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
+  "ltex_extra.nvim": { "branch": "master", "commit": "9bed99b2b8488cc2daf66c76d2e0cf051ee80d13" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "fa50cc2540210845fccc3c0b9762417189a563a2" },
+  "lualine.nvim": { "branch": "master", "commit": "45e27ca739c7be6c49e5496d14fcf45a303c3a63" },
+  "markdown-preview.nvim": { "branch": "master", "commit": "02cc3874738bc0f86e4b91f09b8a0ac88aef8e96" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "e86a4c84ff35240639643ffed56ee1c4d55f538e" },
   "mason-nvim-dap.nvim": { "branch": "main", "commit": "e4d56b400e9757b1dc77d620fd3069396e92d5fc" },
-  "mason.nvim": { "branch": "main", "commit": "5ad3e113b0c3fde3caba8630599373046f6197e8" },
+  "mason.nvim": { "branch": "main", "commit": "74eac861b013786bf231b204b4ba9a7d380f4bd9" },
   "mini.ai": { "branch": "main", "commit": "5218ea75e635df78a807bc9d5a7162594fb76d02" },
   "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
   "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" },
-  "mini.pairs": { "branch": "main", "commit": "dfa9f6e2576bb8853be277d96b735af59d9be7c2" },
   "mini.surround": { "branch": "main", "commit": "9d1956b576d7051da3a483b251dfc778121c60db" },
-  "neo-tree.nvim": { "branch": "v2.x", "commit": "7f6fa04dbd8e8c79d1af33bc90e856b65d8641da" },
+  "neo-tree.nvim": { "branch": "v3.x", "commit": "7951701fd21291ac473ea92d3fd57ec5c8bf10bb" },
   "neoconf.nvim": { "branch": "main", "commit": "08f146d53e075055500dca35e93281faff95716b" },
-  "neodev.nvim": { "branch": "main", "commit": "a1c48c5761cc579927bfb09896c8bf37894b80e8" },
+  "neodev.nvim": { "branch": "main", "commit": "81a893eb94d502b2cbb08ed3871eeaadfd240131" },
-  "neotest-go": { "branch": "main", "commit": "05535cb2cfe3ce5c960f65784896d40109572f89" },
+  "neogit": { "branch": "master", "commit": "5aa0880ef6fdbe3f6ca958c06ab9f1a927358922" },
-  "neotest-rust": { "branch": "main", "commit": "6dce8963e5395adf079bf22e931dfce65d3fed25" },
+  "noice.nvim": { "branch": "main", "commit": "894db25ec726d32047799d4d0a982b701bec453b" },
-  "noice.nvim": { "branch": "main", "commit": "6c87c1d11c38180fb72bf8f45518a0a3e081afc1" },
+  "nui.nvim": { "branch": "main", "commit": "9e3916e784660f55f47daa6f26053ad044db5d6a" },
-  "nui.nvim": { "branch": "main", "commit": "d146966a423e60699b084eeb28489fe3b6427599" },
   "null-ls.nvim": { "branch": "main", "commit": "db09b6c691def0038c456551e4e2772186449f35" },
-  "nvim-cmp": { "branch": "main", "commit": "2743dd989e9b932e1b4813a4927d7b84272a14e2" },
+  "nvim-autopairs": { "branch": "master", "commit": "ae5b41ce880a6d850055e262d6dfebd362bb276e" },
-  "nvim-dap": { "branch": "master", "commit": "3bde6f786057fa29d8356559b2ae3a52d9317fba" },
+  "nvim-cmp": { "branch": "main", "commit": "3b9f28061a67b19cadc13946de981426a6425e4a" },
-  "nvim-dap-ui": { "branch": "master", "commit": "c020f660b02772f9f3d11f599fefad3268628a9e" },
+  "nvim-dap": { "branch": "master", "commit": "1c63f37f95cd4fb54512898168138d9a75d1516a" },
+  "nvim-dap-go": { "branch": "main", "commit": "208f0e685b48a98bec2cdd8648559c4274b84ca2" },
+  "nvim-dap-python": { "branch": "master", "commit": "37b4cba02e337a95cb62ad1609b3d1dccb2e5d42" },
+  "nvim-dap-ui": { "branch": "master", "commit": "85b16ac2309d85c88577cd8ee1733ce52be8227e" },
   "nvim-dap-virtual-text": { "branch": "master", "commit": "57f1dbd0458dd84a286b27768c142e1567f3ce3b" },
-  "nvim-lspconfig": { "branch": "master", "commit": "deade69789089c3da15237697156334fb3e943f0" },
+  "nvim-lspconfig": { "branch": "master", "commit": "a981d4447b92c54a4d464eb1a76b799bc3f9a771" },
-  "nvim-navic": { "branch": "master", "commit": "6e8850a524307814decc1b195a2c8a51482a9886" },
+  "nvim-navic": { "branch": "master", "commit": "9c89730da6a05acfeb6a197e212dfadf5aa60ca0" },
   "nvim-notify": { "branch": "master", "commit": "ea9c8ce7a37f2238f934e087c255758659948e0f" },
-  "nvim-spectre": { "branch": "master", "commit": "6edac44e10b94b88bf3067fae937915172a3f825" },
+  "nvim-spectre": { "branch": "master", "commit": "5b39919a2947b1266b3aa34d0b0b14c35523bc69" },
-  "nvim-treesitter": { "branch": "master", "commit": "572a15f171ce1a69ed91ea642ae77af5b5d295fb" },
+  "nvim-treesitter": { "branch": "master", "commit": "15129f6d70a4d7adc380abe57a64af93478f72e5" },
-  "nvim-treesitter-textobjects": { "branch": "master", "commit": "52f1f3280d9092bfaee5c45be5962fabee3d9654" },
+  "nvim-treesitter-textobjects": { "branch": "master", "commit": "9e519b6146512c8e2e702faf8ac48420f4f5deec" },
-  "nvim-ts-context-commentstring": { "branch": "main", "commit": "7f625207f225eea97ef7a6abe7611e556c396d2f" },
+  "nvim-ts-context-commentstring": { "branch": "main", "commit": "e9062e2dfb9854e6a927370f2d720de354c88524" },
-  "nvim-web-devicons": { "branch": "master", "commit": "9ab9b0b894b2388a9dbcdee5f00ce72e25d85bf9" },
+  "nvim-web-devicons": { "branch": "master", "commit": "ab899311f8ae00a47eae8e0879506cead8eb1561" },
   "persistence.nvim": { "branch": "main", "commit": "4b8051c01f696d8849a5cb8afa9767be8db16e40" },
-  "plenary.nvim": { "branch": "master", "commit": "bda256fab0eb66a15e8190937e417e6a14ee5d72" },
+  "plenary.nvim": { "branch": "master", "commit": "267282a9ce242bbb0c5dc31445b6d353bed978bb" },
   "presence.nvim": { "branch": "main", "commit": "87c857a56b7703f976d3a5ef15967d80508df6e6" },
   "project.nvim": { "branch": "main", "commit": "8c6bad7d22eef1b71144b401c9f74ed01526a4fb" },
-  "rust-tools.nvim": { "branch": "master", "commit": "71d2cf67b5ed120a0e31b2c8adb210dd2834242f" },
+  "rust-tools.nvim": { "branch": "master", "commit": "0cc8adab23117783a0292a0c8a2fbed1005dc645" },
-  "telescope.nvim": { "branch": "master", "commit": "276362a8020c6e94c7a76d49aa00d4923b0c02f3" },
+  "telescope.nvim": { "branch": "master", "commit": "2d92125620417fbea82ec30303823e3cd69e90e8" },
-  "todo-comments.nvim": { "branch": "main", "commit": "09b0b17d824d2d56f02ff15967e8a2499a89c731" },
+  "todo-comments.nvim": { "branch": "main", "commit": "3094ead8edfa9040de2421deddec55d3762f64d1" },
-  "toggleterm.nvim": { "branch": "main", "commit": "2249e974faed67e795ffc2ca2be13b93c5d51938" },
+  "toggleterm.nvim": { "branch": "main", "commit": "12cba0a1967b4f3f31903484dec72a6100dcf515" },
-  "tokyonight.nvim": { "branch": "main", "commit": "284667adfff02b9a0adc65968c553c6096b543b6" },
+  "trouble.nvim": { "branch": "main", "commit": "40aad004f53ae1d1ba91bcc5c29d59f07c5f01d3" },
-  "trouble.nvim": { "branch": "main", "commit": "d99e2abd10808ef91738ce98a5c767e6a51df449" },
   "typescript.nvim": { "branch": "main", "commit": "de304087e6e49981fde01af8ccc5b21e8519306f" },
-  "vim-illuminate": { "branch": "master", "commit": "a2907275a6899c570d16e95b9db5fd921c167502" },
+  "venv-selector.nvim": { "branch": "main", "commit": "cc312074371aff5b0d8d481b80c9c4de2a5287d7" },
-  "vim-repeat": { "branch": "master", "commit": "24afe922e6a05891756ecf331f39a1f6743d3d5a" },
+  "vim-illuminate": { "branch": "master", "commit": "5ed17582a8e97bf0a0c617c3cf762e98f87b9859" },
   "vim-startuptime": { "branch": "master", "commit": "454b3de856b7bd298700de33d79774ca9b9e3875" },
-  "vimtex": { "branch": "master", "commit": "bab96ed04dd951b22663b08c670ff33960fc6419" },
+  "vimtex": { "branch": "master", "commit": "877de3ba5de5f766e5bfa1c3fb0d2ecfcd18f868" },
-  "which-key.nvim": { "branch": "main", "commit": "d871f2b664afd5aed3dc1d1573bef2fb24ce0484" }
+  "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }
 }

home/apps/nvim/lua/config/keymaps.lua

@@ -19,6 +19,8 @@ local function map(mode, lhs, rhs, opts)
   end
 end
 
+-- Unbind "entering normal mode" when in terminal
+unmap("t", "<esc><esc>")
 -- Unbind stuff relating to splitting windows
 unmap("n", "<leader>ww")
 unmap("n", "<leader>w-")
@@ -30,9 +32,9 @@ require("which-key").register({
 -- Restore "H" & "L" from neovim
 unmap("n", "H")
 unmap("n", "L")
--- Unbind moving lines with ALT in INSERT mode
+-- Unbind moving lines with ALT in INSERT/VISUAL mode
-unmap("i", "<M-j>")
+unmap({"i", "v"}, "<M-j>")
-unmap("i", "<M-k>")
+unmap({"i", "v"}, "<M-k>")
 -- Move ":Lazy" from "<leader>l" to "<leader>cm"
 unmap("n", "<leader>l")
 map("n", "<leader>cl", "<cmd>Lazy<cr>", { desc = "Lazy" })

home/apps/nvim/lua/config/lazy.lua

@@ -15,6 +15,8 @@ require("lazy").setup({
     { import = "lazyvim.plugins.extras.dap.core" },
     { import = "lazyvim.plugins.extras.lang.typescript" },
     { import = "lazyvim.plugins.extras.lang.json" },
+    { import = "lazyvim.plugins.extras.coding.copilot" },
+    { import = "lazyvim.plugins.extras.lang.python" },
     { import = "plugins" },
   },
   defaults = {

home/apps/nvim/lua/plugins/colourscheme.lua

@@ -2,22 +2,54 @@ return {
   {
     "catppuccin/nvim",
     name = "catppuccin",
+    no_italic = true,
     opts = {
-      styles = {
+      -- styles = {
-        comments = { "italic" },
+      --   comments = { "italic" },
-      },
+      -- },
       integrations = {
         navic = {
           custom_bg = "#181825",
         },
+        telescope = {
+          style = "nvchad",
+        },
       },
       custom_highlights = function(c)
+        local u = require("catppuccin.utils.colors")
+
         return {
-          ["@parameter"] = { style = {} },
+          -- ["@parameter"] = { style = {} },
-          ["@conditional"] = { style = {} },
+          -- Parameter = { style = {} },
-          Conditional = { style = {} },
+          -- ["@conditional"] = { style = {} },
-          ["@namespace"] = { style = {} },
+          -- Conditional = { style = {} },
+          -- ["@namespace"] = { style = {} },
           MiniIndentscopeSymbol = { fg = c.pink },
+          NoiceCmdLinePopupTitle = { fg = c.base, bg = c.blue },
+          NoiceCmdlinePopup = { bg = c.mantle },
+          NoiceCmdlinePopupBorder = { bg = c.mantle, fg = c.mantle },
+
+          -- Neogit
+          -- NeogitUnstagedchanges = { bg = c.base },
+          -- NeogitUnstagedchangesRegion = { bg = c.base },
+          -- NeogitHunkHeader = {
+          --   bg = u.darken(c.blue, 0.095, c.base),
+          --   fg = u.darken(c.blue, 0.5, c.base),
+          -- },
+          -- NeogitHunkHeaderHighlight = {
+          --   bg = u.darken(c.blue, 0.215, c.base),
+          --   fg = c.blue,
+          -- },
+          -- NeogitCursorLine = { link = "CursorLine" },
+          -- NeogitDiffHeader = { fg = c.pink },
+          -- NeogitDiffContextHighlight = { bg = c.base },
+          -- NeogitDiffContext = { bg = c.base },
+          -- NeogitDiffAddRegion = { bg = c.base },
+          -- NeogitDiffDeleteRegion = { bg = c.base },
+          -- NeogitDiffAdd = { fg = c.green, bg = c.base },
+          -- NeogitDiffAddHighlight = { fg = c.green, bg = c.base },
+          -- NeogitDiffDelete = { fg = c.red, bg = c.base },
+          -- NeogitDiffDeleteHighlight = { fg = c.red, bg = c.base },
         }
       end,
     },

home/apps/nvim/lua/plugins/disabled.lua

@@ -5,6 +5,18 @@ return {
     keys = false,
     config = function() end,
   },
+  {
+    "folke/flash.nvim",
+    enabled = false,
+    keys = false,
+    config = function() end,
+  },
+  {
+    "folke/tokyonight.nvim",
+    enabled = false,
+    keys = false,
+    config = function() end,
+  },
   {
     "ggandor/flit.nvim",
     enabled = false,
@@ -23,4 +35,10 @@ return {
     keys = false,
     config = function() end,
   },
+  {
+    "echasnovski/mini.pairs",
+    enabled = false,
+    keys = false,
+    config = function() end,
+  },
 }

home/apps/nvim/lua/plugins/editor.lua

@@ -14,6 +14,15 @@ return {
             { event = "notify", find = "No information available" },
             { event = "msg_show", find = "fewer lines" },
             { event = "msg_show", find = "more lines" },
+            {
+              event = "lsp",
+              kind = "progress",
+              find = "Checking document",
+              cond = function(message)
+                local client = vim.tbl_get(message.opts, "progress", "client")
+                return client == "ltex" -- skip checking document indicators
+              end,
+            },
           },
         },
         opts = { skip = true },
@@ -35,9 +44,35 @@ return {
   {
     "nvim-neo-tree/neo-tree.nvim",
     opts = {
+      enable_normal_mode_for_inputs = true,
       window = { mappings = { ["o"] = "open" } },
     },
   },
+  {
+    "NeogitOrg/neogit",
+    dependencies = "nvim-lua/plenary.nvim",
+    opts = {
+      disable_commit_confirmation = true,
+    },
+    keys = {
+      { "<leader>gg", "<cmd>Neogit kind=replace<cr>", desc = "Open Neogit" },
+      { "<leader>gG", "<cmd>Neogit cwd=%:p:h<cr>", desc = "Open Neogit (cwd)" },
+    },
+  },
+  {
+    "ahmedkhalf/project.nvim",
+    opts = {
+      detection_methods = { "pattern" },
+    },
+    event = "VeryLazy",
+    config = function(_, opts)
+      require("project_nvim").setup(opts)
+      require("telescope").load_extension("projects")
+    end,
+    keys = {
+      { "<leader>fp", "<Cmd>Telescope projects<CR>", desc = "Projects" },
+    },
+  },
   {
     "stevearc/dressing.nvim",
     opts = {
@@ -65,4 +100,19 @@ return {
       shell = "fish",
     },
   },
+  {
+    "jose-elias-alvarez/null-ls.nvim",
+    opts = function(_, opts)
+      local nls = require("null-ls")
+      opts.sources = vim.list_extend(opts.sources, {
+        nls.builtins.formatting.black,
+        -- nls.builtins.diagnostics.ruff,
+      })
+    end,
+  },
+  {
+    "windwp/nvim-autopairs",
+    event = "InsertEnter",
+    opts = {}, -- this is equalent to setup({}) function
+  },
 }

home/apps/nvim/lua/plugins/lsp.lua

@@ -7,6 +7,10 @@ return {
           "nix",
         })
       end
+      opts.indent = {
+        enable = true,
+        disable = { "python", "yaml" },
+      }
     end,
   },
   {
@@ -46,6 +50,22 @@ return {
           },
         },
       },
+      setup = {
+        ltex = function(_, opts)
+          vim.api.nvim_create_autocmd("LspAttach", {
+            callback = function(args)
+              local client = vim.lsp.get_client_by_id(args.data.client_id)
+              if client.name == "ltex" then
+                require("ltex_extra").setup({
+                  load_langs = { "en-GB" }, -- languages for witch dictionaries will be loaded
+                  init_check = true, -- whether to load dictionaries on startup
+                  path = vim.fn.stdpath("data") .. "/spell", -- path to store dictionaries.
+                })
+              end
+            end,
+          })
+        end,
+      },
     },
   },
   {
@@ -135,5 +155,26 @@ return {
       tools = { inlay_hints = { auto = false } },
     },
   },
-  { "lervag/vimtex" },
+  {
+    "lervag/vimtex",
+    config = function()
+      vim.g.vimtex_mappings_enabled = 0
+    end,
+  },
+  {
+    "barreiroleo/ltex_extra.nvim",
+    dependencies = { "neovim/nvim-lspconfig" },
+    -- opts = {
+    --   load_langs = { "en-GB" },
+    --   path = vim.fn.stdpath("data") .. "/dictionary",
+    -- },
+  },
+  {
+    "iamcco/markdown-preview.nvim",
+    build = "cd app && npm install",
+    setup = function()
+      vim.g.mkdp_filetypes = { "markdown" }
+    end,
+    ft = { "markdown" },
+  },
 }

home/apps/vscode/settings.json

@@ -3,7 +3,6 @@
   "workbench.reduceMotion": "on",
   "workbench.commandPalette.preserveInput": true,
   "files.autoSave": "afterDelay",
-  "files.autoSaveDelay": 10,
   // Theme
   "workbench.colorTheme": "Catppuccin Mocha",
   "catppuccin.italicComments": false,
@@ -23,7 +22,6 @@
   "editor.minimap.autohide": true,
   "editor.inlayHints.padding": true,
   "editor.acceptSuggestionOnEnter": "smart",
-  "editor.bracketPairColorization.independentColorPoolPerBracketType": false,
   "editor.formatOnSave": false,
   "editor.suggest.preview": true,
   "errorLens.fontFamily": "Iosevka Term, Symbols Nerd Font, monospace",
@@ -160,7 +158,8 @@
     }
   ],
   "[python]": {
-    "editor.formatOnType": false
+    "editor.formatOnType": false,
+    "editor.defaultFormatter": "ms-python.black-formatter"
   },
   "[typescript]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
@@ -198,5 +197,14 @@
   "rust-analyzer.check.command": "clippy",
   "[html]": {
     "editor.defaultFormatter": "esbenp.prettier-vscode"
-  }
+  },
+  "[typescriptreact]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "[javascript]": {
+    "editor.defaultFormatter": "esbenp.prettier-vscode"
+  },
+  "typescript.updateImportsOnFileMove.enabled": "always",
+  "terminal.integrated.persistentSessionScrollback": 10000,
+  "terminal.integrated.scrollback": 10000
 }