From efb35f75d4ed40f92d3816f9d73dadb5b2ea2928 Mon Sep 17 00:00:00 2001 From: foxora Date: Sat, 14 Feb 2026 20:09:02 +0000 Subject: [PATCH] finally added nix lsp and changed indentation for nix and lua :3 also added haskell bc dea <3 --- flake.lock | 15 +++++++++------ .../programs/neovim/lua/lsp/indentation.lua | 17 +++++++++++++++++ homes/modules/programs/neovim/lua/lsp/init.lua | 1 + homes/modules/programs/neovim/lua/lsp/lsp.lua | 8 ++++++++ homes/modules/programs/neovim/nixcats.nix | 5 +++++ 5 files changed, 40 insertions(+), 6 deletions(-) create mode 100644 homes/modules/programs/neovim/lua/lsp/indentation.lua diff --git a/flake.lock b/flake.lock index 0d21e0d..b086454 100644 --- a/flake.lock +++ b/flake.lock @@ -156,14 +156,17 @@ ] }, "locked": { - "lastModified": 1771048427, - "narHash": "sha256-pGqtZ6LH3hcmtSiCy8bMnRxkBBT0CU18pIHlEm9yCs4=", - "path": "/home/me/cry/mk/Cerulean", - "type": "path" + "lastModified": 1771048834, + "narHash": "sha256-rkhrNJIjCQeABf0zgWZvz4Rb99TJvK+ioOmgy3tIOMs=", + "owner": "emilelcb", + "repo": "Cerulean", + "rev": "f329d48223d8addd340f14c9c653960544b3ce2c", + "type": "github" }, "original": { - "path": "/home/me/cry/mk/Cerulean", - "type": "path" + "owner": "emilelcb", + "repo": "Cerulean", + "type": "github" } }, "crane": { diff --git a/homes/modules/programs/neovim/lua/lsp/indentation.lua b/homes/modules/programs/neovim/lua/lsp/indentation.lua new file mode 100644 index 0000000..df7c2a8 --- /dev/null +++ b/homes/modules/programs/neovim/lua/lsp/indentation.lua @@ -0,0 +1,17 @@ +vim.api.nvim_create_autocmd("FileType", { + pattern = "lua", + callback = function() + vim.opt_local.shiftwidth = 2 + vim.opt_local.tabstop = 2 + vim.opt_local.expandtab = true + end, +}) + +vim.api.nvim_create_autocmd("FileType", { + pattern = "nix", + callback = function() + vim.opt_local.shiftwidth = 2 + vim.opt_local.tabstop = 2 + vim.opt_local.expandtab = true + end, +}) diff --git a/homes/modules/programs/neovim/lua/lsp/init.lua b/homes/modules/programs/neovim/lua/lsp/init.lua index 1fae8a8..647d24f 100644 --- a/homes/modules/programs/neovim/lua/lsp/init.lua +++ b/homes/modules/programs/neovim/lua/lsp/init.lua @@ -2,4 +2,5 @@ require("lze").load { { import = "lsp.completion", }, } +require("lsp.indentation") require("lsp.lsp") diff --git a/homes/modules/programs/neovim/lua/lsp/lsp.lua b/homes/modules/programs/neovim/lua/lsp/lsp.lua index 496de69..18e3c80 100644 --- a/homes/modules/programs/neovim/lua/lsp/lsp.lua +++ b/homes/modules/programs/neovim/lua/lsp/lsp.lua @@ -21,6 +21,10 @@ servers.lua_ls = { }, } +servers.nil_ls = { + settings = {}, +} + local rust_analyzer_cmd = os.getenv("RUST_ANALYZER_CMD") servers.rust_analyzer = { cmd = { rust_analyzer_cmd }, @@ -55,6 +59,10 @@ servers.gleam = { settings = {}, } +servers.hls = { + settings = {}, +} + local java_home = os.getenv("JAVA_HOME") servers.jdtls = { settings = { diff --git a/homes/modules/programs/neovim/nixcats.nix b/homes/modules/programs/neovim/nixcats.nix index 3fbfec7..e81a8a0 100644 --- a/homes/modules/programs/neovim/nixcats.nix +++ b/homes/modules/programs/neovim/nixcats.nix @@ -75,6 +75,10 @@ in { gleam = with pkgs; [ gleam ]; + haskell = with pkgs; [ + haskell-language-server + ormolu + ]; java = with pkgs; [ jdt-language-server javaPackages.compiler.openjdk17 @@ -218,6 +222,7 @@ in { zig = true; elixir = true; gleam = true; + haskell = true; java = true; }; };