From a68d2daa11326336766c208597152caaca08796e Mon Sep 17 00:00:00 2001 From: Gregor Kleen Date: Sat, 9 Dec 2023 12:34:05 +0100 Subject: bump --- flake.lock | 22 ++++++++++++++++++++++ flake.nix | 10 ++++++++++ system-profiles/core/default.nix | 6 +++--- 3 files changed, 35 insertions(+), 3 deletions(-) diff --git a/flake.lock b/flake.lock index d5b423ba..a3c569b7 100644 --- a/flake.lock +++ b/flake.lock @@ -368,6 +368,27 @@ "type": "github" } }, + "home-manager-eostre": { + "inputs": { + "nixpkgs": [ + "nixpkgs-eostre" + ] + }, + "locked": { + "lastModified": 1700814205, + "narHash": "sha256-lWqDPKHRbQfi+zNIivf031BUeyciVOtwCwTjyrhDB5g=", + "owner": "gkleen", + "repo": "home-manager", + "rev": "aeb2232d7a32530d3448318790534d196bf9427a", + "type": "github" + }, + "original": { + "owner": "gkleen", + "ref": "nixos-late-start-23.11", + "repo": "home-manager", + "type": "github" + } + }, "nix-github-actions": { "inputs": { "nixpkgs": [ @@ -753,6 +774,7 @@ "flake-registry": "flake-registry", "flake-utils": "flake-utils_3", "home-manager": "home-manager", + "home-manager-eostre": "home-manager-eostre", "nix-index-database": "nix-index-database", "nixpkgs": "nixpkgs_2", "nixpkgs-eostre": "nixpkgs-eostre", diff --git a/flake.nix b/flake.nix index 7ed56d44..eaa93432 100644 --- a/flake.nix +++ b/flake.nix @@ -49,6 +49,15 @@ nixpkgs.follows = "nixpkgs"; }; }; + home-manager-eostre = { + type = "github"; + owner = "gkleen"; + repo = "home-manager"; + ref = "nixos-late-start-23.11"; + inputs = { + nixpkgs.follows = "nixpkgs-eostre"; + }; + }; sops-nix = { type = "github"; owner = "Mic92"; @@ -181,6 +190,7 @@ flake = self; flakeInputs = inputs; path = ./.; + home-manager = inputs.${if inputs ? "home-manager-${hostName}" then "home-manager-${hostName}" else "home-manager"}; }; modules = let diff --git a/system-profiles/core/default.nix b/system-profiles/core/default.nix index 67d50606..0859d707 100644 --- a/system-profiles/core/default.nix +++ b/system-profiles/core/default.nix @@ -1,4 +1,4 @@ -{ flake, flakeInputs, path, hostName, config, lib, pkgs, customUtils, ... }: +{ flake, flakeInputs, home-manager, path, hostName, config, lib, pkgs, customUtils, ... }: with lib; @@ -7,8 +7,8 @@ let userProfileSet = customUtils.types.attrNameSet (zipAttrs (attrValues flake.nixosModules.userProfiles)); hasSops = config.sops.secrets != {}; in { - imports = with flakeInputs; - [ sops-nix.nixosModules.sops + imports = + [ flakeInputs.sops-nix.nixosModules.sops home-manager.nixosModules.home-manager ]; -- cgit v1.2.3