diff --git a/.gitignore b/.gitignore index daf57e7..9c1190b 100644 --- a/.gitignore +++ b/.gitignore @@ -1,2 +1,2 @@ result -.log +*.log diff --git a/config/nvim/lua/plugins/completion.lua b/config/nvim/lua/plugins/completion.lua index 13dc65d..8ed4a4f 100644 --- a/config/nvim/lua/plugins/completion.lua +++ b/config/nvim/lua/plugins/completion.lua @@ -7,6 +7,9 @@ return { "rafamadriz/friendly-snippets", }, opts = { + keymap = { + preset = "super-tab", + }, appearance = { nerd_font_variant = "mono", }, diff --git a/config/nvim/lua/plugins/lsp.lua b/config/nvim/lua/plugins/lsp.lua index 8337b63..f24381c 100644 --- a/config/nvim/lua/plugins/lsp.lua +++ b/config/nvim/lua/plugins/lsp.lua @@ -17,6 +17,12 @@ return { vim.lsp.config("jsonls", {}) vim.lsp.enable("jsonls") + + vim.lsp.config("rust_analyzer", {}) + vim.lsp.enable("rust_analyzer") + + vim.lsp.config("taplo", {}) + vim.lsp.enable("taplo") end, }, } diff --git a/config/nvim/lua/plugins/treesitter.lua b/config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..9449e94 --- /dev/null +++ b/config/nvim/lua/plugins/treesitter.lua @@ -0,0 +1,27 @@ +return { + { + "nvim-treesitter/nvim-treesitter", + build = ":TSUpdate", + event = { "BufReadPre", "BufNewFile" }, + config = function() + require("nvim-treesitter").setup({ + ensure_installed = { + "lua", + "rust", + "toml", + "typescript", + "javascript", + "json", + "markdown", + "markdown_inline", + "scala", + "hcl", + "yaml", + "sql", + }, + highlight = { enable = true }, + indent = { enable = true }, + }) + end, + }, +} diff --git a/templates/seichi-portal-backend/flake.nix b/templates/seichi-portal-backend/flake.nix index 5d00da9..9efc0fb 100644 --- a/templates/seichi-portal-backend/flake.nix +++ b/templates/seichi-portal-backend/flake.nix @@ -31,6 +31,7 @@ pkgs.openssl pkgs.cargo-make pkgs.sqlx-cli + pkgs.taplo ]; }; };