From 0fb6031f25f2594cf23d6637a303b7234d86f6bc Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Sun, 14 Jan 2024 22:16:28 -0700 Subject: [PATCH] Move laptop to unstable branch --- flake.lock | 24 ++++++++++++++++++++---- flake.nix | 19 +++++++++++-------- 2 files changed, 31 insertions(+), 12 deletions(-) diff --git a/flake.lock b/flake.lock index 3585f29..8de3ec2 100644 --- a/flake.lock +++ b/flake.lock @@ -2,11 +2,11 @@ "nodes": { "nixpkgs": { "locked": { - "lastModified": 1704420045, - "narHash": "sha256-C36QmoJd5tdQ5R9MC1jM7fBkZW9zBUqbUCsgwS6j4QU=", + "lastModified": 1705183652, + "narHash": "sha256-rnfkyUH0x72oHfiSDhuCHDHg3gFgF+lF8zkkg5Zihsw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c1be43e8e837b8dbee2b3665a007e761680f0c3d", + "rev": "428544ae95eec077c7f823b422afae5f174dee4b", "type": "github" }, "original": { @@ -15,9 +15,25 @@ "type": "indirect" } }, + "nixpkgs-unstable": { + "locked": { + "lastModified": 1705133751, + "narHash": "sha256-rCIsyE80jgiOU78gCWN3A0wE0tR2GI5nH6MlS+HaaSQ=", + "owner": "NixOS", + "repo": "nixpkgs", + "rev": "9b19f5e77dd906cb52dade0b7bd280339d2a1f3d", + "type": "github" + }, + "original": { + "id": "nixpkgs", + "ref": "nixos-unstable", + "type": "indirect" + } + }, "root": { "inputs": { - "nixpkgs": "nixpkgs" + "nixpkgs": "nixpkgs", + "nixpkgs-unstable": "nixpkgs-unstable" } } }, diff --git a/flake.nix b/flake.nix index e1e8690..a1e8fa9 100644 --- a/flake.nix +++ b/flake.nix @@ -4,26 +4,29 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-23.11"; + nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; }; - outputs = { self, nixpkgs }@inputs: - let - lib = nixpkgs.lib; - in { + outputs = { self, nixpkgs, nixpkgs-unstable }: { nixosConfigurations = { - nixos = lib.nixosSystem { + nixos = nixpkgs-unstable.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = { + inherit self; + nixpkgs = nixpkgs-unstable; + }; modules = [ ./hosts/nixos/configuration.nix ]; }; - nixserver = lib.nixosSystem { + nixserver = nixpkgs.lib.nixosSystem { system = "x86_64-linux"; - specialArgs = inputs; + specialArgs = { + inherit self nixpkgs; + }; modules = [ ./hosts/nixserver/configuration.nix ];