diff options
| -rw-r--r-- | flake.lock | 83 | ||||
| -rw-r--r-- | flake.nix | 3 | ||||
| -rw-r--r-- | lib/mk_system.nix | 5 |
3 files changed, 84 insertions, 7 deletions
diff --git a/flake.lock b/flake.lock index f24c22e..190ca0f 100644 --- a/flake.lock +++ b/flake.lock @@ -1,5 +1,28 @@ { "nodes": { + "colmena": { + "inputs": { + "flake-compat": "flake-compat", + "flake-utils": "flake-utils", + "nixpkgs": [ + "unstable" + ], + "stable": "stable" + }, + "locked": { + "lastModified": 1699171528, + "narHash": "sha256-ZsN6y+tgN5w84oAqRQpMhIvQM39ZNSZoZvn2AK0QYr4=", + "owner": "zhaofengli", + "repo": "colmena", + "rev": "665603956a1c3040d756987bc7a810ffe86a3b15", + "type": "github" + }, + "original": { + "owner": "zhaofengli", + "repo": "colmena", + "type": "github" + } + }, "crane": { "inputs": { "nixpkgs": [ @@ -24,6 +47,22 @@ "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-compat_2": { + "flake": false, + "locked": { "lastModified": 1696426674, "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", "owner": "edolstra", @@ -98,6 +137,21 @@ } }, "flake-utils": { + "locked": { + "lastModified": 1659877975, + "narHash": "sha256-zllb8aq3YO3h8B/U0/J1WBgAL8EX5yWf5pMj3G0NAmc=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "c0e246b9b83f637f4681389ecabcb2681b4f3af0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, + "flake-utils_2": { "inputs": { "systems": "systems" }, @@ -115,7 +169,7 @@ "type": "github" } }, - "flake-utils_2": { + "flake-utils_3": { "inputs": { "systems": "systems_2" }, @@ -133,7 +187,7 @@ "type": "github" } }, - "flake-utils_3": { + "flake-utils_4": { "inputs": { "systems": "systems_3" }, @@ -154,7 +208,7 @@ "helix": { "inputs": { "crane": "crane", - "flake-utils": "flake-utils", + "flake-utils": "flake-utils_2", "nixpkgs": [ "unstable" ], @@ -235,7 +289,7 @@ }, "neovim-flake": { "inputs": { - "flake-utils": "flake-utils_2", + "flake-utils": "flake-utils_3", "nixpkgs": [ "neovim-nightly", "nixpkgs" @@ -259,7 +313,7 @@ }, "neovim-nightly": { "inputs": { - "flake-compat": "flake-compat", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", "hercules-ci-effects": "hercules-ci-effects", "neovim-flake": "neovim-flake", @@ -385,6 +439,7 @@ }, "root": { "inputs": { + "colmena": "colmena", "helix": "helix", "home-manager": "home-manager", "impermanence": "impermanence", @@ -401,7 +456,7 @@ }, "rust": { "inputs": { - "flake-utils": "flake-utils_3", + "flake-utils": "flake-utils_4", "nixpkgs": [ "unstable" ] @@ -441,6 +496,22 @@ "type": "github" } }, + "stable": { + "locked": { + "lastModified": 1696039360, + "narHash": "sha256-g7nIUV4uq1TOVeVIDEZLb005suTWCUjSY0zYOlSBsyE=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "32dcb45f66c0487e92db8303a798ebc548cadedc", + "type": "github" + }, + "original": { + "owner": "NixOS", + "ref": "nixos-23.05", + "repo": "nixpkgs", + "type": "github" + } + }, "systems": { "locked": { "lastModified": 1681028828, diff --git a/flake.nix b/flake.nix index bcfc778..57472d0 100644 --- a/flake.nix +++ b/flake.nix @@ -10,6 +10,9 @@ home-manager.url = "github:nix-community/home-manager"; home-manager.inputs.nixpkgs.follows = "unstable"; + colmena.url = "github:zhaofengli/colmena"; + colmena.inputs.nixpkgs.follows = "unstable"; + nur.url = "github:nix-community/NUR"; impermanence.url = "github:nix-community/impermanence"; diff --git a/lib/mk_system.nix b/lib/mk_system.nix index ff51fef..70149fe 100644 --- a/lib/mk_system.nix +++ b/lib/mk_system.nix @@ -1,4 +1,4 @@ -{ self, unstable, ... } @ args: +{ self, unstable, colmena, ... } @ args: { mkSystem = { name, nixpkgs ? unstable, system ? "x86_64-linux", overlays ? null, extraModules ? null }: nixpkgs.lib.nixosSystem ( @@ -27,6 +27,9 @@ ../modules/nixpkgs.nix ] ++ nixpkgs.lib.optional (overlays != null) { nixpkgs.overlays = overlays; } ++ nixpkgs.lib.optionals (extraModules != null) extraModules; + + # let deployment options to be set without breaking eval on nixosConfigurations + extraModules = [ colmena.nixosModules.deploymentOptions ]; } ); |