update helix; vscode; swap discord for vesktop

This commit is contained in:
2025-02-07 13:03:04 +00:00
parent 27e4661529
commit b31503e82b
4 changed files with 25 additions and 52 deletions

18
flake.lock generated
View File

@@ -7,11 +7,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1738148035, "lastModified": 1738765162,
"narHash": "sha256-KYOATYEwaKysL3HdHdS5kbQMXvzS4iPJzJrML+3TKAo=", "narHash": "sha256-3Z40qHaFScWUCVQrGc4Y+RdoPsh1R/wIh+AN4cTXP0I=",
"owner": "nix-community", "owner": "nix-community",
"repo": "disko", "repo": "disko",
"rev": "18d0a984cc2bc82cf61df19523a34ad463aa7f54", "rev": "ff3568858c54bd306e9e1f2886f0f781df307dff",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -82,11 +82,11 @@
"nixpkgs": "nixpkgs" "nixpkgs": "nixpkgs"
}, },
"locked": { "locked": {
"lastModified": 1738633599, "lastModified": 1738806509,
"narHash": "sha256-EXZoqWNfwBGrlrSNB5Vz5AL+pYc5p8keM35mglYw6j4=", "narHash": "sha256-WvAgrkWYQOXKEkrhmbtQjgMPRhm1HCDbGgg/MCDHkQE=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-vscode-extensions", "repo": "nix-vscode-extensions",
"rev": "615f991fb42739207e7f71138e03b1b9bbe45e72", "rev": "d3354254f4d75d5ae5de58ee5b03c5bdbbb627c0",
"type": "github" "type": "github"
}, },
"original": { "original": {
@@ -129,11 +129,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1738574474, "lastModified": 1738702386,
"narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=", "narHash": "sha256-nJj8f78AYAxl/zqLiFGXn5Im1qjFKU8yBPKoWEeZN5M=",
"owner": "nixos", "owner": "nixos",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c", "rev": "030ba1976b7c0e1a67d9716b17308ccdab5b381e",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@@ -8,6 +8,18 @@
settings = { settings = {
theme = "dracula"; theme = "dracula";
}; };
extraPackages = with pkgs;[
marksman
shfmt
bash-language-server
superhtml
nixd
nixpkgs-fmt
biome
] ++ (with nodePackages;[
vscode-langservers-extracted
typescript-language-server
]);
languages = { languages = {
language = [ language = [
{ {
@@ -71,46 +83,6 @@
formatter = { command = "biome"; args = [ "format" "--stdin-file-path" "a.tsx" ]; }; 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" ];
};
};
}; };
}; };
}; };

View File

@@ -14,6 +14,8 @@ in
enable = true; enable = true;
package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".vscodium; package = inputs.nixpkgs-unstable.legacyPackages."${pkgs.system}".vscodium;
mutableExtensionsDir = false; mutableExtensionsDir = false;
enableUpdateCheck = false;
enableExtensionUpdateCheck = false;
extensions = with openvsx-extensions;[ extensions = with openvsx-extensions;[
biomejs.biome biomejs.biome
mkhl.direnv mkhl.direnv
@@ -67,6 +69,7 @@ in
"[jsonc]" = { "[jsonc]" = {
"editor.defaultFormatter" = "biomejs.biome"; "editor.defaultFormatter" = "biomejs.biome";
}; };
"biome.lsp.bin" = "${biome}/bin/biome";
"typescript.preferences.preferTypeOnlyAutoImports" = true; "typescript.preferences.preferTypeOnlyAutoImports" = true;
@@ -78,8 +81,6 @@ in
}; };
}; };
"biome.lsp.bin" = "${biome}/bin/biome";
"bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck"; "bashIde.shellcheckPath" = "${shellcheck}/bin/shellcheck";
"shellformat.path" = "${shfmt}/bin/shfmt"; "shellformat.path" = "${shfmt}/bin/shfmt";

View File

@@ -63,7 +63,7 @@
# comms # comms
teamspeak_client teamspeak_client
webcord vesktop
teams-for-linux teams-for-linux
# media # media