chore: separate files

Allianaab2m · Dec 4, 2024 · a97f6b9 · a97f6b9
1 parent dc4444c
commit a97f6b9
Show file tree

Hide file tree

Showing 3 changed files with 72 additions and 62 deletions.
diff --git a/nix-darwin/brew.nix b/nix-darwin/brew.nix
@@ -0,0 +1,24 @@
+{...}: {
+  homebrew = {
+    enable = true;
+    onActivation = {
+      autoUpdate = true;
+    };
+    casks = [
+      "1password"
+      "raycast"
+      "karabiner-elements"
+      "arc"
+      "notion"
+      "discord"
+      "microsoft-word"
+      "microsoft-powerpoint"
+      "microsoft-excel"
+      "google-drive"
+      "orbstack"
+      "visual-studio-code@insiders"
+      "tailscale"
+    ];
+  };
+
+}
diff --git a/nix-darwin/default.nix b/nix-darwin/default.nix
@@ -1,4 +1,9 @@
 { pkgs, ... }: {
+  imports = [
+    ./system.nix
+    ./brew.nix
+  ];
+
   nix = {
     optimise.automatic = true;
     settings = {
@@ -11,68 +16,6 @@
 
   services.nix-daemon.enable = true;
 
-  system = {
-    stateVersion = 5;
-    defaults = {
-      NSGlobalDomain = {
-        AppleShowAllExtensions = true;
-        # 長押しして出てくるアクセントメニューを消す
-        ApplePressAndHoldEnabled = false;
-        # キーリピート
-        InitialKeyRepeat = 11;
-        KeyRepeat = 2;
-        "com.apple.mouse.tapBehavior" = 1;
-      };
-      finder = {
-        AppleShowAllFiles = true;
-        AppleShowAllExtensions = true;
-        ShowPathbar = true;
-        ShowStatusBar = true;
-      };
-      dock = {
-        autohide = true;
-        show-recents = false;
-        orientation = "left";
-        mineffect = "scale";
-        minimize-to-application = true;
-        wvous-br-corner = 1;
-      };
-      screencapture = {
-        disable-shadow = true;
-      };
-      controlcenter = {
-        BatteryShowPercentage = true;
-      };
-      WindowManager = {
-        EnableTiledWindowMargins = false;
-      };
-      trackpad = {
-        Clicking = true;
-      };
-    };
-  };
-
-  homebrew = {
-    enable = true;
-    onActivation = {
-      autoUpdate = true;
-    };
-    casks = [
-      "1password"
-      "raycast"
-      "karabiner-elements"
-      "arc"
-      "notion"
-      "discord"
-      "microsoft-word"
-      "microsoft-powerpoint"
-      "microsoft-excel"
-      "google-drive"
-      "orbstack"
-      "visual-studio-code@insiders"
-    ];
-  };
-
   fonts = {
     packages = with pkgs; [
       plemoljp-nf

diff --git a/nix-darwin/system.nix b/nix-darwin/system.nix
@@ -0,0 +1,43 @@
+{...}: {
+  system = {
+    stateVersion = 5;
+    defaults = {
+      NSGlobalDomain = {
+        AppleShowAllExtensions = true;
+        # 長押しして出てくるアクセントメニューを消す
+        ApplePressAndHoldEnabled = false;
+        # キーリピート
+        InitialKeyRepeat = 11;
+        KeyRepeat = 2;
+        "com.apple.mouse.tapBehavior" = 1;
+      };
+      finder = {
+        AppleShowAllFiles = true;
+        AppleShowAllExtensions = true;
+        ShowPathbar = true;
+        ShowStatusBar = true;
+      };
+      dock = {
+        autohide = true;
+        show-recents = false;
+        orientation = "left";
+        mineffect = "scale";
+        minimize-to-application = true;
+        wvous-br-corner = 1;
+      };
+      screencapture = {
+        disable-shadow = true;
+      };
+      controlcenter = {
+        BatteryShowPercentage = true;
+      };
+      WindowManager = {
+        EnableTiledWindowMargins = false;
+      };
+      trackpad = {
+        Clicking = true;
+      };
+    };
+  };
+
+}