From 306d2b23613476d99940c23d1bcde4ec47944f53 Mon Sep 17 00:00:00 2001 From: Zynh Ludwig Date: Fri, 28 Jun 2024 00:17:30 -0700 Subject: [PATCH] doing my best here --- lazyvim.json | 8 ++++---- lua/plugins/conform.lua | 2 +- lua/plugins/lspconfig.lua | 20 ++++++++++---------- 3 files changed, 15 insertions(+), 15 deletions(-) diff --git a/lazyvim.json b/lazyvim.json index e8f70ca..b0a5daf 100644 --- a/lazyvim.json +++ b/lazyvim.json @@ -3,6 +3,7 @@ "lazyvim.plugins.extras.coding.mini-surround", "lazyvim.plugins.extras.dap.core", "lazyvim.plugins.extras.editor.aerial", + "lazyvim.plugins.extras.editor.aerial", "lazyvim.plugins.extras.editor.harpoon2", "lazyvim.plugins.extras.editor.navic", "lazyvim.plugins.extras.formatting.prettier", @@ -10,15 +11,14 @@ "lazyvim.plugins.extras.lang.elixir", "lazyvim.plugins.extras.lang.go", "lazyvim.plugins.extras.lang.java", + "lazyvim.plugins.extras.lang.nix", "lazyvim.plugins.extras.lang.omnisharp", "lazyvim.plugins.extras.lang.rust", "lazyvim.plugins.extras.lang.tailwind", - "lazyvim.plugins.extras.lang.typescript", - "lazyvim.plugins.extras.editor.aerial" + "lazyvim.plugins.extras.lang.typescript" ], "news": { "NEWS.md": "6077" }, "version": 6 -} - +} \ No newline at end of file diff --git a/lua/plugins/conform.lua b/lua/plugins/conform.lua index eac3522..c23d8b8 100644 --- a/lua/plugins/conform.lua +++ b/lua/plugins/conform.lua @@ -3,7 +3,7 @@ return { opts = { formatters_by_ft = { sql = { "sql_formatter" }, - nix = { "nixpgs_fmt" }, + -- nix = { "nixpgs_fmt" }, }, }, } diff --git a/lua/plugins/lspconfig.lua b/lua/plugins/lspconfig.lua index 79d2ebd..9af2455 100644 --- a/lua/plugins/lspconfig.lua +++ b/lua/plugins/lspconfig.lua @@ -6,16 +6,16 @@ return { opts = { -- -@type lspconfig.options servers = { - -- nil_ls = { - -- mason = false, - -- settings = { - -- ["nil"] = { - -- formatting = { - -- command = { "nixpkgs-fmt" }, - -- }, - -- }, - -- }, - -- }, + nil_ls = { + mason = false, + settings = { + ["nil"] = { + formatting = { + command = { "nixpkgs-fmt" }, + }, + }, + }, + }, lua_ls = { mason = false, },