Merge branch 'main' of https://github.com/Zynh0722/nvim

after/ftplugin/go.lua

@@ -0,0 +1,2 @@
+vim.o.list = false
+vim.o.tabstop = 4

after/ftplugin/nix.lua

@@ -0,0 +1 @@
+vim.opt.commentstring = "#%s"

lua/plugins/lspconfig.lua

@@ -22,31 +22,31 @@ return {
         },
         rust_analyzer = {
           mason = false,
-          settings = {
+          -- settings = {
-            ["rust-analyzer"] = {
+          --   ["rust-analyzer"] = {
-              -- rustfmt = {
+          --     -- rustfmt = {
-              --   overrideCommand = { "leptosfmt", "--stdin", "--rustfmt" },
+          --     --   overrideCommand = { "leptosfmt", "--stdin", "--rustfmt" },
-              -- },
+          --     -- },
-              imports = {
+          --     imports = {
-                granularity = {
+          --       granularity = {
-                  group = "module",
+          --         group = "module",
-                },
+          --       },
-              },
+          --     },
-              cargo = {
+          --     cargo = {
-                buildScripts = {
+          --       buildScripts = {
-                  enable = false,
+          --         enable = false,
-                },
+          --       },
-              },
+          --     },
-              files = {
+          --     files = {
-                excludeDirs = {
+          --       excludeDirs = {
-                  "pe-template",
+          --         "pe-template",
-                },
+          --       },
-              },
+          --     },
-              procMacro = {
+          --     procMacro = {
-                enable = true,
+          --       enable = true,
-              },
+          --     },
-            },
+          --   },
-          },
+          -- },
         },
         tailwindcss = {
           init_options = {

lua/plugins/nix-workarounds.lua

@@ -15,10 +15,9 @@ return {
     "nvim-treesitter/nvim-treesitter",
     opts = function(_, opts)
       -- add tsx and treesitter
-      -- vim.list_extend(opts.ensure_installed, {
+      vim.list_extend(opts.ensure_installed, {
-      --   "tsx",
+        "lua",
-      --   "typescript",
+      })
-      -- })
       opts.ensure_installed = {}
     end,
   },

lua/plugins/telescope.lua

@@ -3,9 +3,19 @@ return {
     "telescope.nvim",
     dependencies = {
       "nvim-telescope/telescope-fzf-native.nvim",
+      "wesleimp/telescope-windowizer.nvim",
       build = "make",
       config = function()
-        require("telescope").load_extension("fzf")
+        local telescope = require("telescope")
+        telescope.setup({
+          extentions = {
+            windowizer = {
+              find_cmd = "rg",
+            },
+          },
+        })
+        telescope.load_extension("fzf")
+        telescope.load_extension("windowizer")
       end,
     },
   },