diff --git a/flake.nix b/flake.nix index c7bedea7..da49c22a 100644 --- a/flake.nix +++ b/flake.nix @@ -42,8 +42,6 @@ system = "x86_64-linux"; specialArgs = attrs; modules = [ - home-manager.nixosModules.home-manager - stylix.nixosModules.stylix ./hardware/laptop.nix { environment.pathsToLink = [ diff --git a/modules/containers.nix b/modules/containers.nix index d029024b..19072539 100644 --- a/modules/containers.nix +++ b/modules/containers.nix @@ -37,6 +37,11 @@ let node = "/dev/dri/renderD128"; } ]; + + specialArgs = { + inherit home-manager; + inherit stylix; + }; }; in { @@ -50,8 +55,6 @@ in config = { lib, pkgs, ... }: { imports = [ - stylix.nixosModules.stylix - home-manager.nixosModules.home-manager ../containers/shared.nix ]; diff --git a/modules/desktop.nix b/modules/desktop.nix index 1d822034..3ff76122 100644 --- a/modules/desktop.nix +++ b/modules/desktop.nix @@ -1,4 +1,4 @@ -{ pkgs, config, lib, ... }: +{ home-manager, stylix, pkgs, config, lib, ... }: let inherit (lib) mkEnableOption mkIf mkMerge; @@ -13,6 +13,11 @@ let cfg = config.modules.desktop; in { + imports = attrValues { + inherit (home-manager.nixosModules) home-manager; + inherit (stylix.nixosModules) stylix; + }; + options.modules.desktop = { japanese = mkEnableOption "Japanese support (fcitx, anki, kanjidraw, etc.)"; bloat = mkEnableOption "GUI applications like Logseq"; diff --git a/tests/hyprland.nix b/tests/hyprland.nix index b516dd0a..b59764fb 100644 --- a/tests/hyprland.nix +++ b/tests/hyprland.nix @@ -6,8 +6,6 @@ in (import ./lib.nix) { nodes.machine = { self, pkgs, ... }: { imports = attrValues { - inherit (self.inputs.home-manager.nixosModules) home-manager; - inherit (self.inputs.stylix.nixosModules) stylix; inherit (self.nixosModules) system desktop; }; }; diff --git a/tests/neovim.nix b/tests/neovim.nix index 30ef3f23..3663f882 100644 --- a/tests/neovim.nix +++ b/tests/neovim.nix @@ -6,7 +6,6 @@ in (import ./lib.nix) { nodes.machine = { self, pkgs, ... }: { imports = attrValues { - inherit (self.inputs.home-manager.nixosModules) home-manager; inherit (self.nixosModules) system shell; }; };