diff --git a/home/configurations.nix b/home/configurations.nix index 63fed20..5ea3d89 100644 --- a/home/configurations.nix +++ b/home/configurations.nix @@ -30,10 +30,6 @@ in { home = hmConfiguration { extraModules = [ ./home ]; - overlays = [ - (final: prev: { s = scripts; }) - (final: prev: { n = nvd; }) - ]; stateVersion = "20.09"; }; diff --git a/nixos/configurations.nix b/nixos/configurations.nix index 9aa5c01..cc772d9 100644 --- a/nixos/configurations.nix +++ b/nixos/configurations.nix @@ -4,6 +4,8 @@ , home-manager , homePage , nixos-hardware +, nvd +, scripts }: let adapterModule = system: { nix.nixPath = [ @@ -29,6 +31,8 @@ let adapterModule = system: { nix.useSandbox = true; nixpkgs.overlays = (nixpkgs.lib.attrValues self.overlays) ++ [ (final: prev: { homePage = homePage.defaultPackage.${system}; }) + (final: prev: { s = scripts; }) + (final: prev: { n = nvd; }) ]; }; in @@ -38,12 +42,13 @@ in modules = (nixpkgs.lib.attrValues self.nixosModules) ++ [ (adapterModule system) nixos-hardware.nixosModules.lenovo-thinkpad-t14s-amd-gen1 - #home-manager.nixosModules.home-manager - #{ - # home-manager.useGlobalPkgs = true; - # home-manager.useUserPackages = true; - # home-manager.users.dadada = self.hmConfigurations.home; - #} + home-manager.nixosModules.home-manager + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules); + home-manager.users.dadada = import ../home/home; + } ./modules/profiles/laptop.nix ./gorgon/configuration.nix ]; @@ -63,6 +68,12 @@ in (adapterModule system) ./modules/profiles/server.nix ./surgat/configuration.nix + { + home-manager.useGlobalPkgs = true; + home-manager.useUserPackages = true; + home-manager.sharedModules = (nixpkgs.lib.attrValues self.hmModules); + home-manager.users.dadada = import ../home/work; + } ]; }; pruflas = nixosSystem rec { diff --git a/outputs.nix b/outputs.nix index edbdf73..1e26531 100644 --- a/outputs.nix +++ b/outputs.nix @@ -63,7 +63,7 @@ hmModules = import ./home/modules inputs; nixosConfigurations = import ./nixos/configurations.nix { nixosSystem = nixpkgs.lib.nixosSystem; - inherit self nixpkgs home-manager nixos-hardware homePage; + inherit self nixpkgs home-manager nixos-hardware nvd scripts homePage; }; nixosModules = import ./nixos/modules inputs; overlays = import ./overlays;