chore: Use nixfmt reformat all nix source code

This commit is contained in:
ulic-youthlic 2026-07-04 23:11:21 +08:00
parent 1cdf00cefe
commit 11337b8f9e
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
184 changed files with 2349 additions and 1943 deletions

View file

@ -2,7 +2,8 @@
lib,
inputs,
...
}: {
}:
{
imports =
(with inputs; [
sops-nix.homeManagerModules.sops

View file

@ -2,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.youthlic.programs.atuin;
in {
in
{
options = {
youthlic.programs.atuin = {
enable = lib.mkEnableOption "atuin";

View file

@ -3,9 +3,11 @@
lib,
pkgs,
...
}: let
}:
let
cfg = config.youthlic.programs.awscli;
in {
in
{
options = {
youthlic.programs.awscli = {
enable = lib.mkEnableOption "awscli";
@ -16,7 +18,7 @@ in {
};
};
config = lib.mkIf cfg.enable {
sops.secrets."awscli" = {};
sops.secrets."awscli" = { };
programs.awscli = {
enable = true;
credentials = {

View file

@ -2,9 +2,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.bash;
in {
in
{
options = {
youthlic.programs.bash = {
enable = lib.mkEnableOption "bash";

View file

@ -2,9 +2,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.direnv;
in {
in
{
options = {
youthlic.programs.direnv = {
enable = lib.mkEnableOption "direnv";

View file

@ -2,12 +2,14 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.eza;
fish-cfg = config.youthlic.programs.fish;
bash-cfg = config.youthlic.programs.bash;
ion-cfg = config.youthlic.programs.ion;
in {
in
{
options = {
youthlic.programs.eza = {
enable = lib.mkEnableOption "eza";

View file

@ -3,9 +3,11 @@
lib,
pkgs,
...
}: let
}:
let
cfg = config.youthlic.programs.fish;
in {
in
{
options = {
youthlic.programs.fish = {
enable = lib.mkEnableOption "fish";
@ -37,7 +39,7 @@ in {
onEvent = "fish_command_not_found";
};
fish_greeting = {
body = '''';
body = "";
};
nani = {
body =

View file

@ -2,11 +2,13 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.fzf;
fish-cfg = config.youthlic.programs.fish;
bash-cfg = config.youthlic.programs.bash;
in {
in
{
options = {
youthlic.programs.fzf = {
enable = lib.mkEnableOption "fzf";

View file

@ -2,7 +2,8 @@
config,
lib,
...
}: {
}:
{
options = {
youthlic.programs.git = {
email = lib.mkOption {
@ -13,7 +14,7 @@
};
name = lib.mkOption {
type = lib.types.str;
example = ''youthlic'';
example = "youthlic";
description = ''
git name
'';
@ -30,9 +31,10 @@
encrypt-credential = lib.mkEnableOption "encrypt git credential";
};
};
config = let
cfg = config.youthlic.programs.git;
in
config =
let
cfg = config.youthlic.programs.git;
in
lib.mkMerge [
{
programs = {

View file

@ -4,15 +4,17 @@
lib,
outputs,
...
}: {
}:
{
options = {
youthlic.programs.gpg = {
enable = lib.mkEnableOption "gpg";
};
};
config = let
cfg = config.youthlic.programs.gpg;
in
config =
let
cfg = config.youthlic.programs.gpg;
in
lib.mkIf cfg.enable {
services.gpg-agent = lib.mkMerge [
{

View file

@ -3,23 +3,25 @@
pkgs,
config,
...
}: let
}:
let
cfg = config.youthlic.programs.helix;
defaultLanguagesSettings = config.programs.helix.package.passthru.languages.language;
in {
in
{
options = {
youthlic.programs.helix = {
enable = lib.mkEnableOption "helix";
languageSettings = lib.mkOption {
type = lib.types.attrsOf (
lib.types.submodule (
{...}: {
{ ... }: {
freeformType = lib.types.anything;
options = {
language-servers = lib.mkOption {
type = lib.types.listOf (lib.types.either lib.types.str lib.types.anything);
default = ["typos-lsp"];
example = ["rust-analyzer"];
default = [ "typos-lsp" ];
example = [ "rust-analyzer" ];
apply = lib.unique;
};
};
@ -27,16 +29,17 @@ in {
)
);
default = lib.pipe defaultLanguagesSettings [
(map (lang: lib.nameValuePair lang.name (lib.removeAttrs lang ["name"])))
(map (lang: lib.nameValuePair lang.name (lib.removeAttrs lang [ "name" ])))
lib.listToAttrs
];
apply = lib.mapAttrsToList (name: value: {inherit name;} // value);
apply = lib.mapAttrsToList (name: value: { inherit name; } // value);
};
extraPackages = lib.mkOption {
type = lib.types.listOf lib.types.package;
default = [];
default = [ ];
example = (
with pkgs; [
with pkgs;
[
deno
]
);
@ -53,7 +56,8 @@ in {
enable = true;
defaultEditor = true;
extraPackages = cfg.extraPackages;
settings = with lib;
settings =
with lib;
pipe ./config.toml [
builtins.readFile
fromTOML
@ -82,200 +86,200 @@ in {
command = "typos-lsp";
};
};
} {language = cfg.languageSettings;};
} { language = cfg.languageSettings; };
};
})
(lib.mkIf cfg.enable {
youthlic.programs.helix.languageSettings = lib.pipe defaultLanguagesSettings [
(map ({name, ...}: lib.nameValuePair name {language-servers = ["typos-lsp"];}))
(map ({ name, ... }: lib.nameValuePair name { language-servers = [ "typos-lsp" ]; }))
lib.listToAttrs
];
})
(lib.mkIf cfg.enable {
youthlic.programs.helix.languageSettings =
lib.recursiveUpdate
(lib.pipe defaultLanguagesSettings [
(map (lang: lib.nameValuePair lang.name (lib.removeAttrs lang ["name"])))
lib.listToAttrs
])
{
cmake = {
language-servers = [
"neocmakelsp"
"cmake-language-server"
];
};
kdl = {
formatter = {
command = "kdlfmt";
args = [
"format"
"-"
(lib.pipe defaultLanguagesSettings [
(map (lang: lib.nameValuePair lang.name (lib.removeAttrs lang [ "name" ])))
lib.listToAttrs
])
{
cmake = {
language-servers = [
"neocmakelsp"
"cmake-language-server"
];
};
};
just = {
formatter = {
command = "just";
args = [
"--dump"
kdl = {
formatter = {
command = "kdlfmt";
args = [
"format"
"-"
];
};
};
just = {
formatter = {
command = "just";
args = [
"--dump"
];
};
};
nix = {
formatter = {
command = "nixfmt";
};
};
xml = {
formatter = {
command = "xmllint";
args = [
"--format"
"-"
];
};
};
typst = {
formatter = {
command = "typstyle";
};
};
c = {
formatter = {
command = "clang-format";
};
};
cpp = {
formatter = {
command = "clang-format";
};
};
python = {
formatter = {
command = "ruff";
args = [
"format"
"-s"
"--line-length"
"88"
"-"
];
};
language-servers = [
"pyright"
"ruff"
"ty"
];
};
};
nix = {
formatter = {
command = "nixfmt";
go = {
formatter = {
command = "goimports";
};
};
};
xml = {
formatter = {
command = "xmllint";
args = [
"--format"
"-"
awk = {
formatter = {
command = "awk";
timeout = 5;
args = [
"--file=/dev/stdin"
"--pretty-print=/dev/stdout"
];
};
};
fish = {
language-servers = [
"fish-lsp"
];
};
};
typst = {
formatter = {
command = "typstyle";
yaml = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"yaml"
];
};
};
};
c = {
formatter = {
command = "clang-format";
};
};
cpp = {
formatter = {
command = "clang-format";
};
};
python = {
formatter = {
command = "ruff";
args = [
"format"
"-s"
"--line-length"
"88"
"-"
html = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"html"
];
};
language-servers = [
"vscode-html-language-server"
];
};
language-servers = [
"pyright"
"ruff"
"ty"
];
};
go = {
formatter = {
command = "goimports";
};
};
awk = {
formatter = {
command = "awk";
timeout = 5;
args = [
"--file=/dev/stdin"
"--pretty-print=/dev/stdout"
css = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"css"
];
};
language-servers = [
"vscode-css-language-server"
];
};
};
fish = {
language-servers = [
"fish-lsp"
];
};
yaml = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"yaml"
toml = {
formatter = {
command = "taplo";
args = [
"fmt"
"-"
];
};
};
markdown = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"md"
];
};
};
json = {
language-servers = [
"vscode-json-language-server"
];
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"json"
];
};
};
jsonc = {
language-servers = [
"vscode-json-language-server"
];
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"jsonc"
];
};
};
};
html = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"html"
];
};
language-servers = [
"vscode-html-language-server"
];
};
css = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"css"
];
};
language-servers = [
"vscode-css-language-server"
];
};
toml = {
formatter = {
command = "taplo";
args = [
"fmt"
"-"
];
};
};
markdown = {
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"md"
];
};
};
json = {
language-servers = [
"vscode-json-language-server"
];
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"json"
];
};
};
jsonc = {
language-servers = [
"vscode-json-language-server"
];
formatter = {
command = "deno";
args = [
"fmt"
"-"
"--ext"
"jsonc"
];
};
};
};
})
];
}

View file

@ -2,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.youthlic.programs.ion;
in {
in
{
options = {
youthlic.programs.ion = {
enable = lib.mkEnableOption "ion";

View file

@ -3,9 +3,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.jujutsu;
in {
in
{
options = {
youthlic.programs.jujutsu = {
enable = lib.mkEnableOption "jujutsu";
@ -26,7 +28,7 @@ in {
};
name = lib.mkOption {
type = lib.types.str;
example = ''youthlic'';
example = "youthlic";
description = ''
jujutsu name
'';
@ -43,10 +45,27 @@ in {
settings = {
"$schema" = "https://jj-vcs.github.io/jj/latest/config-schema.json";
aliases = {
dlog = ["log" "-r"];
l = ["log" "-r" "(trunk()..@):: | (trunk()..@)-"];
fresh = ["new" "trunk()"];
tug = ["bookmark" "move" "--from" "closest_bookmark(@)" "--to" "closest_pushable(@)"];
dlog = [
"log"
"-r"
];
l = [
"log"
"-r"
"(trunk()..@):: | (trunk()..@)-"
];
fresh = [
"new"
"trunk()"
];
tug = [
"bookmark"
"move"
"--from"
"closest_bookmark(@)"
"--to"
"closest_pushable(@)"
];
};
snapshot = {
auto-track = "true";
@ -84,7 +103,8 @@ in {
};
revset-aliases = {
"closest_bookmark(to)" = "heads(::to & bookmarks())";
"closest_pushable(to)" = "heads(::to & mutable() & ~description(exact:\"\") & (~empty() | merges()))";
"closest_pushable(to)" =
"heads(::to & mutable() & ~description(exact:\"\") & (~empty() | merges()))";
"desc(x)" = "description(x)";
"pending()" = ".. ~ ::tags() ~ ::remote_bookmarks() ~ @ ~ private()";
"private()" = ''

View file

@ -2,9 +2,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.kvm;
in {
in
{
options = {
youthlic.programs.kvm = {
enable = lib.mkEnableOption "kvm";
@ -14,8 +16,8 @@ in {
dconf = {
settings = {
"org/virt-manager/virt-manager/connections" = {
autoconnect = ["qemu:///system"];
uris = ["qemu:///system"];
autoconnect = [ "qemu:///system" ];
uris = [ "qemu:///system" ];
};
};
};

View file

@ -2,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.youthlic.programs.radicle;
in {
in
{
options = {
youthlic.programs.radicle = {
enable = lib.mkEnableOption "radicle";
@ -59,14 +61,14 @@ in {
};
};
};
sops.secrets."radicle/Tytonidae" = {};
sops.secrets."radicle/Tytonidae" = { };
services.radicle.node = {
enable = true;
args = "--log-logger systemd";
};
systemd.user.services."radicle-node" = {
Unit.After = ["default.target"];
Service.EnvironmentFile = [config.sops.secrets."radicle/Tytonidae".path];
Unit.After = [ "default.target" ];
Service.EnvironmentFile = [ config.sops.secrets."radicle/Tytonidae".path ];
};
};
}

View file

@ -3,20 +3,22 @@
lib,
pkgs,
...
}: let
}:
let
cfg = config.youthlic.programs.rustypaste-cli;
in {
in
{
options = {
youthlic.programs.rustypaste-cli = {
enable = lib.mkEnableOption "rustypaste-cli";
};
};
config = lib.mkIf cfg.enable {
home.packages = [pkgs.rustypaste-cli];
home.packages = [ pkgs.rustypaste-cli ];
sops = {
secrets = {
"rustypaste/auth" = {};
"rustypaste/delete" = {};
"rustypaste/auth" = { };
"rustypaste/delete" = { };
};
templates."rustypaste-config.toml" = {
path = "${config.xdg.configHome}/rustypaste/config.toml";

View file

@ -4,7 +4,8 @@
pkgs,
rootPath,
...
}: {
}:
{
options = {
youthlic.programs.sops = {
enable = lib.mkOption {
@ -24,12 +25,14 @@
};
};
};
config = let
cfg = config.youthlic.programs.sops;
in
config =
let
cfg = config.youthlic.programs.sops;
in
lib.mkIf cfg.enable {
home.packages = (
with pkgs; [
with pkgs;
[
sops
age
]

View file

@ -2,9 +2,11 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.spotifyd;
in {
in
{
options = {
youthlic.programs.spotifyd = {
enable = lib.mkEnableOption "spotifyd";

View file

@ -2,12 +2,14 @@
lib,
config,
...
}: let
}:
let
cfg = config.youthlic.programs.starship;
fish-cfg = config.youthlic.programs.fish;
bash-cfg = config.youthlic.programs.bash;
ion-cfg = config.youthlic.programs.ion;
in {
in
{
options = {
youthlic.programs.starship = {
enable = lib.mkEnableOption "starship";
@ -18,9 +20,10 @@ in {
programs.starship = {
enable = true;
enableTransience = true;
settings = let
config-file = builtins.readFile ./config.toml;
in
settings =
let
config-file = builtins.readFile ./config.toml;
in
builtins.fromTOML config-file;
};
})

View file

@ -3,11 +3,13 @@
lib,
pkgs,
...
}: let
}:
let
cfg = config.youthlic.programs.yazi;
fish-cfg = config.youthlic.programs.fish;
bash-cfg = config.youthlic.programs.bash;
in {
in
{
options = {
youthlic.programs.yazi = {
enable = lib.mkEnableOption "yazi";
@ -22,8 +24,7 @@ in {
enable = true;
shellWrapperName = "y";
plugins = {
inherit
(pkgs.yaziPlugins)
inherit (pkgs.yaziPlugins)
ouch
starship
piper
@ -81,7 +82,7 @@ in {
desc = "Chmod on selected files";
}
{
on = ["l"];
on = [ "l" ];
run = "plugin smart-enter";
desc = "Enter the child directory, or open the file";
}

View file

@ -2,11 +2,13 @@
config,
lib,
...
}: let
}:
let
cfg = config.youthlic.programs.zoxide;
fish-cfg = config.youthlic.programs.fish;
bash-cfg = config.youthlic.programs.bash;
in {
in
{
options = {
youthlic.programs.zoxide = {
enable = lib.mkEnableOption "zoxide";

View file

@ -2,9 +2,11 @@
lib,
config,
...
}: let
}:
let
cfg = config.youthlic.xdg-dirs;
in {
in
{
options = {
youthlic.xdg-dirs = {
enable = lib.mkEnableOption "xdg-dirs";