diff --git a/hosts/chidi/default.nix b/hosts/chidi/default.nix index ebb4d4c..5203de3 100644 --- a/hosts/chidi/default.nix +++ b/hosts/chidi/default.nix @@ -9,7 +9,6 @@ ../../modules/core.nix ../../modules/darwin.nix ../../modules/darwin-syncthing.nix - ../../modules/darwin-system.nix ../../modules/dock.nix ../../modules/homebrew.nix ../../modules/syncthing.nix diff --git a/hosts/jason/default.nix b/hosts/jason/default.nix index cafed46..0d55f34 100644 --- a/hosts/jason/default.nix +++ b/hosts/jason/default.nix @@ -7,7 +7,6 @@ ../../modules/core.nix ../../modules/darwin.nix ../../modules/darwin-syncthing.nix - ../../modules/darwin-system.nix ../../modules/dock.nix ../../modules/homebrew.nix ../../modules/syncthing.nix diff --git a/modules/darwin-system.nix b/modules/darwin-system.nix deleted file mode 100644 index 01ba7d9..0000000 --- a/modules/darwin-system.nix +++ /dev/null @@ -1,32 +0,0 @@ -{ - system.defaults = { - NSGlobalDomain = { - # null equals "Light" - AppleInterfaceStyle = null; - AppleShowAllExtensions = true; - ApplePressAndHoldEnabled = false; - KeyRepeat = 2; - InitialKeyRepeat = 15; - "com.apple.mouse.tapBehavior" = 1; - "com.apple.sound.beep.volume" = 0.0; - "com.apple.sound.beep.feedback" = 0; - }; - - dock = { - autohide = true; - show-recents = false; - launchanim = true; - orientation = "bottom"; - tilesize = 60; - }; - - finder = { - _FXShowPosixPathInTitle = false; - }; - - trackpad = { - Clicking = true; - TrackpadThreeFingerDrag = true; - }; - }; -} diff --git a/modules/darwin.nix b/modules/darwin.nix index d02f691..667a025 100644 --- a/modules/darwin.nix +++ b/modules/darwin.nix @@ -7,6 +7,37 @@ system = { primaryUser = user; stateVersion = constants.stateVersions.darwin; + + defaults = { + NSGlobalDomain = { + # null equals "Light" + AppleInterfaceStyle = null; + AppleShowAllExtensions = true; + ApplePressAndHoldEnabled = false; + KeyRepeat = 2; + InitialKeyRepeat = 15; + "com.apple.mouse.tapBehavior" = 1; + "com.apple.sound.beep.volume" = 0.0; + "com.apple.sound.beep.feedback" = 0; + }; + + dock = { + autohide = true; + show-recents = false; + launchanim = true; + orientation = "bottom"; + tilesize = 60; + }; + + finder = { + _FXShowPosixPathInTitle = false; + }; + + trackpad = { + Clicking = true; + TrackpadThreeFingerDrag = true; + }; + }; }; nix = {