diff --git a/modules/lib.nix b/modules/lib.nix index a19797d..1827f4a 100644 --- a/modules/lib.nix +++ b/modules/lib.nix @@ -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 { diff --git a/modules/main.nix b/modules/main.nix index cfe2363..f3a3101 100644 --- a/modules/main.nix +++ b/modules/main.nix @@ -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; } diff --git a/modules/skyg/macos.nix b/modules/skyg/macos.nix index 0f863ae..0c1754c 100644 --- a/modules/skyg/macos.nix +++ b/modules/skyg/macos.nix @@ -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 ""; }; };