Compare commits

..

No commits in common. "01894a9c195d15e2847df03e699bc2fa3ca95d49" and "a9f3c6836e81415a76e506448dae1615d5248a84" have entirely different histories.

8 changed files with 27 additions and 50 deletions

44
flake.lock generated
View file

@ -38,11 +38,11 @@
"poetry2nix": "poetry2nix" "poetry2nix": "poetry2nix"
}, },
"locked": { "locked": {
"lastModified": 1719402686, "lastModified": 1718106692,
"narHash": "sha256-MkHcXybi0aEydeLvLKNtJBa3oOy8oCq1uarrLgQzUCM=", "narHash": "sha256-IGMrKVU2fXgn30LQduJIg89HefHLlPMgJ3mnnKpnNfU=",
"owner": "nix-community", "owner": "nix-community",
"repo": "authentik-nix", "repo": "authentik-nix",
"rev": "1646cf92cefa0eb6e74f33afe61ae4b2d0d20afe", "rev": "11f5e0fd17dd44d9946a23271d201b257df9f0f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -55,16 +55,16 @@
"authentik-src": { "authentik-src": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1719398211, "lastModified": 1715092773,
"narHash": "sha256-d4UsYRqHRNabhh28GZZRijmZ1pd9D/o1a4L4d7Yn39M=", "narHash": "sha256-B+ZLD1D/UQty1urQ0qDFo67vjsk/jtssjqIQOY0Oxq4=",
"owner": "goauthentik", "owner": "goauthentik",
"repo": "authentik", "repo": "authentik",
"rev": "5afceaa55f4d831db0cf9d80562e86eb43b622ec", "rev": "1f5953b5b7e72c085246e8f19b94482dac946d83",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "goauthentik", "owner": "goauthentik",
"ref": "version/2024.4.3", "ref": "version/2024.4.2",
"repo": "authentik", "repo": "authentik",
"type": "github" "type": "github"
} }
@ -136,11 +136,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719459426, "lastModified": 1715873341,
"narHash": "sha256-4Kn9Pb3lvsik/VYsEAYgXpkcmLhrr0tTE6oIT2PMSPA=", "narHash": "sha256-vOTcr7KXhNDvYPwGotjxcLBrrUq/Nt3sfKRtFwGdHGo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "dns.nix", "repo": "dns.nix",
"rev": "e6693931023206f1f3c2bfc57d2c98b5f27f52e6", "rev": "9ebfa9158290de09fafcc759211e48bda48329ee",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -300,11 +300,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719438532, "lastModified": 1718788307,
"narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=", "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9", "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -335,11 +335,11 @@
}, },
"impermanence": { "impermanence": {
"locked": { "locked": {
"lastModified": 1719091691, "lastModified": 1717932370,
"narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=", "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
"owner": "nix-community", "owner": "nix-community",
"repo": "impermanence", "repo": "impermanence",
"rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a", "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -448,11 +448,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1719111455, "lastModified": 1718507237,
"narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=", "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=",
"owner": "nix-community", "owner": "nix-community",
"repo": "nix-index-database", "repo": "nix-index-database",
"rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6", "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -463,11 +463,11 @@
}, },
"nixpkgs": { "nixpkgs": {
"locked": { "locked": {
"lastModified": 1719254875, "lastModified": 1718895438,
"narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=", "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60", "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
"type": "github" "type": "github"
}, },
"original": { "original": {

View file

@ -53,8 +53,8 @@ let
_domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ]; _domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ];
} }
(builtins.removeAttrs (genCNAMEs "nuc") [ ":2018" ]) (genCNAMEs "nuc")
(builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ":2018" ]) (builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ])
]; ];
}); });
in in

View file

@ -2,7 +2,6 @@
{ {
imports = [ imports = [
./hardware-configuration.nix ./hardware-configuration.nix
./modules/jellyfin
./modules/networks ./modules/networks
./modules/monitoring ./modules/monitoring
./modules/nfs ./modules/nfs

View file

@ -8,6 +8,7 @@
./modules/networks ./modules/networks
./modules/adguard ./modules/adguard
./modules/backup ./modules/backup
./modules/jellyfin
./modules/cache ./modules/cache
./modules/matrix ./modules/matrix
./modules/mautrix-telegram ./modules/mautrix-telegram

View file

@ -5,7 +5,7 @@
fsType = "nfs"; fsType = "nfs";
}; };
fileSystems."/media/shows" = { fileSystems."/media/shows" = {
device = "fujitsu.vpn.rfive.de:/shows"; device = "fujitsu.vpn.rfive.de:/movies";
fsType = "nfs"; fsType = "nfs";
}; };
networking = { networking = {

View file

@ -23,7 +23,7 @@
identity="rose159e@tu-dresden.de" identity="rose159e@tu-dresden.de"
password="@EDUROAM_AUTH@" password="@EDUROAM_AUTH@"
phase2="auth=PAP" phase2="auth=PAP"
bssid_ignore=7c:5a:1c:02:3d:ef 82:5a:1c:02:3d:ef 82:5a:1c:02:3d:db 7c:5a:1c:02:3d:8b bssid_ignore=7c:5a:1c:02:3d:ef 82:5a:1c:02:3d:ef 82:5a:1c:02:3d:db
''; '';
extraConfig = '' extraConfig = ''
scan_ssid=1 scan_ssid=1

View file

@ -6,7 +6,6 @@
nixpkgs.flake = nixpkgs; nixpkgs.flake = nixpkgs;
}; };
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry; nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
distributedBuilds = true;
settings = { settings = {
auto-optimise-store = true; auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" "repl-flake" ]; experimental-features = [ "nix-command" "flakes" "repl-flake" ];
@ -19,27 +18,5 @@
"cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg=" "cache.ifsr.de:y55KBAMF4YkjIzXwYOKVk9fcQS+CZ9RM1zAAMYQJtsg="
]; ];
}; };
buildMachines = [
# {
# hostName = "quitte.ifsr.de";
# sshUser = "rouven.seifert";
# system = "x86_64-linux";
# protocol = "ssh-ng";
# supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
# maxJobs = 4;
# speedFactor = 10;
# }
{
hostName = "fujitsu.vpn.rfive.de";
system = "x86_64-linux";
protocol = "ssh-ng";
supportedFeatures = [ "nixos-test" "benchmark" "big-parallel" "kvm" ];
maxJobs = 4;
speedFactor = 5;
}
];
extraOptions = ''
builders-use-substitutes = true
'';
}; };
} }