From 54c0263efec3ca4cdceede564947f1e2f0ecb558 Mon Sep 17 00:00:00 2001 From: EdenQwQ Date: Fri, 21 Mar 2025 19:20:06 +0800 Subject: [PATCH] treewide: use a more proper structure --- flake.nix | 5 +++++ hosts/default.nix | 4 ---- 2 files changed, 5 insertions(+), 4 deletions(-) diff --git a/flake.nix b/flake.nix index 8a9de47..af47ae2 100644 --- a/flake.nix +++ b/flake.nix @@ -14,9 +14,14 @@ inputs.treefmt-nix.flakeModule { _module.args = { inherit inputs self nixpkgs; }; } ]; + flake = { + homeManagerModules = import ./modules/home-manager; + overlays = import ./overlays { inherit inputs self; }; + }; perSystem = { pkgs, ... }: { + packages = import ./pkgs { inherit pkgs; }; treefmt = { projectRootFile = "flake.nix"; programs.nixfmt.enable = true; diff --git a/hosts/default.nix b/hosts/default.nix index 62937e9..404d621 100644 --- a/hosts/default.nix +++ b/hosts/default.nix @@ -31,10 +31,6 @@ in user = "eden"; in { - overlays = import ../overlays { inherit inputs; }; - - homeManagerModules = import ../modules/home-manager; - nixosConfigurations.${host} = nixpkgs.lib.nixosSystem { specialArgs = { inherit