greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Got home-manager building out of darwin

Browse Source
This commit is contained in:
Greg Hellings
2023-06-20 11:52:10 -05:00
parent e9c341a8ec
commit 5c765b7165
3 changed files with 20 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files
darwin/default.nix
+9 -7
View File
@@ -1,4 +1,4 @@
{ agenix, darwin, nixstable, nixunstable, overlays, hm, ... }: { agenix, darwin, nixstable, nixunstable, overlays, hm, flake-utils, ... }:
let let
mac = { mac = {
system ? "aarch64-darwin", system ? "aarch64-darwin",
@@ -7,7 +7,9 @@ let
extraMods ? [] extraMods ? []
}: }:
let let
nixpkgs = channel; nixpkgs = import channel {
inherit system;
};
in darwin.lib.darwinSystem { in darwin.lib.darwinSystem {
inherit system; inherit system;
specialArgs = { inherit nixpkgs; }; specialArgs = { inherit nixpkgs; };
@@ -18,11 +20,10 @@ let
{ {
home-manager.useGlobalPkgs = true; home-manager.useGlobalPkgs = true;
home-manager.useUserPackages = true; home-manager.useUserPackages = true;
home-manager.users."gregory.hellings" = import ../home/home.nix { home-manager.users."gregory.hellings" = import ../home/home.nix;
inherit (nixunstable) lib; home-manager.extraSpecialArgs = {
pkgs = nixunstable;
gui = true;
gnome = false; gnome = false;
gui = true;
}; };
} }
../modules-all ../modules-all
@@ -30,7 +31,8 @@ let
./${name} ./${name}
] ++ extraMods; ] ++ extraMods;
}; };
in { in rec {
"C02G48H8MD6R" = mac { system = "x86_64-darwin"; name = "work"; }; "C02G48H8MD6R" = mac { system = "x86_64-darwin"; name = "work"; };
la23002 = mac { name = "ivr"; }; la23002 = mac { name = "ivr"; };
LA23002 = la23002;
} }
flake.lock
Generated
+8 -8
View File
@@ -133,20 +133,20 @@
"hm": { "hm": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"nixunstable" "nixstable"
] ]
}, },
"locked": { "locked": {
"lastModified": 1687257796, "lastModified": 1687163790,
"narHash": "sha256-jWF0LtG4GczLGLsBvXIGaCX+JvTLfawVLLJPtB5CMW0=", "narHash": "sha256-CmG/ZdswJrWM0CMgJiVyWfO6LqaI4SKEAx9IrnYDrpI=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "e8b5f8f9b3368dcc4814129d6f66c1af7cf3b6e5", "rev": "ac53777f52929bc82efcd2830bfc5aa60bcb4337",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "nix-community", "owner": "nix-community",
"ref": "master", "ref": "release-23.05",
"repo": "home-manager", "repo": "home-manager",
"type": "github" "type": "github"
} }
@@ -222,11 +222,11 @@
}, },
"nixunstable": { "nixunstable": {
"locked": { "locked": {
"lastModified": 1684464849, "lastModified": 1684749550,
"narHash": "sha256-f8th/GWE9M2hePTMZc0YyFboigt9AG/ioEcyHcdFK2I=", "narHash": "sha256-0uqCE8cDYvQ53KbGXKB/kNV9u4fhU9A8j7PjceZ7Gq8=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "b969a89c3e84a121c9b3af2e4ef277cd822b988a", "rev": "fc89970a268de31561c98a4b61e40b6f0636d50a",
"type": "github" "type": "github"
}, },
"original": { "original": {
flake.nix
+3 -4
View File
@@ -10,8 +10,8 @@
agenix.url = "github:ryantm/agenix"; agenix.url = "github:ryantm/agenix";
flake-utils.url = "github:numtide/flake-utils"; flake-utils.url = "github:numtide/flake-utils";
hm = { hm = {
url = "github:nix-community/home-manager/master"; url = "github:nix-community/home-manager/release-23.05";
inputs.nixpkgs.follows = "nixunstable"; inputs.nixpkgs.follows = "nixstable";
}; };
darwin = { darwin = {
url = "github:lnl7/nix-darwin/master"; url = "github:lnl7/nix-darwin/master";
@@ -41,11 +41,10 @@
inputs.ffmac.overlay inputs.ffmac.overlay
]; ];
in { in {
nixosConfigurations = (import ./hosts { inherit nixstable nixunstable overlays wsl agenix; }); 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); defaultPackage = flake-utils.lib.eachDefaultSystemMap (system: inputs.self.homeConfigurations.gui."${system}".activationPackage);