chore: statix fix

This commit is contained in:
Harald Hoyer 2026-04-20 10:09:24 +02:00
parent 8ec7cb7794
commit 6d0186eadb
35 changed files with 39 additions and 46 deletions

View file

@ -5,7 +5,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -5,7 +5,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -8,7 +8,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -8,7 +8,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -14,7 +14,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -5,7 +5,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -5,7 +5,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -5,7 +5,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -5,7 +5,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -8,7 +8,7 @@
metacfg = { metacfg = {
user = { user = {
enable = true; enable = true;
name = config.snowfallorg.user.name; inherit (config.snowfallorg.user) name;
}; };
cli-apps = { cli-apps = {
bash.enable = true; bash.enable = true;

View file

@ -29,7 +29,7 @@ rec {
let let
host = hosts.${name}; host = hosts.${name};
user = host.config.metacfg.user.name or null; user = host.config.metacfg.user.name or null;
system = host.pkgs.stdenv.hostPlatform.system; inherit (host.pkgs.stdenv.hostPlatform) system;
in in
result result
// { // {

View file

@ -1,6 +1,4 @@
{ _:
...
}:
{ {
defaultSSHKeys = [ defaultSSHKeys = [
"sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box" "sk-ssh-ed25519@openssh.com AAAAGnNrLXNzaC1lZDI1NTE5QG9wZW5zc2guY29tAAAAIDsb/Tr69YN5MQLweWPuJaRGm+h2kOyxfD6sqKEDTIwoAAAABHNzaDo= harald@fedora.fritz.box"

View file

@ -31,7 +31,7 @@ in
]; ];
in in
{ {
package = cfg.package; inherit (cfg) package;
settings = { settings = {
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";

View file

@ -10,7 +10,7 @@ let
inherit (lib.metacfg) mkOpt enabled; inherit (lib.metacfg) mkOpt enabled;
cfg = config.metacfg.tools.git; cfg = config.metacfg.tools.git;
user = config.metacfg.user; inherit (config.metacfg) user;
in in
{ {
options.metacfg.tools.git = { options.metacfg.tools.git = {

View file

@ -54,10 +54,10 @@ in
config.metacfg.user.name config.metacfg.user.name
] ]
++ optional config.services.hydra.enable "hydra"; ++ optional config.services.hydra.enable "hydra";
extra-substituters = cfg.extra-substituters; inherit (cfg) extra-substituters;
in in
{ {
package = cfg.package; inherit (cfg) package;
settings = { settings = {
experimental-features = "nix-command flakes"; experimental-features = "nix-command flakes";

View file

@ -32,8 +32,8 @@ in
security.acme = { security.acme = {
acceptTerms = true; acceptTerms = true;
defaults = { defaults = {
email = cfg.email; inherit (cfg) email;
dnsProvider = cfg.dnsProvider; inherit (cfg) dnsProvider;
credentialsFile = mkIf (cfg.credentialsFile != null) cfg.credentialsFile; credentialsFile = mkIf (cfg.credentialsFile != null) cfg.credentialsFile;
}; };
}; };

View file

@ -71,8 +71,7 @@ in
enable = true; enable = true;
extraPackages = extraPackages =
[ ] lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
with pkgs; with pkgs;
[ [
vpl-gpu-rt vpl-gpu-rt
@ -90,8 +89,7 @@ in
rocmEnv = pkgs.symlinkJoin { rocmEnv = pkgs.symlinkJoin {
name = "rocm-combined"; name = "rocm-combined";
paths = paths =
[ ] lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
with pkgs.rocmPackages; with pkgs.rocmPackages;
[ [
rocblas rocblas

View file

@ -25,7 +25,7 @@ in
services.nginx = { services.nginx = {
enable = true; enable = true;
clientMaxBodySize = cfg.clientMaxBodySize; inherit (cfg) clientMaxBodySize;
recommendedGzipSettings = true; recommendedGzipSettings = true;
recommendedOptimisation = true; recommendedOptimisation = true;
recommendedProxySettings = true; recommendedProxySettings = true;

View file

@ -31,7 +31,7 @@ in
config = { config = {
services.xremap = { services.xremap = {
enable = cfg.enable; inherit (cfg) enable;
userName = mkIf cfg.enable cfg.userName; userName = mkIf cfg.enable cfg.userName;
serviceMode = mkIf cfg.enable "user"; serviceMode = mkIf cfg.enable "user";
withGnome = mkIf cfg.enable cfg.withGnome; withGnome = mkIf cfg.enable cfg.withGnome;

View file

@ -9,8 +9,8 @@ with lib;
with lib.metacfg; with lib.metacfg;
let let
cfg = config.metacfg.tools.git; cfg = config.metacfg.tools.git;
gpg = config.metacfg.security.gpg; inherit (config.metacfg.security) gpg;
user = config.metacfg.user; inherit (config.metacfg) user;
in in
{ {
options.metacfg.tools.git = with types; { options.metacfg.tools.git = with types; {

View file

@ -29,7 +29,7 @@ let
pkgs.runCommandNoCC "propagated-icon" pkgs.runCommandNoCC "propagated-icon"
{ {
passthru = { passthru = {
fileName = cfg.icon.fileName; inherit (cfg.icon) fileName;
}; };
} }
'' ''

View file

@ -1,4 +1,4 @@
{ ... }: _:
final: prev: { final: prev: {
inetutils = prev.inetutils.overrideAttrs (old: { inetutils = prev.inetutils.overrideAttrs (old: {
# Fix gnulib variadic macro error on Darwin with newer Clang # Fix gnulib variadic macro error on Darwin with newer Clang

View file

@ -1,4 +1,4 @@
{ ... }: _:
final: prev: { final: prev: {
gnome-console = prev.gnome-console.overrideAttrs (prevAttrs: { gnome-console = prev.gnome-console.overrideAttrs (prevAttrs: {
patches = (prevAttrs.patches or [ ]) ++ [ patches = (prevAttrs.patches or [ ]) ++ [

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
nix.distributedBuilds = true; nix.distributedBuilds = true;

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
services.pipewire.wireplumber.extraConfig."51-audio-priorities" = { services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
"monitor.alsa.rules" = [ "monitor.alsa.rules" = [

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
metacfg.services.xremap = { metacfg.services.xremap = {
enable = true; enable = true;

View file

@ -27,8 +27,7 @@ with lib.metacfg;
enable = true; enable = true;
extraPackages = extraPackages =
[ ] lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
++ lib.optionals pkgs.stdenv.targetPlatform.isx86_64 (
with pkgs; with pkgs;
[ [
rocmPackages.clr.icd rocmPackages.clr.icd

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
services.pipewire.wireplumber.extraConfig."51-audio-priorities" = { services.pipewire.wireplumber.extraConfig."51-audio-priorities" = {
"monitor.alsa.rules" = [ "monitor.alsa.rules" = [

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
metacfg.services.xremap = { metacfg.services.xremap = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
services.nginx.virtualHosts = { services.nginx.virtualHosts = {
"00000" = { "00000" = {

View file

@ -1,6 +1,4 @@
{ _:
...
}:
{ {
systemd.services.netatalk.requires = [ systemd.services.netatalk.requires = [
"mnt-backup.mount" "mnt-backup.mount"

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
services.open-webui = { services.open-webui = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
services.uptime-kuma = { services.uptime-kuma = {
enable = true; enable = true;

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
services.wyoming = { services.wyoming = {
faster-whisper.servers."main" = { faster-whisper.servers."main" = {

View file

@ -1,4 +1,4 @@
{ ... }: _:
{ {
metacfg.services.xremap = { metacfg.services.xremap = {
enable = true; enable = true;