From b16c859cc81714989fbef086c43d46cb1bb7a75a Mon Sep 17 00:00:00 2001 From: Aria Nolan Date: Tue, 19 Dec 2023 12:00:56 -0500 Subject: [PATCH] added variable to flake for home-manager config --- flake.nix | 34 ++++++++++++++++++---------------- 1 file changed, 18 insertions(+), 16 deletions(-) diff --git a/flake.nix b/flake.nix index b0f4b19..7f4775e 100644 --- a/flake.nix +++ b/flake.nix @@ -41,6 +41,17 @@ overlays = [ nur.overlay ]; + home-manager-config = toplevel: [ + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.extraSpecialArgs = {inherit inputs;}; + home-manager.users.tacocat = { + imports = [toplevel]; + _module.args.theme = import ./modules/themes; + }; + } + ]; in { # desktop nixosConfigurations."BICEP" = nixpkgs.lib.nixosSystem { @@ -59,22 +70,13 @@ nixosConfigurations."JWST" = nixpkgs.lib.nixosSystem { inherit system; specialArgs = {inherit inputs;}; - modules = [ - ./hosts/JWST/configuration.nix - nixos-hardware.nixosModules.dell-xps-15-9520 - {nixpkgs.overlays = overlays;} - home-manager.nixosModules.home-manager - { - home-manager.useGlobalPkgs = true; - home-manager.extraSpecialArgs = {inherit inputs;}; - home-manager.users."tacocat" = { - imports = [ - ./users/tacocat/home.nix - ]; - _module.args.theme = import ./modules/themes; - }; - } - ]; + modules = + [ + ./hosts/JWST/configuration.nix + nixos-hardware.nixosModules.dell-xps-15-9520 + {nixpkgs.overlays = overlays;} + ] + ++ home-manager-config ./users/tacocat/home.nix; }; formatter.${system} = pkgs.alejandra;