From bb00eb1a2f5dcf6d24d92ee1e56b7d7a29c1e5ba Mon Sep 17 00:00:00 2001 From: macronova Date: Sun, 8 Jun 2025 10:22:00 -0500 Subject: [PATCH] Update state version --- common/constants.nix | 1 - flake.lock | 86 ++++++++++++++--------------- linux/nebula/conduit.nix | 2 +- linux/nebula/configuration.nix | 2 +- linux/protostar/configuration.nix | 2 +- linux/quasar/configuration.nix | 2 +- linux/quasar/gui.nix | 1 - linux/singularity/configuration.nix | 2 +- linux/singularity/mailserver.nix | 1 + 9 files changed, 49 insertions(+), 50 deletions(-) diff --git a/common/constants.nix b/common/constants.nix index 47072c3..c0f23e4 100644 --- a/common/constants.nix +++ b/common/constants.nix @@ -86,7 +86,6 @@ with lib; { syncthingDevices = mkOption { type = types.attrsOf (types.attrsOf types.str); default = { - blitzar.id = "KGCBCIZ-GG6KMQ2-FLK5BWW-GLCEDML-5LCI24S-UKO5UWL-HWNCPYX-ZWWD5AQ"; nebula.id = "NJXA5XS-2PSWECD-UHBV7JH-IR2RSWY-PRUPFTZ-AHL7IN6-RXSLZKB-2FUNRQH"; protostar.id = "RQBGBAP-TI2VGMA-IO6OOAC-5KDJJKC-5NH2HNW-VAKLHMS-2YCRRQU-QKXFXQM"; quasar.id = "4IZ2RNQ-YTRM4C5-54X2MBV-ZL6Q6FO-TDETMJD-LBV3GV5-CO25QQU-2MG4PQR"; diff --git a/flake.lock b/flake.lock index ef14dde..04d7e84 100644 --- a/flake.lock +++ b/flake.lock @@ -19,11 +19,11 @@ "candy-icons": { "flake": false, "locked": { - "lastModified": 1746738946, - "narHash": "sha256-COC926EPA7w1eUnXq40iFuANUF3Rch83e/BekBsHNFo=", + "lastModified": 1749333685, + "narHash": "sha256-bXUlc8SnLIEopGtqyXbqu50qe1PNW5875l8WdsfyANw=", "ref": "refs/heads/master", - "rev": "47abaeba8de75a1805b10f4fc8d698c6e8c614c9", - "revCount": 1302, + "rev": "9720f52c97f582780f0927541ba19963603ad7f5", + "revCount": 1313, "type": "git", "url": "https://github.com/EliverLara/candy-icons" }, @@ -37,11 +37,11 @@ "nixpkgs": "nixpkgs" }, "locked": { - "lastModified": 1748225455, - "narHash": "sha256-AzlJCKaM4wbEyEpV3I/PUq5mHnib2ryEy32c+qfj6xk=", + "lastModified": 1749200714, + "narHash": "sha256-W8KiJIrVwmf43JOPbbTu5lzq+cmdtRqaNbOsZigjioY=", "owner": "nix-community", "repo": "disko", - "rev": "a894f2811e1ee8d10c50560551e50d6ab3c392ba", + "rev": "17d08c65c241b1d65b3ddf79e3fac1ddc870b0f6", "type": "github" }, "original": { @@ -189,11 +189,11 @@ }, "hardware": { "locked": { - "lastModified": 1747900541, - "narHash": "sha256-dn64Pg9xLETjblwZs9Euu/SsjW80pd6lr5qSiyLY1pg=", + "lastModified": 1749195551, + "narHash": "sha256-W5GKQHgunda/OP9sbKENBZhMBDNu2QahoIPwnsF6CeM=", "owner": "nixos", "repo": "nixos-hardware", - "rev": "11f2d9ea49c3e964315215d6baa73a8d42672f06", + "rev": "4602f7e1d3f197b3cb540d5accf5669121629628", "type": "github" }, "original": { @@ -207,11 +207,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1748391243, - "narHash": "sha256-7sCuihzsTRZemtbTXaFUoGJUfuQErhKEcL9v7HKIo1k=", + "lastModified": 1749358668, + "narHash": "sha256-V91nN4Q9ZwX0N+Gzu+F8SnvzMcdURYnMcIvpfLQzD5M=", "owner": "nix-community", "repo": "home-manager", - "rev": "f5b12be834874f7661db4ced969a621ab2d57971", + "rev": "06451df423dd5e555f39857438ffc16c5b765862", "type": "github" }, "original": { @@ -247,11 +247,11 @@ "nixpkgs": "nixpkgs_3" }, "locked": { - "lastModified": 1748411314, - "narHash": "sha256-fvtRp+oHGDLiSQico9+LTAr6Z8CU1AIldLYLQ9mHqjo=", + "lastModified": 1749312278, + "narHash": "sha256-iafbTiQGNlylMR/ivKRlDudHiu5891rVmRj/WjFcRKE=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "9d69aed9023082af370b71bffdfcd414b6b61593", + "rev": "8b0b76f13c875f1f31632fd5fbaee8a093421455", "type": "github" }, "original": { @@ -269,11 +269,11 @@ "nixpkgs-25_05": "nixpkgs-25_05" }, "locked": { - "lastModified": 1747965231, - "narHash": "sha256-BW3ktviEhfCN/z3+kEyzpDKAI8qFTwO7+S0NVA0C90o=", + "lastModified": 1749244584, + "narHash": "sha256-BGmEptAyP2NrP4gX7VMYWo53h5e8r2iE/uo2+YPMcfo=", "owner": "simple-nixos-mailserver", "repo": "nixos-mailserver", - "rev": "53007af63fade28853408370c4c600a63dd97f41", + "rev": "8b27add0883067e990bff4f847b6f7b6f53324b9", "type": "gitlab" }, "original": { @@ -296,11 +296,11 @@ "yorha-sound-theme": "yorha-sound-theme" }, "locked": { - "lastModified": 1748121439, - "narHash": "sha256-mBqbgtibXaBV96peVQwkNajKO/ySdAn/rnRWUaVknQM=", + "lastModified": 1749395968, + "narHash": "sha256-8TLFo4Rzl/o9Tx5bn5GGI4HsIiT3lGjrlhVwjOYSyqA=", "ref": "refs/heads/main", - "rev": "12edfc84da2d153d27bf76fa6d6404b8fb8cde84", - "revCount": 37, + "rev": "907106e54eaa732b251b4729fccba3b375c52f01", + "revCount": 38, "type": "git", "url": "https://forgejo.invariantspace.com/macronova/nix-custom" }, @@ -333,11 +333,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1748186667, - "narHash": "sha256-UQubDNIQ/Z42R8tPCIpY+BOhlxO8t8ZojwC9o2FW3c8=", + "lastModified": 1748856973, + "narHash": "sha256-RlTsJUvvr8ErjPBsiwrGbbHYW8XbB/oek0Gi78XdWKg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "bdac72d387dca7f836f6ef1fe547755fb0e9df61", + "rev": "e4b09e47ace7d87de083786b404bf232eb6c89d8", "type": "github" }, "original": { @@ -365,11 +365,11 @@ }, "nixpkgs_2": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1749143949, + "narHash": "sha256-QuUtALJpVrPnPeozlUG/y+oIMSLdptHxb3GK6cpSVhA=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "d3d2d80a2191a73d1e86456a751b83aa13085d7d", "type": "github" }, "original": { @@ -413,11 +413,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1748026106, - "narHash": "sha256-6m1Y3/4pVw1RWTsrkAK2VMYSzG4MMIj7sqUy7o8th1o=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "063f43f2dbdef86376cc29ad646c45c46e93234c", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -429,11 +429,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1748190013, - "narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=", + "lastModified": 1749285348, + "narHash": "sha256-frdhQvPbmDYaScPFiCnfdh3B/Vh81Uuoo0w5TkWmmjU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "62b852f6c6742134ade1abdd2a21685fd617a291", + "rev": "3e3afe5174c561dee0df6f2c2b2236990146329f", "type": "github" }, "original": { @@ -566,11 +566,11 @@ "sweet-ambar-blue": { "flake": false, "locked": { - "lastModified": 1747428924, - "narHash": "sha256-o/XBpvna+mo9nrNLn63NPqzSEwK5+7gavKq0gupRyn4=", + "lastModified": 1748992784, + "narHash": "sha256-Br7so/D1M4ZwgWRfN8haShwJL53sX5g3WpFXjnzadRI=", "ref": "Ambar-Blue", - "rev": "14b13d370d9bb212ac17d23cb427e42c15b77fc6", - "revCount": 331, + "rev": "5fb283a01e66f85bfae6ed84c472975ca65adb52", + "revCount": 334, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, @@ -583,11 +583,11 @@ "sweet-ambar-blue-dark": { "flake": false, "locked": { - "lastModified": 1747428803, - "narHash": "sha256-I9WWK/A5ormq2+i289o0KuEqm/kVeowbTokeOeCbe4w=", + "lastModified": 1748992519, + "narHash": "sha256-/mPDpcImPY9uf03+Ydjt0HRWoBSY6xlGQ707zUfYYts=", "ref": "Ambar-Blue-Dark", - "rev": "18ae44ca46acdfddf38032ebc3ef21962a41a236", - "revCount": 415, + "rev": "af14c246b779b79694e9b98e23287ae7ec36baee", + "revCount": 418, "type": "git", "url": "https://github.com/EliverLara/Sweet" }, diff --git a/linux/nebula/conduit.nix b/linux/nebula/conduit.nix index a518803..bfbb8fd 100644 --- a/linux/nebula/conduit.nix +++ b/linux/nebula/conduit.nix @@ -4,7 +4,7 @@ settings.global = { address = wildcard; port = port.conduit; - # Use secret file when possible + # TODO: Use secret file when possible turn_secret = "84EoJSEVnlH@eiqqV7K!2vmAr^G"; turn_uris = let coturn-realm = "turn.${domain}"; diff --git a/linux/nebula/configuration.nix b/linux/nebula/configuration.nix index c25ba35..055e27d 100644 --- a/linux/nebula/configuration.nix +++ b/linux/nebula/configuration.nix @@ -17,5 +17,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/linux/protostar/configuration.nix b/linux/protostar/configuration.nix index c553789..79240d7 100644 --- a/linux/protostar/configuration.nix +++ b/linux/protostar/configuration.nix @@ -23,5 +23,5 @@ # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "24.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/linux/quasar/configuration.nix b/linux/quasar/configuration.nix index 6f89c9a..f741eb9 100644 --- a/linux/quasar/configuration.nix +++ b/linux/quasar/configuration.nix @@ -42,5 +42,5 @@ # and migrated your data accordingly. # # For more information, see `man configuration.nix` or https://nixos.org/manual/nixos/stable/options#opt-system.stateVersion . - system.stateVersion = "24.11"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/linux/quasar/gui.nix b/linux/quasar/gui.nix index 1589439..3a45874 100644 --- a/linux/quasar/gui.nix +++ b/linux/quasar/gui.nix @@ -26,7 +26,6 @@ in { telegram-desktop thunderbird via - wallpaper-engine-plasma6-plugin winetricks wineWowPackages.stagingFull ]; diff --git a/linux/singularity/configuration.nix b/linux/singularity/configuration.nix index c9e29cd..d1445f6 100644 --- a/linux/singularity/configuration.nix +++ b/linux/singularity/configuration.nix @@ -8,7 +8,7 @@ security.sudo.wheelNeedsPassword = false; - system.stateVersion = "24.05"; + system.stateVersion = "25.11"; zramSwap.enable = true; } diff --git a/linux/singularity/mailserver.nix b/linux/singularity/mailserver.nix index 0f10e10..c660707 100644 --- a/linux/singularity/mailserver.nix +++ b/linux/singularity/mailserver.nix @@ -17,6 +17,7 @@ in { }; certificateScheme = "acme"; + stateVersion = 2; }; sops.secrets = { ${userSecret} = {};