after/ftplugin/html.lua

@@ -1,2 +0,0 @@
-vim.opt.sw=2
-vim.opt.ts=2

lazy-lock.json

@@ -9,15 +9,14 @@
   "cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
   "cmp_luasnip": { "branch": "master", "commit": "18095520391186d634a0045dacaa346291096566" },
   "fidget.nvim": { "branch": "main", "commit": "0ba1e16d07627532b6cae915cc992ecac249fb97" },
-  "friendly-snippets": { "branch": "main", "commit": "b71d1ddc30a10ce0474156f7ee93bc9006d0cd74" },
+  "friendly-snippets": { "branch": "main", "commit": "49ca2a0e0e26427b550b1f64272d7fe7e4d7d51b" },
   "gitsigns.nvim": { "branch": "main", "commit": "4455bb5364d29ff86639dfd5533d4fe4b48192d4" },
   "indent-blankline.nvim": { "branch": "master", "commit": "7075d7861f7a6bbf0de0298c83f8a13195e6ec01" },
   "lazy.nvim": { "branch": "main", "commit": "6b2311a46a3808e366bb251270f4cc04afb421ed" },
   "leap.nvim": { "branch": "main", "commit": "14b5a65190fe69388a8f59c695ed3394a10d6af8" },
-  "lsp_signature.nvim": { "branch": "master", "commit": "17ff7a405fea8376b015b8ea7910d2e59958bf68" },
   "lualine.nvim": { "branch": "master", "commit": "05d78e9fd0cdfb4545974a5aa14b1be95a86e9c9" },
-  "mason-lspconfig.nvim": { "branch": "main", "commit": "5230617372e656d4a2e1e236e03bf7e7b4b97273" },
+  "mason-lspconfig.nvim": { "branch": "main", "commit": "8f9af9bd7dc8599c8ec5826bb175dc871e4b582d" },
-  "mason.nvim": { "branch": "main", "commit": "7d7efc738e08fc5bee822857db45cb6103f0b0c1" },
+  "mason.nvim": { "branch": "main", "commit": "ec8fc11f8ad036c672f6b4a83799d3bcc19b0eb0" },
   "mini.ai": { "branch": "main", "commit": "44d7df1340b16b16b27b67fba07028cb57f45408" },
   "mini.comment": { "branch": "main", "commit": "877acea5b2a32ff55f808fc0ebe9aa898648318c" },
   "mini.indentscope": { "branch": "main", "commit": "f60e9b51a6214c73a170ffc5445ce91560981031" },
@@ -25,15 +24,14 @@
   "mini.surround": { "branch": "main", "commit": "14f418209ecf52d1a8de9d091eb6bd63c31a4e01" },
   "neo-tree.nvim": { "branch": "v2.x", "commit": "d883632bf8f92f1d5abea4a9c28fb2f90aa795aa" },
   "neoconf.nvim": { "branch": "main", "commit": "bf802bff605d439f0403d55d83e8f6bf7247fce8" },
-  "neodev.nvim": { "branch": "main", "commit": "d69254e1fbdc4a04c56719dde19e5eafb7b04b58" },
+  "neodev.nvim": { "branch": "main", "commit": "c120c96225f878e096f124321c14c45aa07968b7" },
-  "nui.nvim": { "branch": "main", "commit": "64bdc579873fa5bd303f6951ead2b419493c88e8" },
+  "nui.nvim": { "branch": "main", "commit": "f008972ac7d24f7188521a7f8d158aac2fb0b07e" },
   "null-ls.nvim": { "branch": "main", "commit": "a138b14099e9623832027ea12b4631ddd2a49256" },
-  "nvim": { "branch": "main", "commit": "2df7036c5c303c9184869936e40ca18935e4afcb" },
   "nvim-cmp": { "branch": "main", "commit": "b8c2a62b3bd3827aa059b43be3dd4b5c45037d65" },
-  "nvim-lspconfig": { "branch": "master", "commit": "08f1f347c718e945c3b1712ebb68c6834182cf3a" },
+  "nvim-lspconfig": { "branch": "master", "commit": "fefba589c56a5568a089299e36a4c8242502faaa" },
   "nvim-navic": { "branch": "master", "commit": "15704c607569d6c5cfeab486d3ef9459645a70ce" },
   "nvim-spectre": { "branch": "master", "commit": "8adb05dbfbd36862d700b5c3d1c26f0febf3f10d" },
-  "nvim-treesitter": { "branch": "master", "commit": "9c9e12f0333a1686171a1315b237e9f6c49ff41d" },
+  "nvim-treesitter": { "branch": "master", "commit": "0ae494269acd469fbd896cf5d5a430dbbf4d4e95" },
   "nvim-treesitter-textobjects": { "branch": "master", "commit": "2d6d3c7e49a24f6ffbbf7898241fefe9784f61bd" },
   "nvim-ts-context-commentstring": { "branch": "main", "commit": "0bf8fbc2ca8f8cdb6efbd0a9e32740d7a991e4c3" },
   "nvim-web-devicons": { "branch": "master", "commit": "2a125024a137677930efcfdf720f205504c97268" },

lua/plugins/core.lua

@@ -2,27 +2,6 @@ local cmp = require("cmp")
 local luasnip = require("luasnip")
 
 return {
-  {
-    -- "catppuccin/nvim",
-    -- name = "catppuccin",
-    -- priority = 1000,
-    -- config = function()
-    --   vim.g.catppuccin_flavour = "mocha"
-    --   vim.cmd([[colorscheme catppuccin]])
-    --   require("catppuccin").setup({
-    --     custom_highlights = function(colors)
-    --       print("fuuuuuuuuuuuuuuuuuuuck", colors.red)
-    --       return {
-    --         TreesitterContext = { bg = colors.mantle },
-    --         TreesitterContextLineNumber = { bg = colors.mantle },
-    --         TreesitterContextBottom = { style = { "underline" } },
-    --         MultiCursor = { bg = colors.red },
-    --         VM_Cursor = { bg = colors.red },
-    --       }
-    --     end,
-    --   })
-    -- end,
-  },
   {
     "LazyVim/LazyVim",
     opts = {
@@ -43,7 +22,6 @@ return {
       window = {
         mappings = {
           ["l"] = "open", -- open folders and files with l
-          -- ["h"] = "close",
         },
       },
     },

lua/plugins/lsp.lua

@@ -26,15 +26,15 @@ return {
             },
           },
         },
-        rust_analyzer = {
+        -- tsserver = {
-          settings = {
+        --   settings = {
-            ["rust-analyzer"] = {
+        --     init_options = {
-              checkOnSave = {
+        --       preferences = {
-                command = "clippy",
+        --         importModuleSpecifierPreference = "relative",
-              },
+        --       },
-            },
+        --     },
-          }
+        --   },
-        },
+        -- },
       },
     },
   },