Got home-manager building out of darwin
This commit is contained in:
+9
-7
@@ -1,4 +1,4 @@
|
||||
{ agenix, darwin, nixstable, nixunstable, overlays, hm, ... }:
|
||||
{ agenix, darwin, nixstable, nixunstable, overlays, hm, flake-utils, ... }:
|
||||
let
|
||||
mac = {
|
||||
system ? "aarch64-darwin",
|
||||
@@ -7,7 +7,9 @@ let
|
||||
extraMods ? []
|
||||
}:
|
||||
let
|
||||
nixpkgs = channel;
|
||||
nixpkgs = import channel {
|
||||
inherit system;
|
||||
};
|
||||
in darwin.lib.darwinSystem {
|
||||
inherit system;
|
||||
specialArgs = { inherit nixpkgs; };
|
||||
@@ -18,11 +20,10 @@ let
|
||||
{
|
||||
home-manager.useGlobalPkgs = true;
|
||||
home-manager.useUserPackages = true;
|
||||
home-manager.users."gregory.hellings" = import ../home/home.nix {
|
||||
inherit (nixunstable) lib;
|
||||
pkgs = nixunstable;
|
||||
gui = true;
|
||||
home-manager.users."gregory.hellings" = import ../home/home.nix;
|
||||
home-manager.extraSpecialArgs = {
|
||||
gnome = false;
|
||||
gui = true;
|
||||
};
|
||||
}
|
||||
../modules-all
|
||||
@@ -30,7 +31,8 @@ let
|
||||
./${name}
|
||||
] ++ extraMods;
|
||||
};
|
||||
in {
|
||||
in rec {
|
||||
"C02G48H8MD6R" = mac { system = "x86_64-darwin"; name = "work"; };
|
||||
la23002 = mac { name = "ivr"; };
|
||||
LA23002 = la23002;
|
||||
}
|
||||
|
||||
Generated
+8
-8
@@ -133,20 +133,20 @@
|
||||
"hm": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
"nixunstable"
|
||||
"nixstable"
|
||||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1687257796,
|
||||
"narHash": "sha256-jWF0LtG4GczLGLsBvXIGaCX+JvTLfawVLLJPtB5CMW0=",
|
||||
"lastModified": 1687163790,
|
||||
"narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "e8b5f8f9b3368dcc4814129d6f66c1af7cf3b6e5",
|
||||
"rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"ref": "master",
|
||||
"ref": "release-23.05",
|
||||
"repo": "home-manager",
|
||||
"type": "github"
|
||||
}
|
||||
@@ -222,11 +222,11 @@
|
||||
},
|
||||
"nixunstable": {
|
||||
"locked": {
|
||||
"lastModified": 1684464849,
|
||||
"narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=",
|
||||
"lastModified": 1684749550,
|
||||
"narHash": "sha256-0uqCE8cDYvQ53KbGXKB/kNV9u4fhU9A8j7PjceZ7Gq8=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "b969a89c3e84a121c9b3af2e4ef277cd822b988a",
|
||||
"rev": "fc89970a268de31561c98a4b61e40b6f0636d50a",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
||||
@@ -10,8 +10,8 @@
|
||||
agenix.url = "github:ryantm/agenix";
|
||||
flake-utils.url = "github:numtide/flake-utils";
|
||||
hm = {
|
||||
url = "github:nix-community/home-manager/master";
|
||||
inputs.nixpkgs.follows = "nixunstable";
|
||||
url = "github:nix-community/home-manager/release-23.05";
|
||||
inputs.nixpkgs.follows = "nixstable";
|
||||
};
|
||||
darwin = {
|
||||
url = "github:lnl7/nix-darwin/master";
|
||||
@@ -41,11 +41,10 @@
|
||||
inputs.ffmac.overlay
|
||||
];
|
||||
|
||||
|
||||
in {
|
||||
nixosConfigurations = (import ./hosts { inherit nixstable nixunstable overlays wsl agenix; });
|
||||
|
||||
darwinConfigurations = (import ./darwin { inherit agenix darwin nixstable nixunstable overlays hm; });
|
||||
darwinConfigurations = (import ./darwin { inherit agenix darwin nixstable nixunstable overlays hm flake-utils; });
|
||||
|
||||
defaultPackage = flake-utils.lib.eachDefaultSystemMap (system: inputs.self.homeConfigurations.gui."${system}".activationPackage);
|
||||
|
||||
|
||||
Reference in New Issue
Block a user