Skip to content

stylix: allow for enabling hm-intergration without enabling stylix #1568

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Closed
0xda157 wants to merge 1 commit into from
Closed

stylix: allow for enabling hm-intergration without enabling stylix #1568

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
38 changes: 19 additions & 19 deletions stylix/home-manager-integration.nix
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -185,7 +185,8 @@ in
[`stylix.homeManagerIntegration.autoImport`](#stylixhomemanagerintegrationautoimport).
'';
type = lib.types.bool;
default = true;
default = config.stylix.enable;
defaultText = lib.literalExpression "config.stylix.enable";
example = false;
};

Expand All @@ -197,7 +198,8 @@ in
your NixOS configuration, rather than running Home Manager independently.
'';
type = lib.types.bool;
default = true;
default = config.stylix.enable;
defaultText = lib.literalExpression "config.stylix.enable";
example = false;
};

Expand All @@ -210,22 +212,20 @@ in
};
};

config = lib.mkIf config.stylix.enable (
lib.optionalAttrs (options ? home-manager) (
lib.mkMerge [
(lib.mkIf config.stylix.homeManagerIntegration.autoImport {
home-manager.sharedModules =
[
config.stylix.homeManagerIntegration.module
]
++ (lib.optionals config.stylix.homeManagerIntegration.followSystem copyModules);
})
(lib.mkIf config.home-manager.useGlobalPkgs {
home-manager.sharedModules = lib.singleton {
config.stylix.overlays.enable = false;
};
})
]
)
config = lib.optionalAttrs (options ? home-manager) (
lib.mkMerge [
(lib.mkIf config.stylix.homeManagerIntegration.autoImport {
home-manager.sharedModules =
[
config.stylix.homeManagerIntegration.module
]
++ (lib.optionals config.stylix.homeManagerIntegration.followSystem copyModules);
})
(lib.mkIf config.home-manager.useGlobalPkgs {
home-manager.sharedModules = lib.singleton {
config.stylix.overlays.enable = false;
};
})
]
);
}