diff --git a/flake.lock b/flake.lock index a1510c8..3f672da 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1738148035, - "narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", + "lastModified": 1738765162, + "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=", "owner": "nix-community", "repo": "disko", - "rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", + "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff", "type": "github" }, "original": { @@ -82,11 +82,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1738633599, - "narHash": "sha256-EXZoqWNfwBGrlrSNB5Vz5AL+pYc5p8keM35mglYw6j4=", + "lastModified": 1738806509, + "narHash": "sha256-WvAgrkWYQOXKEkrhmbtQjgMPRhm1HCDbGgg/MCDHkQE=", "owner": "nix-community", "repo": "nix-vscode-extensions", - "rev": "615f991fb42739207e7f71138e03b1b9bbe45e72", + "rev": "d3354254f4d75d5ae5de58ee5b03c5bdbbb627c0", "type": "github" }, "original": { @@ -129,11 +129,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1738574474, - "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", + "lastModified": 1738702386, + "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=", "owner": "nixos", "repo": "nixpkgs", - "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", + "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e", "type": "github" }, "original": { diff --git a/home-manager/development/helix.nix b/home-manager/development/helix.nix index 0304bb7..d12c0dd 100644 --- a/home-manager/development/helix.nix +++ b/home-manager/development/helix.nix @@ -8,6 +8,18 @@ settings = { theme = "dracula"; }; + extraPackages = with pkgs;[ + marksman + shfmt + bash-language-server + superhtml + nixd + nixpkgs-fmt + biome + ] ++ (with nodePackages;[ + vscode-langservers-extracted + typescript-language-server + ]); languages = { language = [ { @@ -71,46 +83,6 @@ formatter = { command = "biome"; args = [ "format" "--stdin-file-path" "a.tsx" ]; }; } ]; - language-server = with pkgs;{ - bash-language-server = { - command = "${bash-language-server}/bin/bash-language-server"; - args = [ "start" ]; - }; - - superhtml = { - command = "${superhtml}/bin/superhtml"; - args = [ "lsp" ]; - }; - - nixd = { - command = "${nixd}/bin/nixd"; - config.nil = { - formatting.command = [ "${nixpkgs-fmt}/bin/nixpkgs-fmt" ]; - }; - }; - - typescript-language-server = with nodePackages; { - command = "${typescript-language-server}/bin/typescript-language-server"; - args = [ "--stdio" "--tsserver-path=${typescript}/lib/node_modules/typescript/lib" ]; - }; - vscode-css-language-server = { - command = "${vscode-langservers-extracted}/bin/vscode-css-language-server"; - args = [ "--stdio" ]; - }; - vscode-json-language-server = { - command = "${vscode-langservers-extracted}/bin/vscode-json-language-server"; - args = [ "--stdio" ]; - }; - vscode-markdown-language-server = { - command = "${vscode-langservers-extracted}/bin/vscode-markdown-language-server"; - args = [ "--stdio" ]; - }; - - biome = { - command = "${biome}/bin/biome"; - args = [ "lsp-proxy" ]; - }; - }; }; }; }; diff --git a/home-manager/development/vscode.nix b/home-manager/development/vscode.nix index 653bdea..d762545 100644 --- a/home-manager/development/vscode.nix +++ b/home-manager/development/vscode.nix @@ -14,6 +14,8 @@ in enable = true; package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".vscodium; mutableExtensionsDir = false; + enableUpdateCheck = false; + enableExtensionUpdateCheck = false; extensions = with openvsx-extensions;[ biomejs.biome mkhl.direnv @@ -67,6 +69,7 @@ in "[jsonc]" = { "editor.defaultFormatter" = "biomejs.biome"; }; + "biome.lsp.bin" = "${biome}/bin/biome"; "typescript.preferences.preferTypeOnlyAutoImports" = true; @@ -78,8 +81,6 @@ in }; }; - "biome.lsp.bin" = "${biome}/bin/biome"; - "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; "shellformat.path" = "${shfmt}/bin/shfmt"; diff --git a/tuxedo/home.nix b/tuxedo/home.nix index 42d942c..c37f8d6 100644 --- a/tuxedo/home.nix +++ b/tuxedo/home.nix @@ -63,7 +63,7 @@ # comms teamspeak_client - webcord + vesktop teams-for-linux # media