Compare commits
	
		
			4 commits
		
	
	
		
			ee7ccef96c
			...
			1eaa7d2287
		
	
	| Author | SHA1 | Date | |
|---|---|---|---|
| 1eaa7d2287 | |||
| f51721aae1 | |||
| c3f990478c | |||
| 3b5348edc3 | 
					 5 changed files with 64 additions and 130 deletions
				
			
		|  | @ -26,6 +26,7 @@ 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: | 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 | * `--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) | * `--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 | ### Updating | ||||||
| 
 | 
 | ||||||
|  |  | ||||||
							
								
								
									
										172
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										172
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							|  | @ -7,11 +7,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1730687397, |         "lastModified": 1733551027, | ||||||
|         "narHash": "sha256-xluSdua/nB7BVpSx7C3PY5XJOsr9x0IsUwuVHJFpJ+Y=", |         "narHash": "sha256-nlZWAq4E+cNywCuxpnYcyky4fd+8bVzJHrS2e8QTtVs=", | ||||||
|         "ref": "main", |         "ref": "main", | ||||||
|         "rev": "32894dcff264ee50e56f58130ac59bd86a7afb45", |         "rev": "7f041ffa7f204deb0fc2e36908b382804f2e108d", | ||||||
|         "revCount": 17, |         "revCount": 18, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.xeno.science/xenofem/actual-nix" |         "url": "https://git.xeno.science/xenofem/actual-nix" | ||||||
|       }, |       }, | ||||||
|  | @ -24,7 +24,7 @@ | ||||||
|     "agenix": { |     "agenix": { | ||||||
|       "inputs": { |       "inputs": { | ||||||
|         "darwin": [], |         "darwin": [], | ||||||
|         "home-manager": "home-manager", |         "home-manager": [], | ||||||
|         "nixpkgs": [ |         "nixpkgs": [ | ||||||
|           "nixpkgs" |           "nixpkgs" | ||||||
|         ], |         ], | ||||||
|  | @ -46,36 +46,36 @@ | ||||||
|     }, |     }, | ||||||
|     "birdsong": { |     "birdsong": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1730835703, |         "lastModified": 1731357158, | ||||||
|         "narHash": "sha256-VQWyAU+Nyh2a7jQlbn4my5XBE/OgiYKSBfRpPy7GMwg=", |         "narHash": "sha256-RTFqn8DTPXEvkrhMuOODv198z9a0H96mlg4lrc2dplQ=", | ||||||
|         "ref": "main", |         "ref": "compat-24.11", | ||||||
|         "rev": "ffe25bd95a49d6595edec6caa432703a48b7a8fd", |         "rev": "fa0f559d3b41d5fff49ef081f95830270b4662ae", | ||||||
|         "revCount": 12, |         "revCount": 13, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.qenya.tel/qenya/birdsong" |         "url": "https://git.qenya.tel/qenya/birdsong" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "ref": "main", |         "ref": "compat-24.11", | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.qenya.tel/qenya/birdsong" |         "url": "https://git.qenya.tel/qenya/birdsong" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "colmena": { |     "colmena": { | ||||||
|       "inputs": { |       "inputs": { | ||||||
|         "flake-compat": "flake-compat", |         "flake-compat": [], | ||||||
|         "flake-utils": "flake-utils", |         "flake-utils": "flake-utils", | ||||||
|         "nix-github-actions": "nix-github-actions", |         "nix-github-actions": [], | ||||||
|         "nixpkgs": [ |         "nixpkgs": [ | ||||||
|           "nixpkgs" |           "nixpkgs" | ||||||
|         ], |         ], | ||||||
|         "stable": "stable" |         "stable": [] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731527002, |         "lastModified": 1734897875, | ||||||
|         "narHash": "sha256-dI9I6suECoIAmbS4xcrqF8r2pbmed8WWm5LIF1yWPw8=", |         "narHash": "sha256-LLpiqfOGBippRax9F33kSJ/Imt8gJXb6o0JwSBiNHCk=", | ||||||
|         "owner": "zhaofengli", |         "owner": "zhaofengli", | ||||||
|         "repo": "colmena", |         "repo": "colmena", | ||||||
|         "rev": "e3ad42138015fcdf2524518dd564a13145c72ea1", |         "rev": "a6b51f5feae9bfb145daa37fd0220595acb7871e", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -84,22 +84,6 @@ | ||||||
|         "type": "github" |         "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": { |     "flake-utils": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1659877975, |         "lastModified": 1659877975, | ||||||
|  | @ -151,20 +135,20 @@ | ||||||
|     "home-manager": { |     "home-manager": { | ||||||
|       "inputs": { |       "inputs": { | ||||||
|         "nixpkgs": [ |         "nixpkgs": [ | ||||||
|           "agenix", |  | ||||||
|           "nixpkgs" |           "nixpkgs" | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1703113217, |         "lastModified": 1734366194, | ||||||
|         "narHash": "sha256-7ulcXOk63TIT2lVDSExj7XzFx09LpdSAPtvgtM7yQPE=", |         "narHash": "sha256-vykpJ1xsdkv0j8WOVXrRFHUAdp9NXHpxdnn1F4pYgSw=", | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|         "repo": "home-manager", |         "repo": "home-manager", | ||||||
|         "rev": "3bfaacf46133c037bb356193bd2f1765d9dc82c1", |         "rev": "80b0fdf483c5d1cb75aaad909bd390d48673857f", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|  |         "ref": "release-24.11", | ||||||
|         "repo": "home-manager", |         "repo": "home-manager", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       } |       } | ||||||
|  | @ -176,11 +160,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731604581, |         "lastModified": 1735053786, | ||||||
|         "narHash": "sha256-Qq2YZZaDTB3FZLWU/Hgh1uuWlUBl3cMLGB99bm7rFUM=", |         "narHash": "sha256-Gm+0DcbUS338vvkwyYWms5jsWlx8z8MeQBzcnIDuIkw=", | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|         "repo": "home-manager", |         "repo": "home-manager", | ||||||
|         "rev": "1d0862ee2d7c6f6cd720d6f32213fa425004be10", |         "rev": "35b98d20ca8f4ca1f6a2c30b8a2c8bb305a36d84", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -189,27 +173,6 @@ | ||||||
|         "type": "github" |         "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": { |     "lix": { | ||||||
|       "flake": false, |       "flake": false, | ||||||
|       "locked": { |       "locked": { | ||||||
|  | @ -234,11 +197,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1729360442, |         "lastModified": 1732605668, | ||||||
|         "narHash": "sha256-6U0CyPycIBc04hbYy2hBINnVso58n/ZyywY2BD3hu+s=", |         "narHash": "sha256-DN5/166jhiiAW0Uw6nueXaGTueVxhfZISAkoxasmz/g=", | ||||||
|         "ref": "stable", |         "ref": "stable", | ||||||
|         "rev": "2bbdcd73b9a464f8acf45a7100feb979883ba485", |         "rev": "96824d606a6656650bbe436366bc89d5ee3a6573", | ||||||
|         "revCount": 110, |         "revCount": 113, | ||||||
|         "type": "git", |         "type": "git", | ||||||
|         "url": "https://git.lix.systems/lix-project/nixos-module" |         "url": "https://git.lix.systems/lix-project/nixos-module" | ||||||
|       }, |       }, | ||||||
|  | @ -248,66 +211,45 @@ | ||||||
|         "url": "https://git.lix.systems/lix-project/nixos-module" |         "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": { |     "nixpkgs": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731386116, |         "lastModified": 1734875076, | ||||||
|         "narHash": "sha256-lKA770aUmjPHdTaJWnP3yQ9OI1TigenUqVC3wweqZuI=", |         "narHash": "sha256-Pzyb+YNG5u3zP79zoi8HXYMs15Q5dfjDgwCdUI5B0nY=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "689fed12a013f56d4c4d3f612489634267d86529", |         "rev": "1807c2b91223227ad5599d7067a61665c52d1295", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "ref": "nixos-24.05", |         "ref": "nixos-24.11", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "nixpkgs-small": { |     "nixpkgs-small": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731663789, |         "lastModified": 1735061823, | ||||||
|         "narHash": "sha256-x07g4NcqGP6mQn6AISXJaks9sQYDjZmTMBlKIvajvyc=", |         "narHash": "sha256-mQbroPNNGpJmE5OQSxZe9mQtoO0zoSWGofXtF/nytn4=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "035d434d48f4375ac5d3a620954cf5fda7dd7c36", |         "rev": "7fb8b8de039a0269c26f79129260cc029473d576", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "ref": "nixos-24.05-small", |         "ref": "nixos-24.11-small", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       } |       } | ||||||
|     }, |     }, | ||||||
|     "nixpkgs-unstable": { |     "nixpkgs-unstable": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731319897, |         "lastModified": 1734649271, | ||||||
|         "narHash": "sha256-PbABj4tnbWFMfBp6OcUK5iGy1QY+/Z96ZcLpooIbuEI=", |         "narHash": "sha256-4EVBRhOjMDuGtMaofAIqzJbg4Ql7Ai0PSeuVZTHjyKQ=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "dc460ec76cbff0e66e269457d7b728432263166c", |         "rev": "d70bd19e0a38ad4790d3913bf08fcbfc9eeca507", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -319,11 +261,11 @@ | ||||||
|     }, |     }, | ||||||
|     "nixpkgs-unstable-small": { |     "nixpkgs-unstable-small": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731701941, |         "lastModified": 1735053414, | ||||||
|         "narHash": "sha256-IV3fk1IY1fg+S8hQJ9Nbvv91s77LnMSxBc/fBkHOuO0=", |         "narHash": "sha256-m4CnYqYu5EK18Nl52gYkPUz+S/AIFIUTJM23bGoKoXQ=", | ||||||
|         "owner": "NixOS", |         "owner": "NixOS", | ||||||
|         "repo": "nixpkgs", |         "repo": "nixpkgs", | ||||||
|         "rev": "effe68307bf3d891d069293b88a0d8910276b2bb", |         "rev": "e905913c43d0547a131ca9c7917fa9089b627e01", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -358,11 +300,11 @@ | ||||||
|         ] |         ] | ||||||
|       }, |       }, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731193165, |         "lastModified": 1735049224, | ||||||
|         "narHash": "sha256-pGF8L5g9QpkQtJP9JmNIRNZfcyhJHf7uT+d8tqI1h6Y=", |         "narHash": "sha256-fWUd9kyXdepphJ7cCzOsuSo7l0kbFCkUqfgKqZyFZzE=", | ||||||
|         "owner": "nix-community", |         "owner": "nix-community", | ||||||
|         "repo": "plasma-manager", |         "repo": "plasma-manager", | ||||||
|         "rev": "f33173b9d22e554a6f869626bc01808d35995257", |         "rev": "d16bbded0ae452bc088489e7dca3ef58d8d1830b", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -374,11 +316,11 @@ | ||||||
|     "randomcat": { |     "randomcat": { | ||||||
|       "flake": false, |       "flake": false, | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1731631186, |         "lastModified": 1735061438, | ||||||
|         "narHash": "sha256-c9gcJdAp7MXeCYcjPNadYPpRY+bBhCPhxG1VVs8j8Co=", |         "narHash": "sha256-k8fVnM7c8p5eJJTS+8cyI5/lo8m/NPieQLtnhYLdgqY=", | ||||||
|         "owner": "randomnetcat", |         "owner": "randomnetcat", | ||||||
|         "repo": "nix-configs", |         "repo": "nix-configs", | ||||||
|         "rev": "3ef27a946f220e7ef45733e315f61646e13ef0e8", |         "rev": "21b3f66c1a7bd94c3f00e12c0b80b53aeab69c25", | ||||||
|         "type": "github" |         "type": "github" | ||||||
|       }, |       }, | ||||||
|       "original": { |       "original": { | ||||||
|  | @ -393,7 +335,7 @@ | ||||||
|         "agenix": "agenix", |         "agenix": "agenix", | ||||||
|         "birdsong": "birdsong", |         "birdsong": "birdsong", | ||||||
|         "colmena": "colmena", |         "colmena": "colmena", | ||||||
|         "home-manager": "home-manager_2", |         "home-manager": "home-manager", | ||||||
|         "home-manager-unstable": "home-manager-unstable", |         "home-manager-unstable": "home-manager-unstable", | ||||||
|         "lix-module": "lix-module", |         "lix-module": "lix-module", | ||||||
|         "nixpkgs": "nixpkgs", |         "nixpkgs": "nixpkgs", | ||||||
|  | @ -405,22 +347,6 @@ | ||||||
|         "randomcat": "randomcat" |         "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": { |     "systems": { | ||||||
|       "locked": { |       "locked": { | ||||||
|         "lastModified": 1681028828, |         "lastModified": 1681028828, | ||||||
|  |  | ||||||
							
								
								
									
										19
									
								
								flake.nix
									
										
									
									
									
								
							
							
						
						
									
										19
									
								
								flake.nix
									
										
									
									
									
								
							|  | @ -1,7 +1,7 @@ | ||||||
| { | { | ||||||
|   inputs = { |   inputs = { | ||||||
|     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.05"; |     nixpkgs.url = "github:NixOS/nixpkgs/nixos-24.11"; | ||||||
|     nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-24.05-small"; |     nixpkgs-small.url = "github:NixOS/nixpkgs/nixos-24.11-small"; | ||||||
|     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; |     nixpkgs-unstable.url = "github:NixOS/nixpkgs/nixos-unstable"; | ||||||
|     nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; |     nixpkgs-unstable-small.url = "github:NixOS/nixpkgs/nixos-unstable-small"; | ||||||
| 
 | 
 | ||||||
|  | @ -11,7 +11,7 @@ | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     home-manager = { |     home-manager = { | ||||||
|       url = "github:nix-community/home-manager/release-24.05"; |       url = "github:nix-community/home-manager/release-24.11"; | ||||||
|       inputs.nixpkgs.follows = "nixpkgs"; |       inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|  | @ -33,11 +33,15 @@ | ||||||
|       url = "github:ryantm/agenix"; |       url = "github:ryantm/agenix"; | ||||||
|       inputs.nixpkgs.follows = "nixpkgs"; |       inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|       inputs.darwin.follows = ""; |       inputs.darwin.follows = ""; | ||||||
|  |       inputs.home-manager.follows = ""; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     colmena = { |     colmena = { | ||||||
|       url = "github:zhaofengli/colmena"; |       url = "github:zhaofengli/colmena"; | ||||||
|       inputs.nixpkgs.follows = "nixpkgs"; |       inputs.nixpkgs.follows = "nixpkgs"; | ||||||
|  |       inputs.stable.follows = ""; | ||||||
|  |       inputs.nix-github-actions.follows = ""; | ||||||
|  |       inputs.flake-compat.follows = ""; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     randomcat = { |     randomcat = { | ||||||
|  | @ -52,12 +56,13 @@ | ||||||
|       inputs.nixpkgs.follows = "nixpkgs-unstable"; |       inputs.nixpkgs.follows = "nixpkgs-unstable"; | ||||||
|     }; |     }; | ||||||
| 
 | 
 | ||||||
|     birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=main"; |     birdsong.url = "git+https://git.qenya.tel/qenya/birdsong?ref=compat-24.11"; | ||||||
|   }; |   }; | ||||||
| 
 | 
 | ||||||
|   outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: { |   outputs = inputs@{ self, nixpkgs, nixpkgs-small, lix-module, home-manager, plasma-manager, nur, agenix, colmena, randomcat, actual, birdsong, ... }: { | ||||||
|     nixosConfigurations = (colmena.lib.makeHive self.outputs.colmena).nodes; |     nixosConfigurations = self.outputs.colmenaHive.nodes; | ||||||
| 
 |     colmenaHive = colmena.lib.makeHive self.outputs.colmena; | ||||||
|  |      | ||||||
|     # The name of this output type is not standardised. I have picked |     # The name of this output type is not standardised. I have picked | ||||||
|     # "homeManagerModules" as the discussion here suggests it's the most common: |     # "homeManagerModules" as the discussion here suggests it's the most common: | ||||||
|     # https://github.com/nix-community/home-manager/issues/1783 |     # https://github.com/nix-community/home-manager/issues/1783 | ||||||
|  | @ -125,7 +130,7 @@ | ||||||
|       in |       in | ||||||
|       pkgs.mkShell { |       pkgs.mkShell { | ||||||
|         packages = [ |         packages = [ | ||||||
|           pkgs.colmena |           colmena.packages.${system}.colmena | ||||||
|           agenix.packages.${system}.default |           agenix.packages.${system}.default | ||||||
|           plasma-manager.packages.${system}.rc2nix |           plasma-manager.packages.${system}.rc2nix | ||||||
|         ]; |         ]; | ||||||
|  |  | ||||||
|  | @ -19,6 +19,7 @@ | ||||||
|     keyFile = "/etc/ssh/ssh_host_ed25519_key"; |     keyFile = "/etc/ssh/ssh_host_ed25519_key"; | ||||||
|     builders = [ "kilgharrah" ]; |     builders = [ "kilgharrah" ]; | ||||||
|   }; |   }; | ||||||
|  |   nix.settings.max-jobs = 0; | ||||||
| 
 | 
 | ||||||
|   randomcat.services.zfs.datasets = { |   randomcat.services.zfs.datasets = { | ||||||
|     "rpool_orm/state" = { mountpoint = "none"; }; |     "rpool_orm/state" = { mountpoint = "none"; }; | ||||||
|  |  | ||||||
|  | @ -22,6 +22,7 @@ | ||||||
|     keyFile = "/etc/ssh/ssh_host_ed25519_key"; |     keyFile = "/etc/ssh/ssh_host_ed25519_key"; | ||||||
|     builders = [ "kilgharrah" ]; |     builders = [ "kilgharrah" ]; | ||||||
|   }; |   }; | ||||||
|  |   nix.settings.max-jobs = 0; | ||||||
| 
 | 
 | ||||||
|   randomcat.services.zfs.datasets = { |   randomcat.services.zfs.datasets = { | ||||||
|     "rpool/state" = { mountpoint = "none"; }; |     "rpool/state" = { mountpoint = "none"; }; | ||||||
|  |  | ||||||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue