Revert 1 commits

8424b02 'refactor: do not depend on inputs for modules'
This commit is contained in:
Youwen Wu 2024-12-25 22:50:35 -08:00
parent 8424b025f6
commit 4314399a1c
Signed by: youwen
GPG key ID: 865658ED1FE61EC3
11 changed files with 39 additions and 87 deletions

View file

@ -1,6 +1,5 @@
{
liminalHomeManagerModules,
liminalSystemModules,
inputs,
config,
lib,
...
@ -10,7 +9,7 @@ let
in
{
imports = [
liminalSystemModules.home-manager.nixosModules.home-manager
inputs.home-manager.nixosModules.home-manager
];
options.liminalOS.integrateHomeManager = lib.mkOption {
@ -25,6 +24,6 @@ in
useGlobalPkgs = true;
useUserPackages = true;
backupFileExtension = "backup";
extraSpecialArgs = { inherit liminalHomeManagerModules; };
extraSpecialArgs = { inherit inputs; };
};
}

View file

@ -1,7 +1,7 @@
{
config,
lib,
liminalHomeManagerModules,
inputs,
pkgs,
osConfig,
...
@ -11,7 +11,7 @@ let
in
{
imports = [
liminalHomeManagerModules.nix-index-database.hmModules.nix-index
inputs.nix-index-database.hmModules.nix-index
./fastfetch
];

View file

@ -1,4 +1,5 @@
{
inputs,
lib,
config,
osConfig,
@ -24,6 +25,8 @@ in
};
config = {
services.tlp.enable = lib.mkIf (cfg.formFactor == "laptop") true;
programs.light.enable = lib.mkIf (cfg.formFactor == "laptop") true;
assertions = [
{
assertion = cfg.formFactor != null;

View file

@ -1,6 +1,6 @@
{
pkgs,
liminalHomeManagerModules,
inputs,
config,
lib,
...
@ -85,11 +85,11 @@ in
};
home.packages = lib.mkIf cfg.zen.enable [
liminalHomeManagerModules.zen-browser.packages.${pkgs.system}.default
inputs.zen-browser.packages.${pkgs.system}.default
];
home.sessionVariables.DEFAULT_BROWSER = lib.mkIf cfg.zen.enable "${
liminalHomeManagerModules.zen-browser.packages.${pkgs.system}.default
inputs.zen-browser.packages.${pkgs.system}.default
}/bin/zen";
};
}

View file

@ -1,5 +1,5 @@
{
liminalHomeManagerModules,
inputs,
pkgs,
config,
osConfig,
@ -7,11 +7,11 @@
...
}:
let
spicepkgs = liminalHomeManagerModules.spicetify.legacyPackages.${pkgs.system};
spicepkgs = inputs.spicetify.legacyPackages.${pkgs.system};
in
{
imports = [
liminalHomeManagerModules.spicetify.homeManagerModules.default
inputs.spicetify.homeManagerModules.default
];
config = lib.mkIf (config.liminalOS.programs.enable && osConfig.liminalOS.config.allowUnfree) {