Retire/replace/etc. a number of packages (#64)

sellout · Feb 4, 2025 · e2f2978 · e2f2978
2 parents e496c9f + 0a4156b
commit e2f2978
Show file tree

Hide file tree

Showing 6 changed files with 62 additions and 38 deletions.
diff --git a/flake.lock b/flake.lock
diff --git a/nix/modules/darwin-configuration.nix b/nix/modules/darwin-configuration.nix
@@ -8,6 +8,7 @@
   ...
 }: {
   imports = [
+    ./games.nix
     ./input-devices.nix
     ./nix-configuration.nix
     ./nixpkgs-configuration.nix
@@ -36,6 +37,8 @@
       pkgs.gnupg
       pkgs.yubikey-manager
       pkgs.yubikey-personalization
+      ## TODO: This is a work around for LnL7/nix-darwin#1314
+      pkgs.mas
     ];
     systemPath = [
       # TODO: Support this via the homebrew module.
@@ -64,9 +67,8 @@
   #
   # NB: Ideally this would be managed in home.nix, but that's not yet supported.
   homebrew = {
-    brews = [
-      "sysbench" # not available on darwin via Nix
-    ];
+    ## TODO: This is a workaround for LnL7/nix-darwin#1314.
+    brews = lib.mkForce [];
     caskArgs = {
       appdir = "/Applications/Homebrew Apps";
       fontdir = "/Library/Fonts/Homebrew Fonts";
@@ -98,15 +100,9 @@
       # "delicious-library" # perhaps removed?
       "eagle" # doesn't respect appdir # not available on darwin via Nix
       "google-drive" # doesn't respect appdir
-      "growlnotify"
-      "pokemon-trading-card-game-online" # for the kids
       "psi"
       "r" # doesn't respect appdir
       "racket"
-      "spotify" # not available on darwin via Nix
-      # not available on darwin via Nix
-      # I don’t know how to control auto-update
-      "steam"
       "timemachineeditor"
       # "virtualbox" # requires Intel architecture
       {
@@ -131,17 +127,14 @@
       Deliveries = 290986013;
       FocusMask = 435999818;
       GarageBand = 682658836;
-      Harvest = 506189836;
       iMovie = 408981434;
       Keynote = 409183694;
       Numbers = 409203825;
-      "ODAT Tracker" = 448831531;
       Pages = 409201541;
       "Picture Window" = 507262984;
       "Prime Video" = 545519333;
       reMarkable = 1276493162;
       "Remote Mouse" = 403195710;
-      Robotek = 462238382;
       SoundCloud = 412754595;
       # Twitter = 409789998; # currently subsumed by ferdium
       Xcode = 497799835;
@@ -155,6 +148,20 @@
       upgrade = true;
     };
   };
+  ## Don’t auto-upgrade from the Mac App Store (this is handled by
+  ## `homebrew.masApps`).
+  system.defaults.CustomSystemPreferences."com.apple.commerce".AutoUpdate = false;
+  ## TODO: Build this incrementally from arbitrarily-named scripts.
+  system.activationScripts.postUserActivation.text = ''
+    echo "checking for un-managed apps ..."
+    mas list | sort >installed-packages
+    echo "App Store apps that are installed, but not in the nix-darwin configuration:"
+    join -v1 -1 1 installed-packages - <<EOF
+    ${lib.concatStringsSep "\n"
+      (lib.sort (a: b: a <= b) (map toString (lib.attrValues config.homebrew.masApps)))}
+    EOF
+    rm installed-packages
+  '';
 
   nix = {
     gc = {

diff --git a/nix/modules/games.nix b/nix/modules/games.nix
@@ -6,6 +6,17 @@
   ...
 }: {
   config = flaky.lib.multiConfig options {
+    darwinConfig = {
+      homebrew = {
+        casks = [
+          # not available on darwin via Nix
+          # I don’t know how to control auto-update
+          "steam"
+        ];
+        masApps.Robotek = 462238382;
+      };
+    };
+
     homeConfig = {
       home.packages = lib.optionals pkgs.stdenv.hostPlatform.isDarwin [
         pkgs.nixcasks.marathon

diff --git a/nix/modules/home-configuration.nix b/nix/modules/home-configuration.nix
@@ -215,6 +215,7 @@
         })
         ## not available on darwin via Nix
         (maybeNixcask "obs-studio" "obs")
+        pkgs.python3Packages.opentype-feature-freezer
         # pkgs.slack # currently subsumed by ferdium
         pkgs.synergy
         pkgs.tailscale
@@ -224,6 +225,7 @@
       ]
       ++ map (font: font.package) fonts
       ++ lib.optionals (pkgs.system != "aarch64-linux") [
+        pkgs.spotify
         pkgs.unison-ucm # Unison dev tooling
         pkgs.zoom-us
       ]
@@ -518,6 +520,7 @@
       "eagle"
       "onepassword-password-manager"
       "plexmediaserver"
+      "spotify"
       "zoom"
     ];
   };
@@ -576,7 +579,7 @@
 
   targets.darwin = lib.mkIf pkgs.stdenv.hostPlatform.isDarwin {
     defaults = {
-      "Apple Global Domain" = {
+      "NSGlobalDomain" = {
         AppleInterfaceStyleSwitchesAutomatically = true;
         NSAutomaticCapitalizationEnabled = false;
         NSAutomaticDashSubstitutionEnabled = false;
@@ -601,6 +604,8 @@
         ];
         "com.apple.sound.beep.flash" = 1;
       };
+      # Opt out of Apple Intelligence.
+      "com.apple.CloudSubscriptionFeatures.optIn"."545129924" = false;
       "com.apple.desktopservices" = {
         DSDontWriteNetworkStores = true;
         DSDontWriteUSBStores = true;

diff --git a/nix/modules/ntfy.nix b/nix/modules/ntfy.nix
@@ -13,6 +13,7 @@ in {
     sessionVariables.AUTO_NTFY_DONE_IGNORE = lib.concatStringsSep " " [
       "emacs"
       "less"
+      "man"
       "ssh"
     ];
   };

diff --git a/nix/modules/shell.nix b/nix/modules/shell.nix
@@ -42,7 +42,7 @@
         };
         ## Make sure we don’t fall back to different versions on non-NixOS (e.g.
         ## the ancient Bash 3.2 on darwin).
-        shell.program = lib.getExe pkgs.bashInteractive;
+        terminal.shell.program = lib.getExe pkgs.bashInteractive;
       };
     };
-Original file line number
+Diff line change
@@ Expand Up / @@ -13,6 +13,7 @@ in { @@
         sessionVariables.AUTO_NTFY_DONE_IGNORE = lib.concatStringsSep " " [
           "emacs"
           "less"
+          "man"
           "ssh"
         ];
       };
@@ Expand Down @@