From 47df5590b03b55904fd8f2e5e907d555384b0f01 Mon Sep 17 00:00:00 2001 From: Cameron Reed Date: Sun, 28 Jan 2024 21:50:40 -0700 Subject: [PATCH] Add stable branch for home manager --- flake.lock | 39 ++++++++++++++++++++++++++++++--------- flake.nix | 10 ++++++---- 2 files changed, 36 insertions(+), 13 deletions(-) diff --git a/flake.lock b/flake.lock index ec2f29c..72d0997 100644 --- a/flake.lock +++ b/flake.lock @@ -1,17 +1,37 @@ { "nodes": { "home-manager": { + "inputs": { + "nixpkgs": [ + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1706435589, + "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", + "owner": "nix-community", + "repo": "home-manager", + "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", + "type": "github" + }, + "original": { + "owner": "nix-community", + "repo": "home-manager", + "type": "github" + } + }, + "home-manager-unstable": { "inputs": { "nixpkgs": [ "nixpkgs-unstable" ] }, "locked": { - "lastModified": 1705879479, - "narHash": "sha256-ZIohbyly1KOe+8I3gdyNKgVN/oifKdmeI0DzMfytbtg=", + "lastModified": 1706435589, + "narHash": "sha256-yhEYJxMv5BkfmUuNe4QELKo+V5eq1pwhtVs6kEziHfE=", "owner": "nix-community", "repo": "home-manager", - "rev": "2d47379ad591bcb14ca95a90b6964b8305f6c913", + "rev": "4d54c29bce71f8c261513e0662cc573d30f3e33e", "type": "github" }, "original": { @@ -22,11 +42,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1705774713, - "narHash": "sha256-j6ADaDH9XiumUzkTPlFyCBcoWYhO83lfgiSqEJF2zcs=", + "lastModified": 1706098335, + "narHash": "sha256-r3dWjT8P9/Ah5m5ul4WqIWD8muj5F+/gbCdjiNVBKmU=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "1b64fc1287991a9cce717a01c1973ef86cb1af0b", + "rev": "a77ab169a83a4175169d78684ddd2e54486ac651", "type": "github" }, "original": { @@ -37,11 +57,11 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1705856552, - "narHash": "sha256-JXfnuEf5Yd6bhMs/uvM67/joxYKoysyE3M2k6T3eWbg=", + "lastModified": 1706191920, + "narHash": "sha256-eLihrZAPZX0R6RyM5fYAWeKVNuQPYjAkCUBr+JNvtdE=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "612f97239e2cc474c13c9dafa0df378058c5ad8d", + "rev": "ae5c332cbb5827f6b1f02572496b141021de335f", "type": "github" }, "original": { @@ -53,6 +73,7 @@ "root": { "inputs": { "home-manager": "home-manager", + "home-manager-unstable": "home-manager-unstable", "nixpkgs": "nixpkgs", "nixpkgs-unstable": "nixpkgs-unstable" } diff --git a/flake.nix b/flake.nix index ddebee1..fdd6002 100644 --- a/flake.nix +++ b/flake.nix @@ -5,15 +5,17 @@ inputs = { # Stable nixpkgs.url = "nixpkgs/nixos-23.11"; + home-manager.url = "github:nix-community/home-manager"; + home-manager.inputs.nixpkgs.follows = "nixpkgs"; # Unstable nixpkgs-unstable.url = "nixpkgs/nixos-unstable"; - home-manager.url = "github:nix-community/home-manager"; - home-manager.inputs.nixpkgs.follows = "nixpkgs-unstable"; + home-manager-unstable.url = "github:nix-community/home-manager"; + home-manager-unstable.inputs.nixpkgs.follows = "nixpkgs-unstable"; }; - outputs = { self, nixpkgs, nixpkgs-unstable, home-manager }: + outputs = { self, nixpkgs, nixpkgs-unstable, home-manager, home-manager-unstable }: let common_dir = ./common; in { nixosConfigurations = { @@ -23,7 +25,7 @@ specialArgs = { inherit common_dir; }; modules = [ ./hosts/nixos/configuration.nix - home-manager.nixosModules.home-manager { + home-manager-unstable.nixosModules.home-manager { home-manager.useGlobalPkgs = true; home-manager.useUserPackages = true; home-manager.users.cameron = import ./hosts/nixos/home-manager/cameron.nix;