From 23664415b9841c489a50102b18ea75260cbb63a8 Mon Sep 17 00:00:00 2001 From: Tim Van Baak Date: Mon, 2 Dec 2024 02:30:18 +0000 Subject: [PATCH] catacomb: upgrade to 24.11 --- flake.lock | 34 +++++++++++++++++----------------- flake.nix | 6 +++--- machine/catacomb/default.nix | 4 ++-- 3 files changed, 22 insertions(+), 22 deletions(-) diff --git a/flake.lock b/flake.lock index b7cb84d..8368dd6 100644 --- a/flake.lock +++ b/flake.lock @@ -82,22 +82,6 @@ "type": "github" } }, - "nixpkgs-2405": { - "locked": { - "lastModified": 1719838683, - "narHash": "sha256-Zw9rQjHz1ilNIimEXFeVa1ERNRBF8DoXDhLAZq5B4pE=", - "owner": "NixOS", - "repo": "nixpkgs", - "rev": "d032c1a6dfad4eedec7e35e91986becc699d7d69", - "type": "github" - }, - "original": { - "owner": "NixOS", - "ref": "nixos-24.05", - "repo": "nixpkgs", - "type": "github" - } - }, "nixpkgs-2411": { "locked": { "lastModified": 1732350895, @@ -130,6 +114,22 @@ "type": "github" } }, + "nixpkgs-catacomb": { + "locked": { + "lastModified": 1732981179, + "narHash": "sha256-F7thesZPvAMSwjRu0K8uFshTk3ZZSNAsXTIFvXBT+34=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "62c435d93bf046a5396f3016472e8f7c8e2aed65", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixpkgs-empyrean": { "locked": { "lastModified": 1732981179, @@ -183,9 +183,9 @@ "flake-compat": "flake-compat", "intake": "intake", "intake-sources": "intake-sources", - "nixpkgs-2405": "nixpkgs-2405", "nixpkgs-2411": "nixpkgs-2411", "nixpkgs-backyard": "nixpkgs-backyard", + "nixpkgs-catacomb": "nixpkgs-catacomb", "nixpkgs-empyrean": "nixpkgs-empyrean", "nixpkgs-unfolder": "nixpkgs-unfolder", "nixpkgs-unstable": "nixpkgs-unstable" diff --git a/flake.nix b/flake.nix index 846fcb4..57cd3ae 100644 --- a/flake.nix +++ b/flake.nix @@ -1,8 +1,8 @@ { inputs = { - nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05"; nixpkgs-2411.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-backyard.url = "github:NixOS/nixpkgs/nixos-24.11"; + nixpkgs-catacomb.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-empyrean.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unfolder.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; @@ -23,9 +23,9 @@ outputs = { self, - nixpkgs-2405, nixpkgs-2411, nixpkgs-backyard, + nixpkgs-catacomb, nixpkgs-empyrean, nixpkgs-unfolder, nixpkgs-unstable, @@ -47,7 +47,7 @@ ./machine/backyard ]; }; - catacomb = nixpkgs-2405.lib.nixosSystem { + catacomb = nixpkgs-catacomb.lib.nixosSystem { system = "aarch64-linux"; modules = [ self.nixosModules.beatific diff --git a/machine/catacomb/default.nix b/machine/catacomb/default.nix index 032ad88..af4b6f7 100644 --- a/machine/catacomb/default.nix +++ b/machine/catacomb/default.nix @@ -38,8 +38,8 @@ }; wireless = { enable = true; - networks."mysterious humming noise".psk = "@MHN_PSK@"; - environmentFile = "/root/wifi.env"; + networks."mysterious humming noise".pskRaw = "ext:MHN_PSK"; + secretsFile = "/root/wifi.env"; }; };