darwin/darwin.nix

@@ -1,32 +1,16 @@
 { pkgs, system, ... }: {
-  environment = {
+  # List packages installed in system profile. To search by name, run:
-    # We'll use Vim globally.
+  # $ nix-env -qaP | grep wget
-    systemPackages = [
+  environment.systemPackages = [
-      pkgs.vim
+    pkgs.vim
-    ];
+  ];
-    variables.EDITOR = "${pkgs.vim}/bin/vim";
-  };
-
-  system.activationScripts.extraActivation.text = '' 
-    # Remove the symlink if it doesn't already exist.
-    rm -f /Library/Java/JavaVirtualMachines/zulu-latest.jdk
-
-    # We should only have a single JDK present within our package,
-    # but let's limit `find` regardless.
-    JDK_LOCATION="$(find "${pkgs.jdk}" -name "*.jdk" | head -n1)"
-
-    # Symlink!
-    ln -sf "$JDK_LOCATION" "/Library/Java/JavaVirtualMachines/zulu-latest.jdk"
-  '';
 
   # Auto upgrade nix package and the daemon service.
   services.nix-daemon.enable = true;
-  nix = {
+  nix.package = pkgs.nix;
-    # Keep the latest version of Nix.
+
-    package = pkgs.nix;
+  # Necessary for using flakes on this system.
-    # Necessary for using flakes on this system.
+  nix.settings.experimental-features = "nix-command flakes";
-    settings.experimental-features = "nix-command flakes";
-  };
 
   # Create /etc/zshrc that loads the nix-darwin environment.
   programs.zsh.enable = true;

flake.nix

@@ -105,8 +105,7 @@
           # System-wide configuration
           ./darwin/darwin.nix
           # Our provided home-manager configuration
-          home-manager.darwinModules.home-manager
+          home-manager.darwinModules.home-manager {
-          {
             home-manager = {
               useGlobalPkgs = true;
               useUserPackages = true;