1 files changed, 12 insertions, 18 deletions

diff --git a/flake.nix b/flake.nix
index c8a66a1..da5ac30 100644
--- a/flake.nix
+++ b/flake.nix
@@ -98,24 +98,17 @@
       forAllSystems = lib.genAttrs (import systems);
       nixpkgsFor = forAllSystems (system: import nixpkgs { inherit system; });
       secrets = builtins.fromTOML (builtins.readFile "${self}/secrets/secrets.toml");
-      system = builtins.currentSystem;
     in
     flake-parts.lib.mkFlake { inherit inputs; } {
       systems = builtins.attrNames (forAllSystems (system: system));
 
-      flake = {
-        inherit lib;
-
-        packages = forAllSystems (system: {
-          default = home-manager.defaultPackage."${system}";
-        });
-
-        formatter = forAllSystems (system: {
-          default = nixpkgs.legacyPackages."${system}".nixfmt-rfc-style;
-        });
+      perSystem =
+        { system, ... }:
+        {
+          packages = home-manager.defaultPackage."${system}";
+          formatter = nixpkgs.legacyPackages."${system}".nixfmt-rfc-style;
 
-        checks = forAllSystems (system: {
-          pre-commit-check = pre-commit-hooks.lib.${system}.run {
+          checks.pre-commit-check = pre-commit-hooks.lib.${system}.run {
             src = ./.;
 
             hooks = {
@@ -125,14 +118,15 @@
               statix.enable = true;
             };
           };
-        });
 
-        devShells = forAllSystems (system: {
-          default = nixpkgs.legacyPackages.${system}.mkShell {
+          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;
 
         nixosConfigurations.kansai = lib.nixosSystem {
           specialArgs = {
@@ -155,7 +149,7 @@
             flakeDirectory = ".nixos-config";
           in
           home-manager.lib.homeManagerConfiguration {
-            pkgs = nixpkgsFor."${system}";
+            pkgs = nixpkgsFor."${builtins.currentSystem}";
 
             modules = [
               ./home/${username}