nara: move configuration to module

2 files changed, 44 insertions, 39 deletions

diff --git a/hosts/nara/configuration.nix b/hosts/nara/configuration.nix
new file mode 100644
index 0000000..24b8df4
--- /dev/null
+++ b/hosts/nara/configuration.nix
@@ -0,0 +1,41 @@
+{ inputs, pkgs, ... }:
+{
+  system.stateVersion = 5;
+
+  environment.systemPackages = with pkgs; [
+    nixd
+    nixfmt-rfc-style
+    nil
+    just
+  ];
+
+  homebrew = {
+    enable = true;
+
+    brews = [
+      "swiftlint"
+      "gpg"
+      "pinentry-mac"
+    ];
+
+    casks = [
+      "alt-tab"
+      "iina"
+      "aerospace"
+    ];
+  };
+
+  nix-homebrew = {
+    enable = true;
+    enableRosetta = true;
+    user = "ebisu";
+    mutableTaps = false;
+
+    taps = with inputs; {
+      "homebrew/homebrew-core" = homebrew-core;
+      "homebrew/homebrew-cask" = homebrew-cask;
+      "homebrew/homebrew-bundle" = homebrew-bundle;
+      "nikitabobko/homebrew-tap" = nikitabobko-homebrew-tap;
+    };
+  };
+}
diff --git a/hosts/nara/default.nix b/hosts/nara/default.nix
index c972d31..fe73230 100644
--- a/hosts/nara/default.nix
+++ b/hosts/nara/default.nix
@@ -1,49 +1,13 @@
 { inputs, kansaiPkgs }:
 let
-  configuration =
-    { pkgs, ... }:
-    {
-      system.stateVersion = 5;
-
-      environment.systemPackages = with pkgs; [
-        nixd
-        nixfmt-rfc-style
-        nil
-        just
-      ];
-
-      homebrew = {
-        enable = true;
-        brews = [ "swiftlint" "gpg" "pinentry-mac" ];
-
-        casks = [
-          "alt-tab"
-          "iina"
-          "aerospace"
-        ];
-      };
-
-      nix-homebrew = {
-        enable = true;
-        enableRosetta = true;
-        user = "ebisu";
-        mutableTaps = false;
-
-        taps = with inputs; {
-          "homebrew/homebrew-core" = homebrew-core;
-          "homebrew/homebrew-cask" = homebrew-cask;
-          "homebrew/homebrew-bundle" = homebrew-bundle;
-          "nikitabobko/homebrew-tap" = nikitabobko-homebrew-tap;
-        };
-      };
-    };
+  pkgs = (kansaiPkgs { })."aarch64-darwin";
 in
 {
   flake.darwinConfigurations.nara = inputs.nix-darwin.lib.darwinSystem {
-    pkgs = (kansaiPkgs { })."aarch64-darwin";
+    inherit pkgs;
 
     modules = [
-      configuration
+      (import ./configuration.nix { inherit inputs pkgs; })
       inputs.determinate.darwinModules.default
       inputs.nix-homebrew.darwinModules.nix-homebrew
     ];