From 6515e7710868da86f3066f6e26a6c57b7e36a742 Mon Sep 17 00:00:00 2001 From: Guanran Wang Date: Fri, 15 Dec 2023 23:13:47 +0800 Subject: [PATCH] darwin: move system defaults to home-manager --- .../profiles/device-type/desktop/default.nix | 1 - .../device-type/desktop/system/default.nix | 5 - .../device-type/desktop/system/system.nix | 97 ------------------- .../darwin/profiles/core/home/default.nix | 29 ++++++ 4 files changed, 29 insertions(+), 103 deletions(-) delete mode 100644 darwin/profiles/device-type/desktop/system/default.nix delete mode 100644 darwin/profiles/device-type/desktop/system/system.nix diff --git a/darwin/profiles/device-type/desktop/default.nix b/darwin/profiles/device-type/desktop/default.nix index be0a56f..fabed91 100644 --- a/darwin/profiles/device-type/desktop/default.nix +++ b/darwin/profiles/device-type/desktop/default.nix @@ -1,6 +1,5 @@ {...}: { imports = [ ./packages - ./system ]; } diff --git a/darwin/profiles/device-type/desktop/system/default.nix b/darwin/profiles/device-type/desktop/system/default.nix deleted file mode 100644 index 31df8d9..0000000 --- a/darwin/profiles/device-type/desktop/system/default.nix +++ /dev/null @@ -1,5 +0,0 @@ -{...}: { - imports = [ - ./system.nix - ]; -} diff --git a/darwin/profiles/device-type/desktop/system/system.nix b/darwin/profiles/device-type/desktop/system/system.nix deleted file mode 100644 index 11ef8cd..0000000 --- a/darwin/profiles/device-type/desktop/system/system.nix +++ /dev/null @@ -1,97 +0,0 @@ -_: { - system.defaults = { - # Apple... Do I really have to change literally - # every setting in macOS to make it actually usable. - # - # Through this... you will see why I say macOS is a terriable mess. - # - # NOTE: default of those options is `null` (unmanaged) - # https://github.com/mathiasbynens/dotfiles/blob/main/.macos for references - - ### Inputs - ".GlobalPreferences"."com.apple.mouse.scaling" = "-1"; # Disable mouse acceleration - trackpad = { - Clicking = true; - TrackpadRightClick = true; - }; - - ### Finder - finder = { - _FXShowPosixPathInTitle = false; - AppleShowAllExtensions = true; - AppleShowAllFiles = true; - CreateDesktop = false; - FXDefaultSearchScope = "SCcf"; # "SCcf" = Current folder - FXEnableExtensionChangeWarning = false; - FXPreferredViewStyle = "Nlsv"; # "icnv" = Icon view, "Nlsv" = List view, "clmv" = Column View, "Flwv" = Gallery View - QuitMenuItem = true; - ShowPathbar = true; - ShowStatusBar = false; - }; - - ### Login window - loginwindow = { - autoLoginUser = "Off"; - DisableConsoleAccess = true; - GuestEnabled = false; - }; - - ### Finder menu - menuExtraClock = { - IsAnalog = false; - Show24Hour = false; - ShowAMPM = true; - ShowDate = 0; # 0 = show, 1, 2 = don't show - ShowDayOfMonth = true; - ShowDayOfWeek = true; - ShowSeconds = false; - }; - - ### Misc - NSGlobalDomain = { - "com.apple.keyboard.fnState" = true; - "com.apple.mouse.tapBehavior" = 1; - "com.apple.sound.beep.feedback" = 0; - "com.apple.springing.enabled" = true; - "com.apple.swipescrolldirection" = true; # Natrual scrolling - "com.apple.trackpad.enableSecondaryClick" = true; - "com.apple.trackpad.trackpadCornerClickBehavior" = null; # ??? "null or value 1 (singular enum)" - #"com.apple.trackpad.scaling" = -1; - _HIHideMenuBar = false; - AppleEnableMouseSwipeNavigateWithScrolls = true; # Magic Mouse - AppleEnableSwipeNavigateWithScrolls = true; # Trackpad - AppleFontSmoothing = 1; # https://github.com/kevinSuttle/macOS-Defaults/issues/17#issuecomment-266633501 - AppleICUForce24HourTime = false; - AppleInterfaceStyle = "Dark"; # "null or value "Dark" (singular enum)" - AppleInterfaceStyleSwitchesAutomatically = false; - AppleKeyboardUIMode = 3; # ??? "null or value 3 (singular enum)" - AppleMeasurementUnits = "Centimeters"; # "null or one of "Centimeters", "Inches"" - ApplePressAndHoldEnabled = false; # https://stackoverflow.com/questions/33152551/how-can-i-disable-applepressandholdenabled-for-a-specific-application-repeat#33497193 - AppleScrollerPagingBehavior = false; - #AppleShowAllExtensions = true; # Dupelicate? - #AppleShowAllFiles = true; - AppleShowScrollBars = "Always"; - AppleTemperatureUnit = "Celsius"; # "null or one of "Celsius", "Fahrenheit"" - #AppleWindowTabbingMode # ? - InitialKeyRepeat = 32; - KeyRepeat = 2; - NSAutomaticCapitalizationEnabled = false; - NSAutomaticDashSubstitutionEnabled = false; - NSAutomaticPeriodSubstitutionEnabled = false; - NSAutomaticQuoteSubstitutionEnabled = false; - NSAutomaticSpellingCorrectionEnabled = false; - #NSAutomaticWindowAnimationsEnabled - NSDisableAutomaticTermination = true; - NSDocumentSaveNewDocumentsToCloud = false; - NSNavPanelExpandedStateForSaveMode = true; - NSNavPanelExpandedStateForSaveMode2 = true; - NSScrollAnimationEnabled = true; - #NSTableViewDefaultSizeMode - NSTextShowsControlCharacters = true; - NSUseAnimatedFocusRing = false; - NSWindowResizeTime = 0.001; - PMPrintingExpandedStateForPrint = true; - PMPrintingExpandedStateForPrint2 = true; - }; - }; -} diff --git a/users/guanranwang/darwin/profiles/core/home/default.nix b/users/guanranwang/darwin/profiles/core/home/default.nix index e60170e..04537a4 100644 --- a/users/guanranwang/darwin/profiles/core/home/default.nix +++ b/users/guanranwang/darwin/profiles/core/home/default.nix @@ -2,4 +2,33 @@ imports = [ ../../../../home-manager ]; + + # https://github.com/mathiasbynens/dotfiles/blob/main/.macos + targets.darwin.defaults = { + ### Inputs + ".GlobalPreferences"."com.apple.mouse.scaling" = "-1"; # Disable mouse acceleration + + ### .DS_Store + "com.apple.desktopservices" = { + DSDontWriteNetworkStores = true; + DSDontWriteUSBStores = true; + }; + + ### Dock + "com.apple.dock".autohide = true; + + ### Finder + "com.apple.finder" = { + _FXShowPosixPathInTitle = false; + AppleShowAllExtensions = true; + AppleShowAllFiles = true; + CreateDesktop = false; + FXDefaultSearchScope = "SCcf"; # Current folder + FXEnableExtensionChangeWarning = false; + FXPreferredViewStyle = "Nlsv"; # List view + QuitMenuItem = true; + ShowPathbar = true; + ShowStatusBar = false; + }; + }; }