home-manager/macos: convert to module

thiagokokada · Sep 29, 2023 · 512f5d4 · 512f5d4
1 parent ddf9b96
commit 512f5d4
Show file tree

Hide file tree

Showing 3 changed files with 27 additions and 22 deletions.
diff --git a/flake.nix b/flake.nix
@@ -155,7 +155,6 @@
       })
       (mkHomeConfig {
         hostname = "home-macos";
-        configuration = ./home-manager/macos.nix;
         system = "x86_64-darwin";
         homePath = "/Users";
       })

diff --git a/home-manager/default.nix b/home-manager/default.nix
@@ -7,6 +7,7 @@
     ./desktop
     ./dev
     ./editor
+    ./macos.nix
     ./meta
   ];
 }
diff --git a/home-manager/macos.nix b/home-manager/macos.nix
@@ -1,28 +1,33 @@
-{ ... }:
+{ config, lib, pkgs, ... }:
 
 {
-  imports = [
-    ./default.nix
-  ];
-
-  home-manager.editor.emacs.enable = true;
+  options.home-manager.darwin.enable = lib.mkEnableOption "Darwin config" // {
+    default = pkgs.stdenv.isDarwin;
+  };
 
-  targets.darwin.defaults = {
-    # Disable all automatic substitution
-    NSGlobalDomain = {
-      NSAutomaticCapitalizationEnabled = false;
-      NSAutomaticDashSubstitutionEnabled = false;
-      NSAutomaticPeriodSubstitutionEnabled = false;
-      NSAutomaticQuoteSubstitutionEnabled = false;
-      NSAutomaticSpellingCorrectionEnabled = false;
+  config = lib.mkIf config.home-manager.darwin.enable {
+    home-manager = {
+      dev.enable = lib.mkDefault true;
+      editor.emacs.enable = lib.mkDefault true;
     };
-    # Do not write .DS_Store files outside macOS
-    com.apple.desktopservices = {
-      DSDontWriteNetworkStores = true;
-      DSDontWriteUSBStores = true;
+
+    targets.darwin.defaults = {
+      # Disable all automatic substitution
+      NSGlobalDomain = {
+        NSAutomaticCapitalizationEnabled = false;
+        NSAutomaticDashSubstitutionEnabled = false;
+        NSAutomaticPeriodSubstitutionEnabled = false;
+        NSAutomaticQuoteSubstitutionEnabled = false;
+        NSAutomaticSpellingCorrectionEnabled = false;
+      };
+      # Do not write .DS_Store files outside macOS
+      com.apple.desktopservices = {
+        DSDontWriteNetworkStores = true;
+        DSDontWriteUSBStores = true;
+      };
+      # Disable mouse acceleration
+      com.apple.mouse.scalling = -1;
+      # com.apple.trackpad.scalling = -1;
     };
-    # Disable mouse acceleration
-    com.apple.mouse.scalling = -1;
-    # com.apple.trackpad.scalling = -1;
   };
 }