catacomb: upgrade to 24.11

This commit is contained in:
Tim Van Baak 2024-12-02 02:30:18 +00:00
parent 39f0b6cd64
commit 23664415b9
3 changed files with 22 additions and 22 deletions

34
flake.lock generated
View File

@ -82,22 +82,6 @@
"type": "github" "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": { "nixpkgs-2411": {
"locked": { "locked": {
"lastModified": 1732350895, "lastModified": 1732350895,
@ -130,6 +114,22 @@
"type": "github" "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": { "nixpkgs-empyrean": {
"locked": { "locked": {
"lastModified": 1732981179, "lastModified": 1732981179,
@ -183,9 +183,9 @@
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"intake": "intake", "intake": "intake",
"intake-sources": "intake-sources", "intake-sources": "intake-sources",
"nixpkgs-2405": "nixpkgs-2405",
"nixpkgs-2411": "nixpkgs-2411", "nixpkgs-2411": "nixpkgs-2411",
"nixpkgs-backyard": "nixpkgs-backyard", "nixpkgs-backyard": "nixpkgs-backyard",
"nixpkgs-catacomb": "nixpkgs-catacomb",
"nixpkgs-empyrean": "nixpkgs-empyrean", "nixpkgs-empyrean": "nixpkgs-empyrean",
"nixpkgs-unfolder": "nixpkgs-unfolder", "nixpkgs-unfolder": "nixpkgs-unfolder",
"nixpkgs-unstable": "nixpkgs-unstable" "nixpkgs-unstable": "nixpkgs-unstable"

View File

@ -1,8 +1,8 @@
{ {
inputs = { inputs = {
nixpkgs-2405.url = "github:NixOS/nixpkgs/nixos-24.05";
nixpkgs-2411.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-2411.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-backyard.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-empyrean.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unfolder.url = "github:NixOS/nixpkgs/nixos-24.11"; nixpkgs-unfolder.url = "github:NixOS/nixpkgs/nixos-24.11";
nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable";
@ -23,9 +23,9 @@
outputs = { outputs = {
self, self,
nixpkgs-2405,
nixpkgs-2411, nixpkgs-2411,
nixpkgs-backyard, nixpkgs-backyard,
nixpkgs-catacomb,
nixpkgs-empyrean, nixpkgs-empyrean,
nixpkgs-unfolder, nixpkgs-unfolder,
nixpkgs-unstable, nixpkgs-unstable,
@ -47,7 +47,7 @@
./machine/backyard ./machine/backyard
]; ];
}; };
catacomb = nixpkgs-2405.lib.nixosSystem { catacomb = nixpkgs-catacomb.lib.nixosSystem {
system = "aarch64-linux"; system = "aarch64-linux";
modules = [ modules = [
self.nixosModules.beatific self.nixosModules.beatific

View File

@ -38,8 +38,8 @@
}; };
wireless = { wireless = {
enable = true; enable = true;
networks."mysterious humming noise".psk = "@MHN_PSK@"; networks."mysterious humming noise".pskRaw = "ext:MHN_PSK";
environmentFile = "/root/wifi.env"; secretsFile = "/root/wifi.env";
}; };
}; };