Skip to content

Check with statix #150

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
stackptr merged 2 commits into from
Oct 22, 2025
Merged

Check with statix #150

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
ed79947
Ignore repeated keys
stackptr Oct 22, 2025
08bf850
Run `statix fix`
stackptr Oct 22, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions hosts/glyph/services/torrents.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -8,13 +8,13 @@
file = ./../secrets/pushover-user-token.age;
mode = "550";
owner = config.services.transmission.user;
group = config.services.transmission.group;
inherit (config.services.transmission) group;
};
age.secrets.pushover-app-token = {
file = ./../secrets/pushover-app-token.age;
mode = "550";
owner = config.services.transmission.user;
group = config.services.transmission.group;
inherit (config.services.transmission) group;
};
services.transmission = {
enable = true;
Expand Down
4 changes: 2 additions & 2 deletions hosts/spore/services/default.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -15,11 +15,11 @@
file = ../secrets/tailscale-auth-key.age;
mode = "440";
owner = config.services.golink.user;
group = config.services.golink.group;
inherit (config.services.golink) group;
};

services.glances = {
enable = config.services.homepage-dashboard.enable;
inherit (config.services.homepage-dashboard) enable;
};

services.golink = {
Expand Down
2 changes: 1 addition & 1 deletion hosts/spore/services/web/auth.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,7 @@
file = ./../../secrets/pocket-id-encryption-key.age;
mode = "440";
owner = config.services.pocket-id.user;
group = config.services.pocket-id.group;
inherit (config.services.pocket-id) group;
};

rc.web.auth = {
Expand Down
2 changes: 1 addition & 1 deletion hosts/zeta/services/znc.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
age.secrets.znc-conf = {
file = ./../secrets/znc-conf.age;
owner = config.services.znc.user;
group = config.services.znc.group;
inherit (config.services.znc) group;
};
services.znc = {
enable = true;
Expand Down
2 changes: 1 addition & 1 deletion modules/darwin/programs/fastscripts.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ with lib; let
fi
'';
userScripts = filter (f: f.enable) (attrValues config.programs.fastscripts.userScripts);
plistFile = config.programs.fastscripts.plistFile;
inherit (config.programs.fastscripts) plistFile;
in {
options.programs.fastscripts = {
enable = mkEnableOption "FastScripts";
Expand Down
2 changes: 1 addition & 1 deletion modules/home/rustmission.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,7 +18,7 @@ in {

# TODO: Require settings.connection.url to be set
settings = mkOption {
type = tomlFormat.type;
inherit (tomlFormat) type;
default = {};
example = lib.literalExpression ''
{
Expand Down
10 changes: 5 additions & 5 deletions modules/nixos/web/auth.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -150,10 +150,10 @@ in {
enable = true;
provider = "oidc";
oidcIssuerUrl = "https://${cfg.issuer.host}";
keyFile = cfg.authProxy.keyFile;
inherit (cfg.authProxy) keyFile;
reverseProxy = true;
setXauthrequest = true;
clientID = cfg.authProxy.clientID;
inherit (cfg.authProxy) clientID;
redirectURL = "https://${cfg.authProxy.host}/oauth2/callback";
nginx.domain = cfg.authProxy.host;
cookie.domain = cfg.authProxy.domain;
Expand All @@ -171,7 +171,7 @@ in {

virtualHosts.${cfg.issuer.host} = {
forceSSL = true;
useACMEHost = cfg.issuer.useACMEHost;
inherit (cfg.issuer) useACMEHost;
locations."/" = {
proxyPass = "http://127.0.0.1:1411";
proxyWebsockets = true;
Expand All @@ -180,7 +180,7 @@ in {

virtualHosts.${cfg.authProxy.host} = {
forceSSL = true;
useACMEHost = cfg.authProxy.useACMEHost;
inherit (cfg.authProxy) useACMEHost;
locations."/oauth2/" = {
proxyPass = "http://127.0.0.1:4180";
extraConfig = ''
Expand All @@ -206,7 +206,7 @@ in {
})
(let
vhosts = config.services.nginx.virtualHosts;
vhostsRequiringAuth = mapNames (lib.filter (set: set.value.requireAuth == true) (lib.attrsToList vhosts));
vhostsRequiringAuth = mapNames (lib.filter (set: set.value.requireAuth) (lib.attrsToList vhosts));
mapNames = e: toString (lib.map (set: set.name) e);
in
mkIf (!cfg.enable && vhostsRequiringAuth != "") {
Expand Down
3 changes: 3 additions & 0 deletions statix.toml
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
disabled = [
"repeated_keys"
]