Refactored macos stuff
This commit is contained in:
1 parent
b6cc6828b6
commit
ad7fdad2c6
3 files changed
+9
-12
No files matched your search
+6
-9
@@ -8,15 +8,11 @@
|
||||
let
|
||||
makeImports =
|
||||
{ attrs
|
||||
, home-manager-modules
|
||||
, extraConfiguration ? [ ]
|
||||
}: (if (isNull attrs.configuration) then [ ] else [ attrs.configuration ])
|
||||
++ [
|
||||
(import ./main.nix attrs)
|
||||
] ++ (if attrs.home-manager.enable then
|
||||
home-manager-modules
|
||||
else
|
||||
[ ]) ++ extraConfiguration;
|
||||
] ++ extraConfiguration;
|
||||
eachSystem = nixpkgs.lib.genAttrs (import systems);
|
||||
pkgs = eachSystem (system:
|
||||
import nixpkgs {
|
||||
@@ -35,8 +31,10 @@ let
|
||||
system = system;
|
||||
modules = (makeImports {
|
||||
attrs = joinedttrs;
|
||||
home-manager-modules = [ home-manager.nixosModules.default ];
|
||||
extraConfiguration = [ lix-module.nixosModules.default ];
|
||||
extraConfiguration = [
|
||||
home-manager.nixosModules.default
|
||||
lix-module.nixosModules.default
|
||||
];
|
||||
});
|
||||
};
|
||||
makeNixOsModule =
|
||||
@@ -51,9 +49,8 @@ let
|
||||
nix-darwin.lib.darwinSystem {
|
||||
modules = (makeImports {
|
||||
attrs = attrs;
|
||||
home-manager-modules = [
|
||||
extraConfiguration = [
|
||||
home-manager.darwinModules.home-manager
|
||||
(import ./home-manager/macos.nix { user = user; })
|
||||
];
|
||||
}) ++ [
|
||||
(import ./macos.nix {
|
||||
|
||||
+1
-1
@@ -41,5 +41,5 @@
|
||||
++ (if enableHomelabServices then [ (import ./hl-hardware) ] else [ ])
|
||||
;
|
||||
skyg.user = user;
|
||||
skyg.home-manager.version = home-manager.version;
|
||||
skyg.home-manager.version = homeManagerVersion;
|
||||
}
|
||||
@@ -1,4 +1,4 @@
|
||||
{ config, lib, pkgs, ... }:
|
||||
{ config, lib, ... }:
|
||||
|
||||
with lib;
|
||||
|
||||
@@ -7,7 +7,7 @@ let
|
||||
in
|
||||
{
|
||||
options = {
|
||||
skyg.skyg.user.macos = {
|
||||
skyg.user.macos = {
|
||||
enableOverride = mkEnableOption "";
|
||||
};
|
||||
};
|
||||
|
||||
Reference in new issue
Block a user