♻️ [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:
- &thinkpad age1j66v6z6hlsgqjfv5fz7fldm5q9jay4j5v5du6ymfda6hv40nsqesg89g7p
- &desktop age1fxr5s6d6ar0xy5pr63kpq93tk7jha5k96jcxnyquj6s2mw8mmcpss8w29w
- &pi4 age1xlnprpvshv93eerthxzg6cahklsfc4efh8dd6u8dte9u6cl0u5qsz48qlt
creation_rules:
- path_regex: shared/secrets/secrets.yaml$
key_groups:
- age:
- *thinkpad
- *desktop
- *pi4

View File

@ -13,118 +13,91 @@
programs = {
fish.shellAliases.edit = "hx";
helix = {
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
# Markdown
marksman
markdown-oxide
# Html, css, Json, Eslint
vscode-langservers-extracted
# Yaml
ansible-language-server
yaml-language-server
];
settings = {
editor = {
auto-save = {
after-delay.enable = true;
focus-lost = true;
helix =
let
prettier = format: {
command = "prettier";
args = [
"--stdin-filepath"
"file.${format}"
];
};
in
{
enable = true;
defaultEditor = true;
extraPackages = with pkgs; [
# Markdown
marksman
markdown-oxide
# Html, css, Json, Eslint
vscode-langservers-extracted
# Yaml
ansible-language-server
yaml-language-server
];
settings = {
editor = {
auto-save = {
after-delay.enable = true;
focus-lost = true;
};
cursor-shape = {
normal = "block";
insert = "bar";
select = "underline";
};
lsp = {
display-inlay-hints = true;
display-messages = true;
};
};
cursor-shape = {
normal = "block";
insert = "bar";
select = "underline";
};
lsp = {
display-inlay-hints = true;
display-messages = true;
keys.normal = {
C-f = ":format";
};
};
keys.normal = {
C-f = ":format";
};
languages.language = [
{
name = "css";
formatter = prettier "css";
auto-format = true;
}
{
name = "json";
language-servers = [
"vscode-json-language-server"
];
formatter = prettier "json";
auto-format = true;
}
{
name = "jsonc";
language-servers = [
];
formatter = prettier "jsonc";
file-types = [
"jsonc"
];
auto-format = true;
}
{
name = "markdown";
formatter = prettier "md";
auto-format = true;
}
{
name = "nix";
formatter.command = lib.getExe pkgs.nixfmt-rfc-style;
auto-format = true;
}
{
name = "yaml";
formatter = prettier "yaml";
auto-format = true;
}
];
};
languages.language = [
{
name = "css";
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.css"
];
};
auto-format = true;
}
{
name = "json";
language-servers = [
{
name = "vscode-json-language-server";
except-features = [ "format" ];
}
];
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.json"
];
};
auto-format = true;
}
{
name = "jsonc";
language-servers = [
{
name = "vscode-json-language-server";
except-features = [ "format" ];
}
];
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.jsonc"
];
};
file-types = [
"jsonc"
];
auto-format = true;
}
{
name = "markdown";
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.md"
];
};
auto-format = true;
}
{
name = "nix";
formatter.command = lib.getExe pkgs.nixfmt-rfc-style;
auto-format = true;
}
{
name = "yaml";
formatter = {
command = "prettier";
args = [
"--stdin-filepath"
"file.yaml"
];
};
auto-format = true;
}
];
};
};
}

View File

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