Increase thresholds for automatic garbage collection.

Seeing if this is what is causing all my issues with files/directories in the nix store going missing.

nix/configuration/configuration.nix

@@ -36,6 +36,7 @@ in
     ./roles/emacs
     ./roles/emulate_isa
     ./roles/esim
+    ./roles/exfat
     ./roles/firefox
     ./roles/firewall
     ./roles/flux
@@ -117,14 +118,14 @@ in
     nix.settings.experimental-features = [
       "nix-command"
       "flakes"
-      "ca-derivations"
+      # "ca-derivations"
       # "blake3-hashes"
       # "git-hashing"
     ];
     nix.settings.trusted-users = [ "@wheel" ];
     nix.settings.connect-timeout = 5;
-    nix.settings.min-free = 128000000;
+    nix.settings.min-free = 5 * 1024 * 1024 * 1024; # Kick off garbage collect if space for nix store is less than 5 GiB
-    nix.settings.max-free = 1000000000;
+    nix.settings.max-free = 10 * 1024 * 1024 * 1024; # Run that garbage collect until at least 10 GiB are free.
     nix.settings.fallback = true;
     nix.settings.warn-dirty = false;
     nix.settings.fsync-metadata = true;
@@ -246,8 +247,31 @@ in
             glew = (final.glew.override { enableEGL = false; });
           };
         })
+        (final: prev: {
+          fwupd = prev.fwupd.overrideAttrs (
+            finalAttrs: prevAttrs: {
+              version = "2.1.5";
+              src = final.fetchFromGitHub {
+                owner = "fwupd";
+                repo = "fwupd";
+                tag = finalAttrs.version;
+                hash = "sha256-DzQ+N99ZmFRqZc2rN6PSqmoIMXUyrE8Kkn+KnT/AWPc=";
+              };
+            }
+          );
+        })
         (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": 1785248363,
+        "lastModified": 1786250497,
-        "narHash": "sha256-hx9Cn1vIa/h54t+s3ObO6+Z3xHSA1zc3YVRWxTZcigc=",
+        "narHash": "sha256-OPhVT5n9OyPDZA3mIO6D5jVVvp/QmG8nT5Trb0gouSs=",
         "ref": "refs/heads/main",
-        "rev": "0addf91edf82775a0dc5022a81065ef101305e64",
+        "rev": "0a270dcbdd51baa2895634a3baee29373db8337a",
-        "revCount": 38,
+        "revCount": 42,
         "type": "git",
         "url": "https://code.fizz.buzz/talexander/nix_builder.git"
       },
@@ -185,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1785318670,
+        "lastModified": 1780749050,
-        "narHash": "sha256-dN6Ou5x/+23FZLEpYP3IffO+NyJFzUlGumt1uu3MMaY=",
+        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0954f7ee2f6bb3dc7d4e3d0d8bcb8fd4bde4cfc5",
+        "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/family_disks/distributed_build.nix

@@ -4,13 +4,15 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable = false;
+      enable_build = false;
+      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable = true;
+      enable_build = false;
+      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/i_only_boot_zfs/distributed_build.nix

@@ -4,10 +4,19 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable = true;
+      enable_build = false;
+      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
+    me.distributed_build.machines.hydra = {
+      enable_build = false;
+      enable_substituter = true;
+      additional_config = {
+        speedFactor = 2;
+      };
+      substituter_url = "ssh-ng://nixworker@ns1.fizz.buzz:65122?compress=true&ssh-key=/persist/manual/ssh/root/keys/id_ed25519&remote-store=local?root=/.disk/root";
+    };
   };
 }

nix/configuration/hosts/odo/default.nix

@@ -94,6 +94,7 @@
     me.emacs_flavor = "full";
     me.emulate_isa.enable = true;
     me.esim.enable = true;
+    me.exfat.enable = true;
     me.firefox.enable = true;
     me.firewall.enable = true;
     me.flux.enable = true;
@@ -164,7 +165,7 @@
     me.zrepl.enable = true;
     me.zsh.enable = true;
 
-    me.sm64ex.enable = true;
+    me.sm64ex.enable = false;
     me.shipwright.enable = false;
     me.ship2harkinian.enable = true;
   };

nix/configuration/hosts/odo/distributed_build.nix

@@ -4,13 +4,15 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable = false;
+      enable_build = true;
+      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable = true;
+      enable_build = false;
+      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/odowork/distributed_build.nix

@@ -4,13 +4,15 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable = false;
+      enable_build = false;
+      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
     me.distributed_build.machines.hydra = {
-      enable = true;
+      enable_build = false;
+      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/quark/default.nix

@@ -159,7 +159,7 @@
     me.zrepl.enable = true;
     me.zsh.enable = true;
 
-    me.sm64ex.enable = true;
+    me.sm64ex.enable = false;
     me.shipwright.enable = false;
     me.ship2harkinian.enable = true;
   };

nix/configuration/hosts/quark/distributed_build.nix

@@ -3,8 +3,16 @@
 
   config = {
     me.distributed_build.enable = true;
+    me.distributed_build.machines.quark = {
+      enable_build = false;
+      enable_substituter = false;
+      additional_config = {
+        speedFactor = 2;
+      };
+    };
     me.distributed_build.machines.hydra = {
-      enable = true;
+      enable_build = false;
+      enable_substituter = true;
       additional_config = {
         speedFactor = 2;
       };

nix/configuration/hosts/recovery/distributed_build.nix

@@ -4,10 +4,19 @@
   config = {
     me.distributed_build.enable = true;
     me.distributed_build.machines.quark = {
-      enable = true;
+      enable_build = false;
+      enable_substituter = false;
       additional_config = {
         speedFactor = 2;
       };
     };
+    me.distributed_build.machines.hydra = {
+      enable_build = false;
+      enable_substituter = true;
+      additional_config = {
+        speedFactor = 2;
+      };
+      substituter_url = "ssh-ng://nixworker@ns1.fizz.buzz:65122?compress=true&ssh-key=/persist/manual/ssh/root/keys/id_ed25519&remote-store=local?root=/.disk/root";
+    };
   };
 }

nix/configuration/roles/distributed_build/default.nix

@@ -10,7 +10,14 @@
 
 let
   make_machine_config = name: {
-    enable = lib.mkOption {
+    enable_build = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to use the ${name} machine during distributed builds.";
+    };
+
+    enable_substituter = lib.mkOption {
       type = lib.types.bool;
       default = false;
       example = true;
@@ -59,11 +66,30 @@ let
       hostName = lib.mkForce "hydra?remote-store=local?root=/.disk/root";
     };
   };
+  build_machine_list = (
+    map (
+      hostname:
+      (lib.mkIf config.me.distributed_build.machines."${hostname}".enable_build (
+        lib.mkMerge [
+          {
+            hostName = hostname;
+            sshUser = "nixworker";
+            sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
+            maxJobs = 1;
+            supportedFeatures = all_nixos_configs."${hostname}".config.me.optimizations.system_features;
+            protocol = "ssh-ng";
+          }
+          static_host_configs."${hostname}"
+          config.me.distributed_build.machines."${hostname}".additional_config
+        ]
+      ))
+    ) (builtins.attrNames all_nixos_configs)
+  );
   substituters_list = (
     map (
       hostname:
       (lib.mkIf (
-        config.me.distributed_build.machines."${hostname}".enable
+        config.me.distributed_build.machines."${hostname}".enable_substituter
         && config.me.distributed_build.machines."${hostname}".substituter_url != null
       ) (config.me.distributed_build.machines."${hostname}".substituter_url))
     ) (builtins.attrNames all_nixos_configs)
@@ -109,28 +135,11 @@ in
           "odowork:zg3UKBAyLy3xtZkL0hMtbxHjxgn5A2QY8NNAgyRT6Yo="
           "quark:Eb6ygkIiVlcUqb5hOjEVIQcfYLpCz40YVYA3/rxrgBc="
           "hydra:1s4Cy9YJLgw4jWx5jdSCfJmIm0hfya7WEy/EwJYI5Ys="
+          "garak:8nUS6/aHl+FmF518WZlG4DzDToQ3fSNnpHR+aFQmkqc="
         ];
       }
       {
-        nix.buildMachines = (
+        nix.buildMachines = build_machine_list;
-          map (
-            hostname:
-            (lib.mkIf config.me.distributed_build.machines."${hostname}".enable (
-              lib.mkMerge [
-                {
-                  hostName = hostname;
-                  sshUser = "nixworker";
-                  sshKey = "/persist/manual/ssh/root/keys/id_ed25519";
-                  maxJobs = 1;
-                  supportedFeatures = all_nixos_configs."${hostname}".config.me.optimizations.system_features;
-                  protocol = "ssh-ng";
-                }
-                static_host_configs."${hostname}"
-                config.me.distributed_build.machines."${hostname}".additional_config
-              ]
-            ))
-          ) (builtins.attrNames all_nixos_configs)
-        );
       }
       (lib.mkIf has_any_substituters {
         nix.settings.substitute = lib.mkForce true;

nix/configuration/roles/exfat/default.nix

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

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/hydra/default.nix

@@ -61,6 +61,7 @@
     systemd.services."build-cache" =
       let
         enabled_targets = [
+          "wip"
           "odo"
           "odo_update"
           "odowork"

nix/configuration/roles/hydra/files/nix_builder.toml

@@ -1,5 +1,12 @@
 output_directory = "/home/nixworker/persist/nix_builder"
 
+[[targets]]
+  name = "wip"
+  repo = "https://code.fizz.buzz/talexander/machine_setup.git"
+  branch = "wip"
+  path = "nix/configuration"
+  attr = "nixosConfigurations.odo.config.system.build.toplevel"
+
 [[targets]]
   name = "odo"
   repo = "https://code.fizz.buzz/talexander/machine_setup.git"
@@ -180,10 +187,10 @@ output_directory = "/home/nixworker/persist/nix_builder"
 
 [[targets]]
   name = "nixbsd"
-  repo = "https://github.com/nixos-bsd/nixbsd.git"
+  repo = "https://code.fizz.buzz/talexander/machine_setup.git"
-  revision = "2b512eda58e6d77378bd20d6027802b158942e24"
+  branch = "nixbsd"
-  path = "."
+  path = "nix/nixbsd"
-  attr = "base.vmClosureInfo"
+  attr = "computer.vm"
 
 [[targets]]
   name = "nix_builder_develop"

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/rpcs3/default.nix

@@ -81,6 +81,10 @@ in
         # Demon's Souls per-game config.
         source = ./files/config_BLUS30443.yml;
       };
+      ".config/rpcs3/custom_configs/config_BLUS30421.yml" = {
+        # The Lord of the Rings The War in the North per-game config.
+        source = ./files/config_BLUS30421.yml;
+      };
       ".config/rpcs3/patches/patch.yml" = {
         # All of the available patches.
         source = ./files/patch.yml;

nix/configuration/roles/rpcs3/files/config_BLUS30421.yml

@@ -0,0 +1,14 @@
+Core:
+  SPU Block Size: Safe
+Video:
+  Write Color Buffers: true
+  Minimum Scalable Dimension: 640
+Net:
+  Internet enabled: Connected
+  IP address: 0.0.0.0
+  Bind address: 0.0.0.0
+  DNS address: 8.8.8.8
+  IP swap list: ""
+  UPNP Enabled: false
+  PSN status: RPCN
+  PSN Country: us

nix/kubernetes/configuration.nix

@@ -41,7 +41,7 @@
     nix.settings.experimental-features = [
       "nix-command"
       "flakes"
-      "ca-derivations"
+      # "ca-derivations"
       # "blake3-hashes"
       # "git-hashing"
     ];