diff --git a/README.md b/README.md index 26aea1d..35cb589 100644 --- a/README.md +++ b/README.md @@ -26,7 +26,6 @@ To build locally, run `nixos-rebuild switch --flake .#[hostname]` as root. To build the remote machines, run `colmena apply`. See the [colmena documentation](https://colmena.cli.rs/) for command-line options. Notable options include: * `--on [hostname]`: build a specific machine only * `--reboot`: reboot after building (but note [this bug](https://github.com/zhaofengli/colmena/issues/166) means it may hang even when the reboot completes successfully) -* `--experimental-flake-eval`: currently necessary to build at all. See [here](https://github.com/zhaofengli/colmena/pull/228) ### Updating diff --git a/flake.lock b/flake.lock index 37cca72..8f7fd71 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1733551027, - "narHash": "sha256-nlZWAq4E+cNywCuxpnYcyky4fd+8bVzJHrS2e8QTtVs=", + "lastModified": 1730687397, + "narHash": "sha256-xluSdua/nB7BVpSx7C3PY5XJOsr9x0IsUwuVHJFpJ+Y=", "ref": "main", - "rev": "7f041ffa7f204deb0fc2e36908b382804f2e108d", - "revCount": 18, + "rev": "32894dcff264ee50e56f58130ac59bd86a7afb45", + "revCount": 17, "type": "git", "url": "https://git.xeno.science/xenofem/actual-nix" }, @@ -24,7 +24,7 @@ "agenix": { "inputs": { "darwin": [], - "home-manager": [], + "home-manager": "home-manager", "nixpkgs": [ "nixpkgs" ], @@ -46,36 +46,36 @@ }, "birdsong": { "locked": { - "lastModified": 1731357158, - "narHash": "sha256-RTFqn8DTPXEvkrhMuOODv198z9a0H96mlg4lrc2dplQ=", - "ref": "compat-24.11", - "rev": "fa0f559d3b41d5fff49ef081f95830270b4662ae", - "revCount": 13, + "lastModified": 1730835703, + "narHash": "sha256-VQWyAU+Nyh2a7jQlbn4my5XBE/OgiYKSBfRpPy7GMwg=", + "ref": "main", + "rev": "ffe25bd95a49d6595edec6caa432703a48b7a8fd", + "revCount": 12, "type": "git", "url": "https://git.qenya.tel/qenya/birdsong" }, "original": { - "ref": "compat-24.11", + "ref": "main", "type": "git", "url": "https://git.qenya.tel/qenya/birdsong" } }, "colmena": { "inputs": { - "flake-compat": [], + "flake-compat": "flake-compat", "flake-utils": "flake-utils", - "nix-github-actions": [], + "nix-github-actions": "nix-github-actions", "nixpkgs": [ "nixpkgs" ], - "stable": [] + "stable": "stable" }, "locked": { - "lastModified": 1734897875, - "narHash": "sha256-LLpiqfOGBippRax9F33kSJ/Imt8gJXb6o0JwSBiNHCk=", + "lastModified": 1731527002, + "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=", "owner": "zhaofengli", "repo": "colmena", - "rev": "a6b51f5feae9bfb145daa37fd0220595acb7871e", + "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1", "type": "github" }, "original": { @@ -84,6 +84,22 @@ "type": "github" } }, + "flake-compat": { + "flake": false, + "locked": { + "lastModified": 1650374568, + "narHash": "sha256-Z+s0J8/r907g149rllvwhb4pKi8Wam5ij0st8PwAh+E=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "b4a34015c698c7793d592d66adbab377907a2be8", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-utils": { "locked": { "lastModified": 1659877975, @@ -135,20 +151,20 @@ "home-manager": { "inputs": { "nixpkgs": [ + "agenix", "nixpkgs" ] }, "locked": { - "lastModified": 1734366194, - "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", + "lastModified": 1703113217, + "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", "owner": "nix-community", "repo": "home-manager", - "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", + "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", "type": "github" }, "original": { "owner": "nix-community", - "ref": "release-24.11", "repo": "home-manager", "type": "github" } @@ -160,11 +176,11 @@ ] }, "locked": { - "lastModified": 1735053786, - "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", + "lastModified": 1731604581, + "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", "owner": "nix-community", "repo": "home-manager", - "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", + "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", "type": "github" }, "original": { @@ -173,6 +189,27 @@ "type": "github" } }, + "home-manager_2": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1726989464, + "narHash": "sha256-Vl+WVTJwutXkimwGprnEtXc/s/s8sMuXzqXaspIGlwM=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "2f23fa308a7c067e52dfcc30a0758f47043ec176", + "type": "github" + }, + "original": { + "owner": "nix-community", + "ref": "release-24.05", + "repo": "home-manager", + "type": "github" + } + }, "lix": { "flake": false, "locked": { @@ -197,11 +234,11 @@ ] }, "locked": { - "lastModified": 1732605668, - "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", + "lastModified": 1729360442, + "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", "ref": "stable", - "rev": "96824d606a6656650bbe436366bc89d5ee3a6573", - "revCount": 113, + "rev": "2bbdcd73b9a464f8acf45a7100feb979883ba485", + "revCount": 110, "type": "git", "url": "https://git.lix.systems/lix-project/nixos-module" }, @@ -211,45 +248,66 @@ "url": "https://git.lix.systems/lix-project/nixos-module" } }, + "nix-github-actions": { + "inputs": { + "nixpkgs": [ + "colmena", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1729742964, + "narHash": "sha256-B4mzTcQ0FZHdpeWcpDYPERtyjJd/NIuaQ9+BV1h+MpA=", + "owner": "nix-community", + "repo": "nix-github-actions", + "rev": "e04df33f62cdcf93d73e9a04142464753a16db67", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "nix-github-actions", + "type": "github" + } + }, "nixpkgs": { "locked": { - "lastModified": 1734875076, - "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", + "lastModified": 1731386116, + "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1807c2b91223227ad5599d7067a61665c52d1295", + "rev": "689fed12a013f56d4c4d3f612489634267d86529", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11", + "ref": "nixos-24.05", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-small": { "locked": { - "lastModified": 1735061823, - "narHash": "sha256-mQbroPNNGpJmE5OQSxZe9mQtoO0zoSWGofXtF/nytn4=", + "lastModified": 1731663789, + "narHash": "sha256-x07g4NcqGP6mQn6AISXJaks9sQYDjZmTMBlKIvajvyc=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "7fb8b8de039a0269c26f79129260cc029473d576", + "rev": "035d434d48f4375ac5d3a620954cf5fda7dd7c36", "type": "github" }, "original": { "owner": "NixOS", - "ref": "nixos-24.11-small", + "ref": "nixos-24.05-small", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-unstable": { "locked": { - "lastModified": 1734649271, - "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", + "lastModified": 1731319897, + "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", + "rev": "dc460ec76cbff0e66e269457d7b728432263166c", "type": "github" }, "original": { @@ -261,11 +319,11 @@ }, "nixpkgs-unstable-small": { "locked": { - "lastModified": 1735053414, - "narHash": "sha256-m4CnYqYu5EK18Nl52gYkPUz+S/AIFIUTJM23bGoKoXQ=", + "lastModified": 1731701941, + "narHash": "sha256-IV3fk1IY1fg+S8hQJ9Nbvv91s77LnMSxBc/fBkHOuO0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "e905913c43d0547a131ca9c7917fa9089b627e01", + "rev": "effe68307bf3d891d069293b88a0d8910276b2bb", "type": "github" }, "original": { @@ -300,11 +358,11 @@ ] }, "locked": { - "lastModified": 1735049224, - "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=", + "lastModified": 1731193165, + "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", "owner": "nix-community", "repo": "plasma-manager", - "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b", + "rev": "f33173b9d22e554a6f869626bc01808d35995257", "type": "github" }, "original": { @@ -316,11 +374,11 @@ "randomcat": { "flake": false, "locked": { - "lastModified": 1735061438, - "narHash": "sha256-k8fVnM7c8p5eJJTS+8cyI5/lo8m/NPieQLtnhYLdgqY=", + "lastModified": 1731631186, + "narHash": "sha256-c9gcJdAp7MXeCYcjPNadYPpRY+bBhCPhxG1VVs8j8Co=", "owner": "randomnetcat", "repo": "nix-configs", - "rev": "21b3f66c1a7bd94c3f00e12c0b80b53aeab69c25", + "rev": "3ef27a946f220e7ef45733e315f61646e13ef0e8", "type": "github" }, "original": { @@ -335,7 +393,7 @@ "agenix": "agenix", "birdsong": "birdsong", "colmena": "colmena", - "home-manager": "home-manager", + "home-manager": "home-manager_2", "home-manager-unstable": "home-manager-unstable", "lix-module": "lix-module", "nixpkgs": "nixpkgs", @@ -347,6 +405,22 @@ "randomcat": "randomcat" } }, + "stable": { + "locked": { + "lastModified": 1730883749, + "narHash": "sha256-mwrFF0vElHJP8X3pFCByJR365Q2463ATp2qGIrDUdlE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "dba414932936fde69f0606b4f1d87c5bc0003ede", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-24.05", + "repo": "nixpkgs", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index 66cace4..8e857d8 100644 --- a/flake.nix +++ b/flake.nix @@ -1,7 +1,7 @@ { inputs = { - nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; - nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-24.11-small"; + nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; + nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-24.05-small"; nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; @@ -11,7 +11,7 @@ }; home-manager = { - url = "github:nix-community/home-manager/release-24.11"; + url = "github:nix-community/home-manager/release-24.05"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -33,15 +33,11 @@ url = "github:ryantm/agenix"; inputs.nixpkgs.follows = "nixpkgs"; inputs.darwin.follows = ""; - inputs.home-manager.follows = ""; }; colmena = { url = "github:zhaofengli/colmena"; inputs.nixpkgs.follows = "nixpkgs"; - inputs.stable.follows = ""; - inputs.nix-github-actions.follows = ""; - inputs.flake-compat.follows = ""; }; randomcat = { @@ -56,13 +52,12 @@ inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=compat-24.11"; + birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main"; }; outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: { - nixosConfigurations = self.outputs.colmenaHive.nodes; - colmenaHive = colmena.lib.makeHive self.outputs.colmena; - + nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes; + # The name of this output type is not standardised. I have picked # "homeManagerModules" as the discussion here suggests it's the most common: # https://github.com/nix-community/home-manager/issues/1783 @@ -130,7 +125,7 @@ in pkgs.mkShell { packages = [ - colmena.packages.${system}.colmena + pkgs.colmena agenix.packages.${system}.default plasma-manager.packages.${system}.rc2nix ]; diff --git a/hosts/orm/default.nix b/hosts/orm/default.nix index 30f0d69..dc42041 100644 --- a/hosts/orm/default.nix +++ b/hosts/orm/default.nix @@ -19,7 +19,6 @@ keyFile = "/etc/ssh/ssh_host_ed25519_key"; builders = [ "kilgharrah" ]; }; - nix.settings.max-jobs = 0; randomcat.services.zfs.datasets = { "rpool_orm/state" = { mountpoint = "none"; }; diff --git a/hosts/yevaud/default.nix b/hosts/yevaud/default.nix index 288b560..d17f0a3 100644 --- a/hosts/yevaud/default.nix +++ b/hosts/yevaud/default.nix @@ -22,7 +22,6 @@ keyFile = "/etc/ssh/ssh_host_ed25519_key"; builders = [ "kilgharrah" ]; }; - nix.settings.max-jobs = 0; randomcat.services.zfs.datasets = { "rpool/state" = { mountpoint = "none"; };