nara: move configuration to modules

3 files changed, 13 insertions, 43 deletions

diff --git a/hosts/default.nix b/hosts/default.nix
index 6d61e10..9cf3550 100644
--- a/hosts/default.nix
+++ b/hosts/default.nix
@@ -49,6 +49,6 @@
       (import ./hoka minimalOptions)
       (import ./kansai pcOptions)
       (import ./kioku minimalOptions)
-      (import ./nara { inherit inputs kansaiPkgs; })
+      (import ./nara { inherit inputs kansaiPkgs self; })
     ];
 }
diff --git a/hosts/nara/configuration.nix b/hosts/nara/configuration.nix
index 8536726..89b4dc7 100644
--- a/hosts/nara/configuration.nix
+++ b/hosts/nara/configuration.nix
@@ -1,43 +1,5 @@
-{ inputs, pkgs, ... }:
+{ self, ... }:
 {
+  imports = [ "${self}/modules/mac" ];
   system.stateVersion = 5;
-
-  environment.systemPackages = with pkgs; [
-    nixd
-    nixfmt-rfc-style
-    nil
-    just
-  ];
-
-  homebrew = {
-    enable = true;
-
-    brews = [
-      "swiftlint"
-      "gpg"
-      "pinentry-mac"
-      "sudo-touchid"
-    ];
-
-    casks = [
-      "alt-tab"
-      "iina"
-      "aerospace"
-    ];
-  };
-
-  nix-homebrew = {
-    enable = true;
-    enableRosetta = true;
-    user = "ebisu";
-    mutableTaps = false;
-
-    taps = with inputs; {
-      "artginzburg/homebrew-tap" = artginzburg-homebrew-tap;
-      "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 fe73230..a90ceb5 100644
--- a/hosts/nara/default.nix
+++ b/hosts/nara/default.nix
@@ -1,4 +1,8 @@
-{ inputs, kansaiPkgs }:
+{
+  inputs,
+  kansaiPkgs,
+  self,
+}:
 let
   pkgs = (kansaiPkgs { })."aarch64-darwin";
 in
@@ -7,9 +11,13 @@ in
     inherit pkgs;
 
     modules = [
-      (import ./configuration.nix { inherit inputs pkgs; })
+      ./configuration.nix
       inputs.determinate.darwinModules.default
       inputs.nix-homebrew.darwinModules.nix-homebrew
     ];
+
+    specialArgs = {
+      inherit inputs pkgs self;
+    };
   };
 }