Add a nix-darwin config for a m1 mac mini.

nix/configuration/configuration.nix

@@ -64,7 +64,6 @@ in
     ./roles/media
     ./roles/memtest86
     ./roles/minimal_base
-    ./roles/mitmproxy
     ./roles/network
     ./roles/nix_index
     ./roles/nix_repl
@@ -248,31 +247,31 @@ in
             glew = (final.glew.override { enableEGL = false; });
           };
         })
-        (disableTests "onetbb") # oneTBB tests hang forever on machines with a single core (like my build virtual machine) https://github.com/uxlfoundation/oneTBB/issues/1557
-        (disableTests "aws-c-common") # aws-c-common tests time out on my build virtual machine but run fine on my laptop.
-        (disableOptimizations "onnxruntime") # QuantizeLinearOpTest test failing.
         (final: prev: {
-          rpcs3 = prev.rpcs3.overrideAttrs (
+          fwupd = prev.fwupd.overrideAttrs (
             finalAttrs: prevAttrs: {
-              version = "0.0.42-19843";
+              version = "2.1.5";
-
               src = final.fetchFromGitHub {
-                owner = "RPCS3";
+                owner = "fwupd";
-                repo = "rpcs3";
+                repo = "fwupd";
-                rev = "6567a5a2f8ab47a89db395d6b47a7b59b23d6960";
+                tag = finalAttrs.version;
-                postCheckout = ''
+                hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
-                  cd $out/3rdparty
-                  git submodule update --init \
-                    fusion/fusion asmjit/asmjit yaml-cpp/yaml-cpp SoundTouch/soundtouch stblib/stb \
-                    feralinteractive/feralinteractive wolfssl/wolfssl
-                '';
-                hash = "sha256-a1c1+Ui7XyHFTGEZAgRuJasCzQqr2PZNTlwaDUWVb18=";
               };
-
-              patches = [ ];
             }
           );
         })
+        (disableTests "onetbb") # oneTBB tests hang forever on machines with a single core (like my build virtual machine) https://github.com/uxlfoundation/oneTBB/issues/1557
+        (disableTests "aws-c-common") # aws-c-common tests time out on my build virtual machine but run fine on my laptop.
+
+        # Works but probably sets python2's scipy to be python3:
+        #
+        # (final: prev: {
+        #   pythonPackagesExtensions = prev.pythonPackagesExtensions ++ [
+        #     (python-final: python-prev: {
+        #       scipy = final.unoptimized.python3Packages.scipy;
+        #     })
+        #   ];
+        # })
       ];
 
     # This option defines the first version of NixOS you have installed on this particular machine,

nix/configuration/flake.lock

@@ -22,11 +22,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1781152676,
+        "lastModified": 1780894562,
-        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
+        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
+        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
         "type": "github"
       },
       "original": {
@@ -170,11 +170,11 @@
         "rust-overlay": "rust-overlay_2"
       },
       "locked": {
-        "lastModified": 1785893730,
+        "lastModified": 1786250497,
-        "narHash": "sha256-K3pjEDafWrpfC1dc14icLxx9tWx4c/dfKTeiDYoZU7Q=",
+        "narHash": "sha256-OPhVT5n9OyPDZA3mIO6D5jVVvp/QmG8nT5Trb0gouSs=",
         "ref": "refs/heads/main",
-        "rev": "83f05b36778dd90d4e15e0d020685d9388cbaea1",
+        "rev": "0a270dcbdd51baa2895634a3baee29373db8337a",
-        "revCount": 39,
+        "revCount": 42,
         "type": "git",
         "url": "https://code.fizz.buzz/talexander/nix_builder.git"
       },
@@ -185,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1787498568,
+        "lastModified": 1780749050,
-        "narHash": "sha256-9i/VTdusq/+NM/tz+J1Re+ojkMB8MBf0QshnYfzHz30=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "56c02bc00adcf003215cc4bd996d6efaf4cff188",
+        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
         "type": "github"
       },
       "original": {
@@ -199,6 +199,22 @@
         "type": "github"
       }
     },
+    "nixpkgs-google": {
+      "locked": {
+        "lastModified": 1779893571,
+        "narHash": "sha256-wiwMyVCtmjRjlFCe2zaumCE6LRV9GzzN0ZH25NQkbAU=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "45f6cfaa4605b706c870e75bd74bdb5e97eee11e",
+        "type": "github"
+      }
+    },
     "nixpkgs-stable": {
       "locked": {
         "lastModified": 1730741070,
@@ -248,7 +264,8 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nix_builder": "nix_builder",
-        "nixpkgs": "nixpkgs"
+        "nixpkgs": "nixpkgs",
+        "nixpkgs-google": "nixpkgs-google"
       }
     },
     "rust-overlay": {

nix/configuration/flake.nix

@@ -20,6 +20,7 @@
       inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
+    nixpkgs-google.url = "github:NixOS/nixpkgs/45f6cfaa4605b706c870e75bd74bdb5e97eee11e";
     lanzaboote = {
       url = "github:nix-community/lanzaboote/v0.4.2";
       inputs.nixpkgs.follows = "nixpkgs";
@@ -38,6 +39,7 @@
     {
       self,
       nixpkgs,
+      nixpkgs-google,
       disko,
       impermanence,
       lanzaboote,
@@ -97,6 +99,9 @@
                       hostPlatform.gcc.arch = "default";
                       hostPlatform.gcc.tune = "default";
                     };
+                    google = import nixpkgs-google {
+                      system = prev.stdenv.hostPlatform.system;
+                    };
                   })
                 ];
               };

nix/configuration/hosts/odo/default.nix

@@ -118,7 +118,6 @@
     me.lvfs.enable = true;
     me.media.enable = true;
     me.memtest.enable = true;
-    me.mitmproxy.enable = true;
     me.network.enable = true;
     me.nix_index.enable = true;
     me.nix_repl.enable = true;

nix/configuration/hosts/quark/default.nix

@@ -111,7 +111,6 @@
     me.lvfs.enable = true;
     me.media.enable = true;
     me.memtest.enable = true;
-    me.mitmproxy.enable = true;
     me.network.enable = true;
     me.nix_index.enable = true;
     me.nix_repl.enable = true;

nix/configuration/roles/firefox/default.nix

@@ -134,7 +134,7 @@
       users.talexander = {
         directories = [
           {
-            directory = ".config/mozilla";
+            directory = ".mozilla";
             user = "talexander";
             group = "talexander";
             mode = "0700";

nix/configuration/roles/gcloud/default.nix

@@ -18,7 +18,7 @@
   };
 
   config = lib.mkIf config.me.gcloud.enable {
-    environment.systemPackages = with pkgs; [
+    environment.systemPackages = with pkgs.google; [
       (google-cloud-sdk.withExtraComponents [ google-cloud-sdk.components.gke-gcloud-auth-plugin ])
     ];
 

nix/configuration/roles/kernel/default.nix

@@ -14,12 +14,30 @@ let
     full = {
       PREEMPT_DYNAMIC = yes;
       PREEMPT = yes;
+      PREEMPT_VOLUNTARY = lib.mkForce no;
       PREEMPT_LAZY = lib.mkForce no;
+      PREEMPT_NONE = no;
     };
     lazy = {
       PREEMPT_DYNAMIC = yes;
       PREEMPT = no;
+      PREEMPT_VOLUNTARY = lib.mkForce no;
       PREEMPT_LAZY = yes;
+      PREEMPT_NONE = no;
+    };
+    voluntary = {
+      PREEMPT_DYNAMIC = no;
+      PREEMPT = no;
+      PREEMPT_VOLUNTARY = yes;
+      PREEMPT_LAZY = lib.mkForce no;
+      PREEMPT_NONE = no;
+    };
+    none = {
+      PREEMPT_DYNAMIC = no;
+      PREEMPT = no;
+      PREEMPT_VOLUNTARY = lib.mkForce no;
+      PREEMPT_LAZY = lib.mkForce no;
+      PREEMPT_NONE = yes;
     };
   };
   tick_hz =
@@ -81,14 +99,16 @@ let
       TRANSPARENT_HUGEPAGE_MADVISE = yes;
     };
   };
-  common_config = with lib.kernel; {
+  common_config =
+    with lib.kernel;
+    {
       # Google's BBRv3 TCP congestion Control
       TCP_CONG_BBR = yes;
       DEFAULT_BBR = yes;
     };
   flavors = {
     server = lib.mkMerge [
-      preemption_type.lazy
+      preemption_type.none
       tick_hz."300"
       performance_governor.default
       tick_rate.tickless
@@ -122,8 +142,7 @@ in
 
     kernel.version = lib.mkOption {
       type = lib.types.str;
-      # default = "linux"; # LTS
+      default = "linux"; # LTS
-      default = "linux_7_2"; # LTS
       example = "linux_6_18";
       description = "What version of the kernl should we use.";
     };

nix/configuration/roles/latex/default.nix

@@ -25,8 +25,8 @@
     nixpkgs.overlays = [
       (final: prev: {
         tex = (
-          pkgs.texliveSmall.withPackages (
+          pkgs.texlive.combine {
-            ps: with ps; [
+            inherit (pkgs.texlive)
               scheme-basic
               dvisvgm
               dvipng # for preview and export as html in org-mode
@@ -44,8 +44,8 @@
               upquote # emacs org-mode pdf export
               lineno # emacs org-mode pdf export
               beamer # emacs org-mode presentation pdf export
-            ]
+              ;
-          )
+          }
         );
       })
     ];

nix/configuration/roles/mitmproxy/default.nix

@@ -1,25 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  imports = [ ];
-
-  options.me = {
-    mitmproxy.enable = lib.mkOption {
-      type = lib.types.bool;
-      default = false;
-      example = true;
-      description = "Whether we want to install mitmproxy.";
-    };
-  };
-
-  config = lib.mkIf config.me.mitmproxy.enable {
-    environment.systemPackages = with pkgs; [
-      mitmproxy
-    ];
-  };
-}

nix/configuration/roles/podman/default.nix

@@ -34,9 +34,7 @@
     # Write config files in /etc/containers
     virtualisation.containers.enable = true;
     # By default this includes "quay.io" which leads to prompting for which registry to download from.
-    virtualisation.containers.registries.settings = {
+    virtualisation.containers.registries.search = [ "docker.io" ];
-      unqualified-search-registries = [ "docker.io" ];
-    };
     virtualisation = {
       podman = {
         enable = true;

nix/configuration/roles/rpcs3/default.nix

@@ -38,7 +38,7 @@ in
           };
         };
         Miscellaneous = {
-          "Pause emulation on RPCS3 focus loss" = false;
+          "Pause emulation on RPCS3 focus loss" = true;
           "Start games in fullscreen mode" = true;
           "Pause Emulation During Home Menu" = false; # true makes the home menu slow
         };
@@ -53,10 +53,7 @@ in
       rpcs3
     ];
 
-    allowedUnfree = [
+    allowedUnfree = [ "rpcs3" ];
-      "rpcs3"
-      "corefonts"
-    ];
 
     security.pam.loginLimits = [
       {
@@ -73,10 +70,6 @@ in
       }
     ];
 
-    fonts.packages = with pkgs; [
-      corefonts # Needed for Arial, otherwise launching games fails.
-    ];
-
     me.install.user.talexander.file = {
       ".config/rpcs3/config.yml" = lib.mkIf (config.me.rpcs3.config != null) {
         source = rpcs3_config_yaml;

nix/nix-darwin/flake.lock

@@ -0,0 +1,49 @@
+{
+  "nodes": {
+    "nix-darwin": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1785389976,
+        "narHash": "sha256-0tLW8Ff5yt8AH97jw4ZpFJ0OCJ122zIlgWGDmOfU/VU=",
+        "owner": "nix-darwin",
+        "repo": "nix-darwin",
+        "rev": "15abb8c98f336cd8bd840d71059adebabe60bf04",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-darwin",
+        "ref": "master",
+        "repo": "nix-darwin",
+        "type": "github"
+      }
+    },
+    "nixpkgs": {
+      "locked": {
+        "lastModified": 1786348146,
+        "narHash": "sha256-we5zDEFfn8TgzeWKjKDMIjeQZ59omEPl23NIF+13/ys=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "d482ef84049d9b7276b83a06e4e4d76983830097",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "root": {
+      "inputs": {
+        "nix-darwin": "nix-darwin",
+        "nixpkgs": "nixpkgs"
+      }
+    }
+  },
+  "root": "root",
+  "version": 7
+}

nix/nix-darwin/flake.nix

@@ -0,0 +1,128 @@
+# Initial install:
+#   Install nix: https://github.com/nixOS/nix-installer
+#   sudo nix run nix-darwin -- switch --flake .#garak
+#
+# Update after that:
+#   sudo darwin-rebuild switch --flake .#garak
+#
+# Manual:
+#   Install rosetta to run x86_64 programs:
+#   softwareupdate --install-rosetta --agree-to-license
+#
+#   Install homebrew for installing graphical apps:
+#   /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)"
+{
+  description = "nix-darwin system flake";
+
+  inputs = {
+    nixpkgs.url = "github:NixOS/nixpkgs/nixpkgs-unstable";
+    nix-darwin.url = "github:nix-darwin/nix-darwin/master";
+    nix-darwin.inputs.nixpkgs.follows = "nixpkgs";
+  };
+
+  outputs = inputs@{ self, nix-darwin, nixpkgs }:
+  let
+    configuration = { pkgs, ... }: {
+      # List packages installed in system profile. To search by name, run:
+      # $ nix-env -qaP | grep wget
+      environment.systemPackages =
+        [
+          pkgs.tmux
+          pkgs.htop
+          pkgs.git
+        ];
+
+      # Necessary for using flakes on this system.
+      nix.settings.experimental-features = "nix-command flakes";
+
+      # Enable alternative shell support in nix-darwin.
+      # programs.fish.enable = true;
+
+      # Set Git commit hash for darwin-version.
+      system.configurationRevision = self.rev or self.dirtyRev or null;
+
+      # Used for backwards compatibility, please read the changelog before changing.
+      # $ darwin-rebuild changelog
+      system.stateVersion = 6;
+
+      # The platform the configuration will be used on.
+      nixpkgs.hostPlatform = "aarch64-darwin";
+
+      # Identifies which user some settings apply to.
+      system.primaryUser = "talexander";
+
+      # Enable Linux VM for building Linux binaries.
+      #
+      # Test with:
+      #   nix build --impure --expr '(with import <nixpkgs> { system = "aarch64-linux"; }; runCommand "foo" {} "uname -a > $out")'
+      nix.linux-builder.enable = true;
+
+      # system.defaults.CustomUserPreferences = {
+      #   "com.apple.desktopservices" = {
+      #     # Do not write .DS_Store files to external volumes
+      #     DSDontWriteNetworkStores = true;
+      #     DSDontWriteUSBStores = true;
+      #   };
+      #   "com.apple.screensaver" = {
+      #     # Ask for password when returning from screensaver
+      #     askForPassword = 1;
+      #     askForPasswordDelay = 0;
+      #   };
+      #   "com.apple.SoftwareUpdate" = {
+      #     AutomaticCheckEnabled = true;
+      #     # Download updates in the background
+      #     AutomaticDownload = 1;
+      #   };
+      # };
+
+      # Use homebrew to install graphical apps from casks.
+      # homebrew = {
+      #   enable = false;
+
+      #   casks = [
+      #     "firefox"
+      #   ];
+      # };
+
+      # system.defaults = {
+      #   dock = {
+      #     autohide = true;
+      #   };
+      # };
+
+      environment.variables = {
+        TERMINFO_DIRS = ["${pkgs.alacritty.terminfo.outPath}/share/terminfo"];
+      };
+
+      power = {
+        sleep = {
+          # sudo pmset -a displaysleep 10 sleep 0 disksleep 10
+          # Other options to consider: lowpowermode 0 standby 0 hibernatemode 0 powernap 0
+          #
+          # Defaults:
+          #   standby              0
+          #   Sleep On Power Button 1
+          #   autorestartatconnect 0
+          #   autorestart          0
+          #   powernap             1
+          #   networkoversleep     0
+          #   disksleep            10
+          #   sleep                1
+          #   ttyskeepawake        1
+          #   displaysleep         10
+          #   tcpkeepalive         1
+          #   womp                 1
+          #
+          computer = "never";
+          display = 10;
+          harddisk = 10;
+        };
+      };
+    };
+  in
+  {
+    darwinConfigurations."garak" = nix-darwin.lib.darwinSystem {
+      modules = [ configuration ];
+    };
+  };
+}