diff --git a/flake.lock b/flake.lock index d21de87..d760e15 100644 --- a/flake.lock +++ b/flake.lock @@ -37,11 +37,11 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1730835992, - "narHash": "sha256-XYr4WQMxJdZkrQlsouyURMY4iNL5SS2RlQ7XGnjEQBU=", + "lastModified": 1732215451, + "narHash": "sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o=", "owner": "nix-community", "repo": "authentik-nix", - "rev": "5af11599eaec65b5b6e6e39d77b541db361c08aa", + "rev": "9d9c0a3a94a91cfed654a18239e27cf56970daa4", "type": "github" }, "original": { @@ -53,16 +53,16 @@ "authentik-src": { "flake": false, "locked": { - "lastModified": 1730826392, - "narHash": "sha256-EuNOfMy7yVa1OqWwCtNtmdeIQeQCTCKBXgJdz0QCPIU=", + "lastModified": 1732213300, + "narHash": "sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs=", "owner": "goauthentik", "repo": "authentik", - "rev": "665de8ef2211524f3cc13dce9344bd59c61c3a5c", + "rev": "527e584699abc93712114b05f70f59c5187caa66", "type": "github" }, "original": { "owner": "goauthentik", - "ref": "version/2024.10.1", + "ref": "version/2024.10.4", "repo": "authentik", "type": "github" } @@ -301,11 +301,11 @@ ] }, "locked": { - "lastModified": 1730837930, - "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=", + "lastModified": 1733045511, + "narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", "owner": "nix-community", "repo": "home-manager", - "rev": "2f607e07f3ac7e53541120536708e824acccfaa8", + "rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", "type": "github" }, "original": { @@ -336,11 +336,11 @@ }, "impermanence": { "locked": { - "lastModified": 1730403150, - "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=", + "lastModified": 1731242966, + "narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "owner": "nix-community", "repo": "impermanence", - "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f", + "rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "type": "github" }, "original": { @@ -450,11 +450,11 @@ ] }, "locked": { - "lastModified": 1730604744, - "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=", + "lastModified": 1733024876, + "narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "owner": "nix-community", "repo": "nix-index-database", - "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318", + "rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "type": "github" }, "original": { @@ -524,11 +524,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1730785428, - "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=", + "lastModified": 1732837521, + "narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7", + "rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "type": "github" }, "original": { diff --git a/hosts/nuc/modules/monitoring/default.nix b/hosts/nuc/modules/monitoring/default.nix index 9097c6f..aab1cf9 100644 --- a/hosts/nuc/modules/monitoring/default.nix +++ b/hosts/nuc/modules/monitoring/default.nix @@ -64,7 +64,7 @@ in auth_url = "https://auth.rfive.de/application/o/authorize/"; token_url = "https://auth.rfive.de/application/o/token/"; api_url = "https://auth.rfive.de/application/o/userinfo/"; - role_attribute_path = "contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'"; + role_attribute_path = "contains(roles, 'Grafana Admin') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'"; }; diff --git a/secrets/thinkpad/agdsn.age b/secrets/thinkpad/agdsn.age index 32fd7fe..41a2fe0 100644 Binary files a/secrets/thinkpad/agdsn.age and b/secrets/thinkpad/agdsn.age differ diff --git a/secrets/thinkpad/wireless.age b/secrets/thinkpad/wireless.age index d7bb382..d9967a8 100644 Binary files a/secrets/thinkpad/wireless.age and b/secrets/thinkpad/wireless.age differ diff --git a/shared/systemd.nix b/shared/systemd.nix index 421022d..c1d9105 100644 --- a/shared/systemd.nix +++ b/shared/systemd.nix @@ -19,10 +19,4 @@ rebootTime = "10m"; }; }; - - # https://github.com/NixOS/nixpkgs/pull/351151#issuecomment-2440083015 - # fix hosts using impermanence - boot.initrd.systemd.suppressedUnits = [ "systemd-machine-id-commit.service" ]; - systemd.suppressedSystemUnits = [ "systemd-machine-id-commit.service" ]; - } diff --git a/users/rouven/modules/ssh/default.nix b/users/rouven/modules/ssh/default.nix index d91e1fe..af2dfe8 100644 --- a/users/rouven/modules/ssh/default.nix +++ b/users/rouven/modules/ssh/default.nix @@ -73,6 +73,14 @@ in GSSAPIAuthentication = "yes"; }; }; + "gutenberg" = { + hostname = "ftp.agdsn.tu-dresden.de"; + user = "r5"; + extraOptions = { + VerifyHostKeyDNS = "yes"; + GSSAPIAuthentication = "yes"; + }; + }; "*.agdsn.network" = { user = "r5"; extraOptions = {