From ccdf26ea94ae7bd728f885a5cb8d2584742e8142 Mon Sep 17 00:00:00 2001 From: SebastianStork Date: Wed, 5 Nov 2025 23:48:33 +0100 Subject: [PATCH] vps-private: Reinstall with xfs `/nix` --- hosts/{srv-private => vps-private}/default.nix | 4 ++-- hosts/{srv-private => vps-private}/disko.nix | 6 +++++- hosts/{srv-private => vps-private}/hardware.nix | 4 ++-- hosts/{srv-private => vps-private}/secrets.json | 6 +++--- 4 files changed, 12 insertions(+), 8 deletions(-) rename hosts/{srv-private => vps-private}/default.nix (95%) rename hosts/{srv-private => vps-private}/disko.nix (90%) rename hosts/{srv-private => vps-private}/hardware.nix (92%) rename hosts/{srv-private => vps-private}/secrets.json (84%) diff --git a/hosts/srv-private/default.nix b/hosts/vps-private/default.nix similarity index 95% rename from hosts/srv-private/default.nix rename to hosts/vps-private/default.nix index 93d661b..c0593a5 100644 --- a/hosts/srv-private/default.nix +++ b/hosts/vps-private/default.nix @@ -6,7 +6,7 @@ inputs.disko.nixosModules.default ]; - system.stateVersion = "25.05"; + system.stateVersion = "25.11"; meta = { domains.validate = true; @@ -18,7 +18,7 @@ sops = { enable = true; - agePublicKey = "age1rp7lrakhlnnhzcgjtut8ncamem6wjrtna3e9mgdkt3dqd9dvk3usa5tzk5"; + agePublicKey = "age1e9a0jj0t5mwep4zgaplsuw57750g0sv5uujvx56ad0te0rle0e0q6ywu69"; }; boot.loader.systemd-boot.enable = true; diff --git a/hosts/srv-private/disko.nix b/hosts/vps-private/disko.nix similarity index 90% rename from hosts/srv-private/disko.nix rename to hosts/vps-private/disko.nix index ead84f6..800ecba 100644 --- a/hosts/srv-private/disko.nix +++ b/hosts/vps-private/disko.nix @@ -24,7 +24,11 @@ size = "20G"; content = { type = "filesystem"; - format = "ext4"; + format = "xfs"; + extraArgs = [ + "-m" + "reflink=1" + ]; mountpoint = "/nix"; mountOptions = [ "noatime" ]; }; diff --git a/hosts/srv-private/hardware.nix b/hosts/vps-private/hardware.nix similarity index 92% rename from hosts/srv-private/hardware.nix rename to hosts/vps-private/hardware.nix index 4ec1054..e010835 100644 --- a/hosts/srv-private/hardware.nix +++ b/hosts/vps-private/hardware.nix @@ -23,8 +23,8 @@ linkConfig.RequiredForOnline = "routable"; networkConfig.DHCP = "no"; address = [ - "138.199.200.104/32" - "2a01:4f8:1c1a:732c::1/64" + "49.13.231.235/32" + "2a01:4f8:1c1e:76fe::1/64" ]; routes = [ { diff --git a/hosts/srv-private/secrets.json b/hosts/vps-private/secrets.json similarity index 84% rename from hosts/srv-private/secrets.json rename to hosts/vps-private/secrets.json index 62ecd41..5904085 100644 --- a/hosts/srv-private/secrets.json +++ b/hosts/vps-private/secrets.json @@ -25,11 +25,11 @@ "age": [ { "recipient": "age1mpq8m4p7dnxh5ze3fh7etd2k6sp85zdnmp9te3e9chcw4pw07pcq960zh5", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSA2bm9haFpMWmtJNkVWZGtT\nTEU1Ylk5dFNPU2VPMzU1QTZuZnVDZmZVREdRCitDOVhqZnlQTmUrR3h3OUF5Nkdr\nN2Z2TmhOQVAzVEM1V2R6NWI1T1ppR0UKLS0tIHZqNWVEbnV6OXhyM1dvMGdnN1BH\nZUR2aGhaZDZraWdRMVVBYVpMcFdVV2cKU5NxrZAERcedudOkHwi5oX5IiTMBGFuu\nyBBVTPOpBeaFMSOsgXPaggEfjcHoI6pgrBqd+1a4PrrC5YGdDiX4OA==\n-----END AGE ENCRYPTED FILE-----\n" + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSB3clZ2RDgvVWJXMUdsWVdk\nclBwc0dEQ1Y3cUt0QVpkTHNYdENnRkJQOUNrClFhM2R2L2laQ1N4cDltMElBeTY3\nOWt3VndlZHBONVdUelptM0dRTUdBd1kKLS0tIEtmOGhJUTJ2Z29JQzBsWVdUa3A5\nUWFZUkVOK1Z4bmVoOFhkY09XbU1ZbWsKgDNEjb6goOoCig73u1E8Ew7MDXIMWYx1\nzg6TRt46Ouk51tNgJ1BRMm+LO2B7PFp0Zs/KcazHmBEG9r2EeoC3kA==\n-----END AGE ENCRYPTED FILE-----\n" }, { - "recipient": "age1rp7lrakhlnnhzcgjtut8ncamem6wjrtna3e9mgdkt3dqd9dvk3usa5tzk5", - "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBWQkl5MHFIN09LMDBhTWQ2\ncGllZndjeER1K2RWR0FCWnVzNzNyRFEyWXo4CldXZEVRM0JMdmZhUzV3dkpJUmhv\nSXluMktBeXFhcTBaM0NBWGZ3K28xTnMKLS0tIEdrTVhCTk41T2N0dy82Q0ROUWtT\nc3JlUEs1V2tCNVV4c2ROK2ExSW11RFkKKnOE+xFpQYmA1TSuVVD9FDZnkU0owdkl\n7lLaBLShN7SDOL+bBgKXzeCIyfeaPXwfXsh7PCYV596C3DVqVWFLHQ==\n-----END AGE ENCRYPTED FILE-----\n" + "recipient": "age1e9a0jj0t5mwep4zgaplsuw57750g0sv5uujvx56ad0te0rle0e0q6ywu69", + "enc": "-----BEGIN AGE ENCRYPTED FILE-----\nYWdlLWVuY3J5cHRpb24ub3JnL3YxCi0+IFgyNTUxOSBqU01heng3NHdrYnZFZmZn\nZlJtUUIyd1ExTmhzeU5iZFZadFcwR25GOEVZCmxHOXNWQVh1ZlJSRHJtaDVHNVUv\nbTY0TlNmZ2hESDkzS2M3WHdlamxwclkKLS0tIEEvOFd3TDFkQmQwbjBodHhpb1BD\nZ2NvTnNqQmtrLy9aVDdGRGxZbVgrZG8KdnnjJWcjZFu3R8fVKToj6THHHRCFou9k\njQoedCZAML2A2FZIhHugH9wnDUPQQjG86WbcCBuFWcOTGiTF2gN+Qg==\n-----END AGE ENCRYPTED FILE-----\n" } ], "lastmodified": "2025-10-11T15:48:45Z",