♻️ [shared] Refactor helix conifg, rm vscodium, add age for thinkpad

This commit is contained in:
2025-04-20 18:04:23 +02:00
parent d74f3880ca
commit 15d5121f0e
3 changed files with 84 additions and 111 deletions

View File

@ -1,9 +1,11 @@
keys: keys:
- &thinkpad age1j66v6z6hlsgqjfv5fz7fldm5q9jay4j5v5du6ymfda6hv40nsqesg89g7p
- &desktop age1fxr5s6d6ar0xy5pr63kpq93tk7jha5k96jcxnyquj6s2mw8mmcpss8w29w - &desktop age1fxr5s6d6ar0xy5pr63kpq93tk7jha5k96jcxnyquj6s2mw8mmcpss8w29w
- &pi4 age1xlnprpvshv93eerthxzg6cahklsfc4efh8dd6u8dte9u6cl0u5qsz48qlt - &pi4 age1xlnprpvshv93eerthxzg6cahklsfc4efh8dd6u8dte9u6cl0u5qsz48qlt
creation_rules: creation_rules:
- path_regex: shared/secrets/secrets.yaml$ - path_regex: shared/secrets/secrets.yaml$
key_groups: key_groups:
- age: - age:
- *thinkpad
- *desktop - *desktop
- *pi4 - *pi4

View File

@ -13,7 +13,17 @@
programs = { programs = {
fish.shellAliases.edit = "hx"; fish.shellAliases.edit = "hx";
helix = { helix =
let
prettier = format: {
command = "prettier";
args = [
"--stdin-filepath"
"file.${format}"
];
};
in
{
enable = true; enable = true;
defaultEditor = true; defaultEditor = true;
extraPackages = with pkgs; [ extraPackages = with pkgs; [
@ -50,47 +60,22 @@
languages.language = [ languages.language = [
{ {
name = "css"; name = "css";
formatter = { formatter = prettier "css";
command = "prettier";
args = [
"--stdin-filepath"
"file.css"
];
};
auto-format = true; auto-format = true;
} }
{ {
name = "json"; name = "json";
language-servers = [ language-servers = [
{ "vscode-json-language-server"
name = "vscode-json-language-server";
except-features = [ "format" ];
}
]; ];
formatter = { formatter = prettier "json";
command = "prettier";
args = [
"--stdin-filepath"
"file.json"
];
};
auto-format = true; auto-format = true;
} }
{ {
name = "jsonc"; name = "jsonc";
language-servers = [ language-servers = [
{
name = "vscode-json-language-server";
except-features = [ "format" ];
}
]; ];
formatter = { formatter = prettier "jsonc";
command = "prettier";
args = [
"--stdin-filepath"
"file.jsonc"
];
};
file-types = [ file-types = [
"jsonc" "jsonc"
]; ];
@ -98,13 +83,7 @@
} }
{ {
name = "markdown"; name = "markdown";
formatter = { formatter = prettier "md";
command = "prettier";
args = [
"--stdin-filepath"
"file.md"
];
};
auto-format = true; auto-format = true;
} }
{ {
@ -114,13 +93,7 @@
} }
{ {
name = "yaml"; name = "yaml";
formatter = { formatter = prettier "yaml";
command = "prettier";
args = [
"--stdin-filepath"
"file.yaml"
];
};
auto-format = true; auto-format = true;
} }
]; ];

View File

@ -12,8 +12,6 @@
]; ];
environment.systemPackages = with pkgs; [ environment.systemPackages = with pkgs; [
# IDEs
vscodium # TODO set up extensions
# Tools # Tools
git git
just just