2023-02-14

3 files changed, 29 insertions, 3 deletions

diff --git a/modules/darwin/common/nix.nix b/modules/darwin/common/nix.nix
index a522cb0..2b39e7d 100644
--- a/modules/darwin/common/nix.nix
+++ b/modules/darwin/common/nix.nix
@@ -1,15 +1,37 @@
 {
+  config,
+  inputs,
   lib,
   this,
   ...
 }:
 with lib; {
+  _module.args = let
+    importNixpkgsx86 = nixpkgs:
+      import nixpkgs {
+        inherit (config.nixpkgs) config;
+        system = "x86_64-darwin";
+      };
+  in rec {
+    pkgsx86 = importNixpkgsx86 inputs.nixpkgs;
+    pkgsLocalx86 = importNixpkgsx86 "${config.my.home}/src/nixpkgs"; # Impure!
+    pkgsMasterx86 = importNixpkgsx86 inputs.nixpkgs-master;
+    pkgsStablex86 = importNixpkgsx86 inputs.nixpkgs-stable;
+    pkgsRevx86 = rev: hash:
+      importNixpkgsx86 (pkgs.fetchFromGitHub {
+        owner = "NixOS";
+        repo = "nixpkgs";
+        inherit rev hash;
+      });
+    pkgsPRx86 = pr: pkgsRevx86 "refs/pull/${toString pr}/head";
+  };
+
   nix = {
     daemonIOLowPriority = false;
     daemonProcessType = "Standard";
 
-    extraOptions = optionalString (this.system == "aarch64-darwin") ''
-      extra-platforms = x86_64-darwin aarch64-darwin
+    settings.extra-platforms = optionalString (this.system == "aarch64-darwin") ''
+      x86_64-darwin aarch64-darwin
     '';
 
     settings.trusted-users = ["@admin"];
diff --git a/modules/darwin/profiles/default.nix b/modules/darwin/profiles/default.nix
index f42647a..3e783b9 100644
--- a/modules/darwin/profiles/default.nix
+++ b/modules/darwin/profiles/default.nix
@@ -50,7 +50,9 @@ in {
           orientation = "bottom";
           tilesize = 18;
 
-          show-recents = false;
+          # Don't change these options because this will disallow rearranging
+          # shortcuts.
+          show-recents = true;
           static-only = false;
 
           # Disable hot corners.
diff --git a/modules/darwin/profiles/headful.nix b/modules/darwin/profiles/headful.nix
index 44695f6..5484dfe 100644
--- a/modules/darwin/profiles/headful.nix
+++ b/modules/darwin/profiles/headful.nix
@@ -12,7 +12,9 @@ in {
     nixfiles.modules.homebrew.enable = true;
 
     homebrew.casks = [
+      {name = "chromium";}
       {name = "firefox";}
+      {name = "iterm2";}
       {name = "telegram-desktop";}
     ];
   };