From 78ae254d321f916b7232f8266d67c60f3b854750 Mon Sep 17 00:00:00 2001 From: billy4479 Date: Mon, 17 Feb 2025 15:28:06 +0100 Subject: [PATCH] [desktop] nvim: Add templ and go imports --- user/modules/applications/editor/nvim/plugins/format.nix | 3 ++- user/modules/applications/editor/nvim/plugins/lsp.nix | 1 + user/modules/applications/editor/nvim/plugins/treesitter.nix | 1 + 3 files changed, 4 insertions(+), 1 deletion(-) diff --git a/user/modules/applications/editor/nvim/plugins/format.nix b/user/modules/applications/editor/nvim/plugins/format.nix index ee9c651..b224258 100644 --- a/user/modules/applications/editor/nvim/plugins/format.nix +++ b/user/modules/applications/editor/nvim/plugins/format.nix @@ -26,7 +26,7 @@ -- https://github.com/stevearc/conform.nvim?tab=readme-ov-file#formatters formatters_by_ft = { lua = { "stylua" }, - go = { "gofmt" }, + go = { "goimports", "gofmt" }, nix = { "nixfmt", "injected" }, python = { "ruff" }, rust = { "rustfmt", lsp_format = "fallback" }, @@ -37,6 +37,7 @@ cpp = { "clang-format" }, -- zig = { "zigfmt" }, python = { "ruff_fix", "ruff_organize_imports", "ruff_format" }, + templ = { "templ" }, }, formatters = { injected = { options = { ignore_errors = false } } }, diff --git a/user/modules/applications/editor/nvim/plugins/lsp.nix b/user/modules/applications/editor/nvim/plugins/lsp.nix index cdfd770..18f613a 100644 --- a/user/modules/applications/editor/nvim/plugins/lsp.nix +++ b/user/modules/applications/editor/nvim/plugins/lsp.nix @@ -36,6 +36,7 @@ r_language_server = {}, zls = {}, clangd = {}, + templ = {}, } for server, config in pairs(servers) do diff --git a/user/modules/applications/editor/nvim/plugins/treesitter.nix b/user/modules/applications/editor/nvim/plugins/treesitter.nix index 0f410f2..d1d16f6 100644 --- a/user/modules/applications/editor/nvim/plugins/treesitter.nix +++ b/user/modules/applications/editor/nvim/plugins/treesitter.nix @@ -28,6 +28,7 @@ tree-sitter-python tree-sitter-rust tree-sitter-svelte + tree-sitter-templ tree-sitter-typescript tree-sitter-yaml tree-sitter-zig