flake-parts: home

2 files changed, 45 insertions, 36 deletions

diff --git a/flake.nix b/flake.nix
index 6682140..bb6d0eb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -84,21 +84,20 @@
       home-manager,
       systems,
       pre-commit-hooks,
-      chaotic,
       flake-parts,
       ...
     }@inputs:
     let
-      inherit (self) outputs;
-
       lib = nixpkgs.lib // home-manager.lib;
-      forAllSystems = lib.genAttrs (import systems);
-      nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
-      secrets = builtins.fromTOML (builtins.readFile "${self}/secrets/secrets.toml");
+      forAllSystems = lib.genAttrs (import inputs.systems);
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = builtins.attrNames (forAllSystems (system: system));
-      imports = [ ./hosts ];
+
+      imports = [
+        ./home
+        ./hosts
+      ];
 
       perSystem =
         { system, ... }:
@@ -119,37 +118,9 @@
 
           devShells.default = nixpkgs.legacyPackages.${system}.mkShell {
             inherit (self.checks.${system}.pre-commit-check) shellHook;
+
             buildInputs = self.checks.${system}.pre-commit-check.enabledPackages;
           };
         };
-
-      flake = {
-        inherit lib;
-
-        homeConfigurations.ebisu =
-          let
-            username = "ebisu";
-            flakeDirectory = ".nixos-config";
-          in
-          home-manager.lib.homeManagerConfiguration {
-            pkgs = nixpkgsFor."${builtins.currentSystem}";
-
-            modules = [
-              ./home/${username}
-              chaotic.homeManagerModules.default
-            ];
-
-            extraSpecialArgs = {
-              inherit
-                inputs
-                outputs
-                self
-                secrets
-                username
-                flakeDirectory
-                ;
-            };
-          };
-      };
     };
 }
diff --git a/home/default.nix b/home/default.nix
new file mode 100644
index 0000000..4b52d13
--- /dev/null
+++ b/home/default.nix
@@ -0,0 +1,38 @@
+{
+  lib,
+  inputs,
+  outputs,
+  self,
+  ...
+}:
+let
+  forAllSystems = lib.genAttrs (import inputs.systems);
+  nixpkgsFor = forAllSystems (system: import inputs.nixpkgs { inherit system; });
+  secrets = builtins.fromTOML (builtins.readFile "${self}/secrets/secrets.toml");
+in
+{
+  flake.homeConfigurations.ebisu =
+    let
+      username = "ebisu";
+      flakeDirectory = ".nixos-config";
+    in
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = nixpkgsFor."${builtins.currentSystem}";
+
+      modules = [
+        ./${username}
+        inputs.chaotic.homeManagerModules.default
+      ];
+
+      extraSpecialArgs = {
+        inherit
+          inputs
+          outputs
+          self
+          secrets
+          username
+          flakeDirectory
+          ;
+      };
+    };
+}