Compare commits

..

No commits in common. "91f700f9a5635c9f1be392f0a393f0724ae78264" and "5ca2e591360044ff3402a489d77c9dd6d59f3356" have entirely different histories.

10 changed files with 29 additions and 36 deletions

38
flake.lock generated
View file

@ -37,11 +37,11 @@
"systems": "systems_2" "systems": "systems_2"
}, },
"locked": { "locked": {
"lastModified": 1732215451, "lastModified": 1730835992,
"narHash": "sha256-P2VVlzRGKBNsiHsN1yMZcSMXpwtIx9ysMFZAqKFJ14o=", "narHash": "sha256-XYr4WQMxJdZkrQlsouyURMY4iNL5SS2RlQ7XGnjEQBU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "authentik-nix", "repo": "authentik-nix",
"rev": "9d9c0a3a94a91cfed654a18239e27cf56970daa4", "rev": "5af11599eaec65b5b6e6e39d77b541db361c08aa",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -53,16 +53,16 @@
"authentik-src": { "authentik-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1732213300, "lastModified": 1730826392,
"narHash": "sha256-4Pv35cnZGiTxe6j2O0F9L9sHzxVIC1SazeAUD5kWeBs=", "narHash": "sha256-EuNOfMy7yVa1OqWwCtNtmdeIQeQCTCKBXgJdz0QCPIU=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "authentik", "repo": "authentik",
"rev": "527e584699abc93712114b05f70f59c5187caa66", "rev": "665de8ef2211524f3cc13dce9344bd59c61c3a5c",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "goauthentik", "owner": "goauthentik",
"ref": "version/2024.10.4", "ref": "version/2024.10.1",
"repo": "authentik", "repo": "authentik",
"type": "github" "type": "github"
} }
@ -301,11 +301,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733045511, "lastModified": 1730837930,
"narHash": "sha256-n8AldXJRNVMm2UZ6yN0HwVxlARY2Cm/uhdOw76tQ0OI=", "narHash": "sha256-0kZL4m+bKBJUBQse0HanewWO0g8hDdCvBhudzxgehqc=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "4964f3c6fc17ae4578e762d3dc86b10fe890860e", "rev": "2f607e07f3ac7e53541120536708e824acccfaa8",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -336,11 +336,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1731242966, "lastModified": 1730403150,
"narHash": "sha256-B3C3JLbGw0FtLSWCjBxU961gLNv+BOOBC6WvstKLYMw=", "narHash": "sha256-W1FH5aJ/GpRCOA7DXT/sJHFpa5r8sq2qAUncWwRZ3Gg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "3ed3f0eaae9fcc0a8331e77e9319c8a4abd8a71a", "rev": "0d09341beeaa2367bac5d718df1404bf2ce45e6f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -450,11 +450,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1733024876, "lastModified": 1730604744,
"narHash": "sha256-vy9Q41hBE7Zg0yakF79neVgb3i3PQMSMR7uHPpPywFE=", "narHash": "sha256-/MK6QU4iOozJ4oHTfZipGtOgaT/uy/Jm4foCqHQeYR4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "6e0b7f81367069589a480b91603a10bcf71f3103", "rev": "cc2ddbf2df8ef7cc933543b1b42b845ee4772318",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -524,11 +524,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1732837521, "lastModified": 1730785428,
"narHash": "sha256-jNRNr49UiuIwaarqijgdTR2qLPifxsVhlJrKzQ8XUIE=", "narHash": "sha256-Zwl8YgTVJTEum+L+0zVAWvXAGbWAuXHax3KzuejaDyo=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "970e93b9f82e2a0f3675757eb0bfc73297cc6370", "rev": "4aa36568d413aca0ea84a1684d2d46f55dbabad7",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -64,7 +64,7 @@ in
auth_url = "https://auth.rfive.de/application/o/authorize/"; auth_url = "https://auth.rfive.de/application/o/authorize/";
token_url = "https://auth.rfive.de/application/o/token/"; token_url = "https://auth.rfive.de/application/o/token/";
api_url = "https://auth.rfive.de/application/o/userinfo/"; api_url = "https://auth.rfive.de/application/o/userinfo/";
role_attribute_path = "contains(roles, 'Grafana Admin') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'"; role_attribute_path = "contains(groups, 'Grafana Admins') && 'Admin' || contains(groups, 'Grafana Editors') && 'Editor' || 'Viewer'";
}; };

View file

@ -32,7 +32,6 @@
# ''; # '';
tmp.useTmpfs = true; tmp.useTmpfs = true;
}; };
services.lldpd.enable = true;
environment.persistence."/nix/persist/system" = { environment.persistence."/nix/persist/system" = {
directories = [ directories = [

View file

@ -7,15 +7,12 @@
enableDefaultPackages = true; enableDefaultPackages = true;
packages = with pkgs; packages = with pkgs;
[ [
nerd-fonts.noto nerdfonts
nerd-fonts.iosevka noto-fonts
nerd-fonts.iosevka-term
nerd-fonts.iosevka-term-slab
noto-fonts-cjk-sans noto-fonts-cjk-sans
noto-fonts-emoji noto-fonts-emoji
roboto roboto
fira fira
open-sans
]; ];
}; };
console = { console = {

View file

@ -7,7 +7,6 @@
file = ../../../../secrets/thinkpad/dyport-auth.age; file = ../../../../secrets/thinkpad/dyport-auth.age;
}; };
}; };
programs.openvpn3.enable = true;
networking = { networking = {
supplicant = { supplicant = {
"LAN" = { "LAN" = {
@ -97,7 +96,6 @@
FSR = { FSR = {
psk = "ext:FSR_PSK"; psk = "ext:FSR_PSK";
authProtocols = [ "WPA-PSK" ]; authProtocols = [ "WPA-PSK" ];
extraConfig = "disabled=1";
}; };
}; };
openconnect.interfaces = { openconnect.interfaces = {

View file

@ -44,6 +44,7 @@
}; };
}; };
}; };
# broken again
services = { services = {
fprintd.enable = true; # log in using fingerprint fprintd.enable = true; # log in using fingerprint
}; };

Binary file not shown.

Binary file not shown.

View file

@ -19,4 +19,10 @@
rebootTime = "10m"; 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" ];
} }

View file

@ -73,14 +73,6 @@ in
GSSAPIAuthentication = "yes"; GSSAPIAuthentication = "yes";
}; };
}; };
"gutenberg" = {
hostname = "ftp.agdsn.tu-dresden.de";
user = "r5";
extraOptions = {
VerifyHostKeyDNS = "yes";
GSSAPIAuthentication = "yes";
};
};
"*.agdsn.network" = { "*.agdsn.network" = {
user = "r5"; user = "r5";
extraOptions = { extraOptions = {