diff --git a/lib/mkSystem.nix b/lib/mkSystem.nix index e65d7bd..2d8ea02 100644 --- a/lib/mkSystem.nix +++ b/lib/mkSystem.nix @@ -28,14 +28,15 @@ in inputs.nixpkgs.lib.nixosSystem { system = architecture; modules = [ + # User configuration management inputs.home-manager.nixosModules.home-manager { home-manager.useGlobalPkgs = true; } + # Overlays (util.mkOverlayFromInput "stable" inputs.stable) (util.mkOverlayFromInput "unstable" inputs.nixpkgs) - { nixpkgs.overlays = [ nur.overlay @@ -45,10 +46,11 @@ in inputs.nixpkgs.lib.nixosSystem { ]; } + # My module system (import ../modules) - inputs.ostylk.nixosModules.nftables + # Actual config (import ./baseSystem.nix) (import hostConfigFile) ];