From 651da0ce51de4b4184a82f17dedc6f411f53626f Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Thu, 27 Jun 2024 12:03:25 +0200
Subject: [PATCH 1/4] dns: remove unneccesary cname
---
hosts/falkenstein/modules/dns/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/falkenstein/modules/dns/default.nix b/hosts/falkenstein/modules/dns/default.nix
index 8ef92f1..901dc2b 100644
--- a/hosts/falkenstein/modules/dns/default.nix
+++ b/hosts/falkenstein/modules/dns/default.nix
@@ -54,7 +54,7 @@ let
}
(genCNAMEs "nuc")
- (builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ])
+ (builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ":2018" ])
];
});
in
From 5c57171c1370168d43b71925aaff9882f593d5ea Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Thu, 27 Jun 2024 12:05:29 +0200
Subject: [PATCH 2/4] remove nuc cname 2018
---
hosts/falkenstein/modules/dns/default.nix | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/hosts/falkenstein/modules/dns/default.nix b/hosts/falkenstein/modules/dns/default.nix
index 901dc2b..116b38e 100644
--- a/hosts/falkenstein/modules/dns/default.nix
+++ b/hosts/falkenstein/modules/dns/default.nix
@@ -53,7 +53,7 @@ let
_domainkey.subdomains.rspamd.TXT = [ "v=DKIM1; k=rsa; p=MIGfMA0GCSqGSIb3DQEBAQUAA4GNADCBiQKBgQDoirUMubro4nlmY6a8JMwK9QB2agAXiJzexDU/7ba6KCggONfoSTfUHlrM/XeM1GG/9oKpngApxDPP97adJuxc8/EELyo4HjTyYD8GBFZhg0AN7V8IPaJ1o5k6dGDk8ZLh41ZCnlAVWkhVSKs5pYtzkrlJIfUSzyuoe8nuFsVe3QIDAQAB" ];
}
- (genCNAMEs "nuc")
+ (builtins.removeAttrs (genCNAMEs "nuc") [ ":2018" ])
(builtins.removeAttrs (genCNAMEs "falkenstein") [ "mail" ":2018" ])
];
});
From 35659de96b1a2e9a9ad022c192881517c550ae94 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Thu, 27 Jun 2024 12:07:02 +0200
Subject: [PATCH 3/4] nix: add fujitsu as remote builder
---
shared/nix.nix | 23 +++++++++++++++++++++++
1 file changed, 23 insertions(+)
diff --git a/shared/nix.nix b/shared/nix.nix
index ba3d866..28ab055 100644
--- a/shared/nix.nix
+++ b/shared/nix.nix
@@ -6,6 +6,7 @@
nixpkgs.flake = nixpkgs;
};
nixPath = lib.mapAttrsToList (key: value: "${key}=${value.to.path}") config.nix.registry;
+ distributedBuilds = true;
settings = {
auto-optimise-store = true;
experimental-features = [ "nix-command" "flakes" "repl-flake" ];
@@ -18,5 +19,27 @@
"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
+ '';
};
}
From 01894a9c195d15e2847df03e699bc2fa3ca95d49 Mon Sep 17 00:00:00 2001
From: Rouven Seifert <rouven@rfive.de>
Date: Thu, 27 Jun 2024 12:07:23 +0200
Subject: [PATCH 4/4] misc fixes
---
flake.lock | 44 +++++++++----------
hosts/fujitsu/default.nix | 1 +
.../modules/jellyfin/default.nix | 0
hosts/nuc/default.nix | 1 -
hosts/nuc/modules/networks/default.nix | 2 +-
hosts/thinkpad/modules/networks/uni.nix | 2 +-
6 files changed, 25 insertions(+), 25 deletions(-)
rename hosts/{nuc => fujitsu}/modules/jellyfin/default.nix (100%)
diff --git a/flake.lock b/flake.lock
index d5b20ea..433015d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -38,11 +38,11 @@
"poetry2nix": "poetry2nix"
},
"locked": {
- "lastModified": 1718106692,
- "narHash": "sha256-IGMrKVU2fXgn30LQduJIg89HefHLlPMgJ3mnnKpnNfU=",
+ "lastModified": 1719402686,
+ "narHash": "sha256-MkHcXybi0aEydeLvLKNtJBa3oOy8oCq1uarrLgQzUCM=",
"owner": "nix-community",
"repo": "authentik-nix",
- "rev": "11f5e0fd17dd44d9946a23271d201b257df9f0f4",
+ "rev": "1646cf92cefa0eb6e74f33afe61ae4b2d0d20afe",
"type": "github"
},
"original": {
@@ -55,16 +55,16 @@
"authentik-src": {
"flake": false,
"locked": {
- "lastModified": 1715092773,
- "narHash": "sha256-B+ZLD1D/UQty1urQ0qDFo67vjsk/jtssjqIQOY0Oxq4=",
+ "lastModified": 1719398211,
+ "narHash": "sha256-d4UsYRqHRNabhh28GZZRijmZ1pd9D/o1a4L4d7Yn39M=",
"owner": "goauthentik",
"repo": "authentik",
- "rev": "1f5953b5b7e72c085246e8f19b94482dac946d83",
+ "rev": "5afceaa55f4d831db0cf9d80562e86eb43b622ec",
"type": "github"
},
"original": {
"owner": "goauthentik",
- "ref": "version/2024.4.2",
+ "ref": "version/2024.4.3",
"repo": "authentik",
"type": "github"
}
@@ -136,11 +136,11 @@
]
},
"locked": {
- "lastModified": 1715873341,
- "narHash": "sha256-vOTcr7KXhNDvYPwGotjxcLBrrUq/Nt3sfKRtFwGdHGo=",
+ "lastModified": 1719459426,
+ "narHash": "sha256-4Kn9Pb3lvsik/VYsEAYgXpkcmLhrr0tTE6oIT2PMSPA=",
"owner": "nix-community",
"repo": "dns.nix",
- "rev": "9ebfa9158290de09fafcc759211e48bda48329ee",
+ "rev": "e6693931023206f1f3c2bfc57d2c98b5f27f52e6",
"type": "github"
},
"original": {
@@ -300,11 +300,11 @@
]
},
"locked": {
- "lastModified": 1718788307,
- "narHash": "sha256-SqiOz0sljM0GjyQEVinPXQxaGcbOXw5OgpCWGPgh/vo=",
+ "lastModified": 1719438532,
+ "narHash": "sha256-/Vmso2ZMoFE3M7d1MRsQ2K5sR8CVKnrM6t1ys9Xjpz4=",
"owner": "nix-community",
"repo": "home-manager",
- "rev": "d7830d05421d0ced83a0f007900898bdcaf2a2ca",
+ "rev": "1a4f12ae0bda877ec4099b429cf439aad897d7e9",
"type": "github"
},
"original": {
@@ -335,11 +335,11 @@
},
"impermanence": {
"locked": {
- "lastModified": 1717932370,
- "narHash": "sha256-7C5lCpiWiyPoIACOcu2mukn/1JRtz6HC/1aEMhUdcw0=",
+ "lastModified": 1719091691,
+ "narHash": "sha256-AxaLX5cBEcGtE02PeGsfscSb/fWMnyS7zMWBXQWDKbE=",
"owner": "nix-community",
"repo": "impermanence",
- "rev": "27979f1c3a0d3b9617a3563e2839114ba7d48d3f",
+ "rev": "23c1f06316b67cb5dabdfe2973da3785cfe9c34a",
"type": "github"
},
"original": {
@@ -448,11 +448,11 @@
]
},
"locked": {
- "lastModified": 1718507237,
- "narHash": "sha256-xBEWCxWeRpWQggFFp8ugJCDa63cOJsVvx71R9F0Eowg=",
+ "lastModified": 1719111455,
+ "narHash": "sha256-rnIxHx+fLpydjMQsbpZ21kblUr/lMqSaAtMA4+qMMEE=",
"owner": "nix-community",
"repo": "nix-index-database",
- "rev": "6af2c5e58c20311276f59d247341cafeebfcb6f4",
+ "rev": "4293f532d0107dfb7e6f8b34a0421dc8111320e6",
"type": "github"
},
"original": {
@@ -463,11 +463,11 @@
},
"nixpkgs": {
"locked": {
- "lastModified": 1718895438,
- "narHash": "sha256-k3JqJrkdoYwE3fHE6xGDY676AYmyh4U2Zw+0Bwe5DLU=",
+ "lastModified": 1719254875,
+ "narHash": "sha256-ECni+IkwXjusHsm9Sexdtq8weAq/yUyt1TWIemXt3Ko=",
"owner": "NixOS",
"repo": "nixpkgs",
- "rev": "d603719ec6e294f034936c0d0dc06f689d91b6c3",
+ "rev": "2893f56de08021cffd9b6b6dfc70fd9ccd51eb60",
"type": "github"
},
"original": {
diff --git a/hosts/fujitsu/default.nix b/hosts/fujitsu/default.nix
index 3685021..d1b30a0 100644
--- a/hosts/fujitsu/default.nix
+++ b/hosts/fujitsu/default.nix
@@ -2,6 +2,7 @@
{
imports = [
./hardware-configuration.nix
+ ./modules/jellyfin
./modules/networks
./modules/monitoring
./modules/nfs
diff --git a/hosts/nuc/modules/jellyfin/default.nix b/hosts/fujitsu/modules/jellyfin/default.nix
similarity index 100%
rename from hosts/nuc/modules/jellyfin/default.nix
rename to hosts/fujitsu/modules/jellyfin/default.nix
diff --git a/hosts/nuc/default.nix b/hosts/nuc/default.nix
index 40f02fc..1aa3223 100644
--- a/hosts/nuc/default.nix
+++ b/hosts/nuc/default.nix
@@ -8,7 +8,6 @@
./modules/networks
./modules/adguard
./modules/backup
- ./modules/jellyfin
./modules/cache
./modules/matrix
./modules/mautrix-telegram
diff --git a/hosts/nuc/modules/networks/default.nix b/hosts/nuc/modules/networks/default.nix
index 7c260c3..8985361 100644
--- a/hosts/nuc/modules/networks/default.nix
+++ b/hosts/nuc/modules/networks/default.nix
@@ -5,7 +5,7 @@
fsType = "nfs";
};
fileSystems."/media/shows" = {
- device = "fujitsu.vpn.rfive.de:/movies";
+ device = "fujitsu.vpn.rfive.de:/shows";
fsType = "nfs";
};
networking = {
diff --git a/hosts/thinkpad/modules/networks/uni.nix b/hosts/thinkpad/modules/networks/uni.nix
index a832e5d..ecffe63 100644
--- a/hosts/thinkpad/modules/networks/uni.nix
+++ b/hosts/thinkpad/modules/networks/uni.nix
@@ -23,7 +23,7 @@
identity="rose159e@tu-dresden.de"
password="@EDUROAM_AUTH@"
phase2="auth=PAP"
- bssid_ignore=7c:5a:1c:02:3d:ef 82:5a:1c:02:3d:ef 82:5a:1c:02:3d:db
+ 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
'';
extraConfig = ''
scan_ssid=1