From 5757ca54fa9308358821a6622cca6a3cbc509ffc Mon Sep 17 00:00:00 2001 From: Zynh0722 Date: Tue, 27 Feb 2024 04:46:34 -0800 Subject: [PATCH 1/3] mac updates --- after/ftplugin/go.lua | 2 ++ lua/plugins/lspconfig.lua | 50 +++++++++++++++++++-------------------- lua/plugins/telescope.lua | 12 +++++++++- 3 files changed, 38 insertions(+), 26 deletions(-) create mode 100644 after/ftplugin/go.lua diff --git a/after/ftplugin/go.lua b/after/ftplugin/go.lua new file mode 100644 index 0000000..8591cda --- /dev/null +++ b/after/ftplugin/go.lua @@ -0,0 +1,2 @@ +vim.o.list = false +vim.o.tabstop = 4 diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 2e3936a..0cf1941 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -9,31 +9,31 @@ return { -- pyright will be automatically installed with mason and loaded with lspconfig rust_analyzer = { mason = false, - settings = { - ["rust-analyzer"] = { - -- rustfmt = { - -- overrideCommand = { "leptosfmt", "--stdin", "--rustfmt" }, - -- }, - imports = { - granularity = { - group = "module", - }, - }, - cargo = { - buildScripts = { - enable = false, - }, - }, - files = { - excludeDirs = { - "pe-template", - }, - }, - procMacro = { - enable = true, - }, - }, - }, + -- settings = { + -- ["rust-analyzer"] = { + -- -- rustfmt = { + -- -- overrideCommand = { "leptosfmt", "--stdin", "--rustfmt" }, + -- -- }, + -- imports = { + -- granularity = { + -- group = "module", + -- }, + -- }, + -- cargo = { + -- buildScripts = { + -- enable = false, + -- }, + -- }, + -- files = { + -- excludeDirs = { + -- "pe-template", + -- }, + -- }, + -- procMacro = { + -- enable = true, + -- }, + -- }, + -- }, }, tailwindcss = { init_options = { diff --git a/lua/plugins/telescope.lua b/lua/plugins/telescope.lua index 4fc4ac9..d2b70b0 100644 --- a/lua/plugins/telescope.lua +++ b/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, }, }, From f0091e50f19d6af816df4919a327c50a3742dffe Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Tue, 27 Feb 2024 05:19:19 -0800 Subject: [PATCH 2/3] fix commentstring nix --- after/ftplugin/nix.lua | 1 + 1 file changed, 1 insertion(+) create mode 100644 after/ftplugin/nix.lua diff --git a/after/ftplugin/nix.lua b/after/ftplugin/nix.lua new file mode 100644 index 0000000..7e1766f --- /dev/null +++ b/after/ftplugin/nix.lua @@ -0,0 +1 @@ +vim.opt.commentstring = "#%s" From ab5c6121556e60b74b0a2d77188c6a19866c2f29 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Tue, 27 Feb 2024 05:20:43 -0800 Subject: [PATCH 3/3] ensure lua --- lazyvim.json | 3 ++- lua/plugins/nix-workarounds.lua | 7 +++---- 2 files changed, 5 insertions(+), 5 deletions(-) diff --git a/lazyvim.json b/lazyvim.json index 37c9be6..cabd063 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -16,4 +16,5 @@ "NEWS.md": "2123" }, "version": 2 -} \ No newline at end of file +} + diff --git a/lua/plugins/nix-workarounds.lua b/lua/plugins/nix-workarounds.lua index 7b319a8..4eeda4a 100644 --- a/lua/plugins/nix-workarounds.lua +++ b/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, { - -- "tsx", - -- "typescript", - -- }) + vim.list_extend(opts.ensure_installed, { + "lua", + }) opts.ensure_installed = {} end, },