diff --git a/flake.lock b/flake.lock index 3743c01..bccf5a6 100644 --- a/flake.lock +++ b/flake.lock @@ -122,11 +122,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1783461239, - "narHash": "sha256-O+rwg3jreOAOrYd0YrNoOsRu+8is6TCPCIBN3qJTJpM=", + "lastModified": 1783538213, + "narHash": "sha256-jNjKlmrejUrBgVAeiavlMLlkmC7ZEv1D9nhfuwMW5Q8=", "owner": "cachix", "repo": "devenv", - "rev": "6222c499fe28b87665af2bb6c626da64179cee00", + "rev": "d1fb321e73048d0e1e2b523580268ebb3df2ae90", "type": "github" }, "original": { @@ -300,11 +300,11 @@ ] }, "locked": { - "lastModified": 1783479733, - "narHash": "sha256-d/JatqgG+Pmo+IuCTZfnrEAPWU3fdha48GQeXuFO+bE=", + "lastModified": 1783689750, + "narHash": "sha256-iMO/Ypany7DPXD6D7sQgH7METtEUihnOvdb+A9ehn8k=", "owner": "nix-community", "repo": "home-manager", - "rev": "cee3f0e7fec85d80c149c7afc29926747f7bd3c2", + "rev": "79e6082586b3680ff32c8e75127545058f074fa4", "type": "github" }, "original": { @@ -340,11 +340,11 @@ "treefmt-nix": "treefmt-nix_2" }, "locked": { - "lastModified": 1783492272, - "narHash": "sha256-4APwmEAAxW6MQAJgblXemdd0U5TkUa0w77/LpsPP8Po=", + "lastModified": 1783669679, + "narHash": "sha256-WDGDMsPXxceC0k1ktqcobmwE4GCTrzzULUKlp1CzSKQ=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "e0319c8c10dffb2dc564417ce49baba49b149b33", + "rev": "6e9f6664e72433966557ab83a7c3e8c0bbf64a44", "type": "github" }, "original": { @@ -382,11 +382,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1783267733, - "narHash": "sha256-DTvaM+0vanneOcKg3NKXV7ilf0ShY4BOBz/nde5GHos=", + "lastModified": 1783526091, + "narHash": "sha256-Zkkil0e8Wg5BcBmJkWJwBXlETefYQbYKw72xJUIBPLE=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "74053f79cad0f6c3a4a0be6b7928795d2e6a9f4b", + "rev": "a24d4c0dce53fd8dbeb9ad20411e282c7b9875f1", "type": "github" }, "original": { @@ -415,11 +415,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1783248941, - "narHash": "sha256-citgYJbvR1iUKXpiWlFq3NO+fw6hXGL3Qk1ampU7lhA=", + "lastModified": 1783522755, + "narHash": "sha256-dI0HkX1djETia7cD/Y64h8BNIsSOfTRMzfNum2J6UhE=", "owner": "YaLTeR", "repo": "niri", - "rev": "a30ca7983b2f1fc3ddeb209b3fe18fa78e0dbd25", + "rev": "0777769e719b7c9b7c980d4ea66288bfbb4da5b3", "type": "github" }, "original": { @@ -539,11 +539,11 @@ "nixpkgs": "nixpkgs_4" }, "locked": { - "lastModified": 1783370751, - "narHash": "sha256-E+3MIMvKuo9k+K+qLQ9YXzsBzkgHuyVLnsEbN2DFfuc=", + "lastModified": 1783673680, + "narHash": "sha256-ardRVG+ipnyyxVdIsbLMy5foO6gDqN/yIi8v10HTJqs=", "owner": "NixOS", "repo": "nixos-hardware", - "rev": "662bd6e312d2c8b212e32cb377abaee190749320", + "rev": "0b655af52b5b89bcceb88737efdc3a7498e751ee", "type": "github" }, "original": { @@ -680,11 +680,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1782959384, - "narHash": "sha256-l57y2CK9dTSChgb6Edg7kkXu5DA4rucVbNFoQHUBjmw=", - "rev": "65179426c83bb3f6bc14898b42ea1c6f01d374b0", + "lastModified": 1783224372, + "narHash": "sha256-FGQ8TfSm9WviNE/fQAWsKs+y4GkX8fU4EScewpw54Y8=", + "rev": "d407951447dcd00442e97087bf374aad70c04cea", "type": "tarball", - "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1026231.65179426c83b/nixexprs.tar.xz" + "url": "https://releases.nixos.org/nixos/unstable/nixos-26.11pre1027867.d407951447dc/nixexprs.tar.xz" }, "original": { "type": "tarball", @@ -696,11 +696,11 @@ "nixpkgs": "nixpkgs_6" }, "locked": { - "lastModified": 1783495226, - "narHash": "sha256-+Qg4wlqjEf4CRxkLtQ4tvsk5U2CAbWDZfCdXuyLBoo8=", + "lastModified": 1783689056, + "narHash": "sha256-K9/7C/Dwwe80jF1xhbV8/rHzJsujXulA1vFftgyF6Ok=", "owner": "noctalia-dev", "repo": "noctalia", - "rev": "b9b4bc3408a906f392a8d277d172ef440debc5cc", + "rev": "1b7a17a5df40cf782dbb92f37c94516932427f56", "type": "github" }, "original": { diff --git a/modules/capabilities/dev-tools.nix b/modules/capabilities/dev-tools.nix index a99c0eb..4963d5b 100644 --- a/modules/capabilities/dev-tools.nix +++ b/modules/capabilities/dev-tools.nix @@ -12,6 +12,7 @@ resterm inputs.devenv.packages.${pkgs.stdenv.hostPlatform.system}.default kubectl + ctx7 ]; programs.zsh.initContent = '' diff --git a/modules/capabilities/neovim/default.nix b/modules/capabilities/neovim/default.nix index 19a4103..745d3b6 100644 --- a/modules/capabilities/neovim/default.nix +++ b/modules/capabilities/neovim/default.nix @@ -37,29 +37,20 @@ in settings.config_directory = ./lua-config; runtimePkgs = with pkgs; [ - universal-ctags ripgrep fd - tree-sitter wl-clipboard stylua taplo yamlfmt lua-language-server nixd - nix-doc nixfmt dafny - typescript - typescript-language-server prettier prettierd - eslint - eslint_d vscode-langservers-extracted - emmet-language-server tailwindcss-language-server - rustc rust-analyzer rustfmt astro-language-server @@ -68,6 +59,11 @@ in websocat ty ruff + + vtsls + oxlint + oxfmt + emmet-language-server ]; specs = { diff --git a/modules/capabilities/neovim/lua-config/lua/plugins/lsp.lua b/modules/capabilities/neovim/lua-config/lua/plugins/lsp.lua index ae15e12..0210edd 100644 --- a/modules/capabilities/neovim/lua-config/lua/plugins/lsp.lua +++ b/modules/capabilities/neovim/lua-config/lua/plugins/lsp.lua @@ -216,12 +216,13 @@ require("lz.n").load({ vim.lsp.enable("nixd") vim.lsp.enable("dafny") - vim.lsp.enable("ts_ls") - vim.lsp.enable("eslint") vim.lsp.enable("jsonls") + vim.lsp.enable("vtsls") vim.lsp.enable("cssls") vim.lsp.enable("html") vim.lsp.enable("emmet_language_server") + vim.lsp.enable("oxlint") + vim.lsp.enable("oxfmt") vim.lsp.enable("tailwindcss") vim.lsp.enable("rust_analyzer") vim.lsp.enable("ty")