Update packages.

nix/configuration/configuration.nix

@@ -247,31 +247,8 @@ 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": 1780894562,
+        "lastModified": 1781152676,
-        "narHash": "sha256-c3430xwxwhHipl3jigUGMMBfpaMylDqytW/kdmB3ZGs=",
+        "narHash": "sha256-RxWs5ND31KzTG7wvMM+PMfUjyNpmIEr999lqNARaM5o=",
         "owner": "nix-community",
         "repo": "disko",
-        "rev": "24fed06cac83bcc44ac8efbb57cab1a82fa0bedc",
+        "rev": "ff8702b4de27f72b4c78573dfb89ec74e36abdf1",
         "type": "github"
       },
       "original": {
@@ -185,11 +185,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1780749050,
+        "lastModified": 1786106723,
-        "narHash": "sha256-3av0pIjlOWQ6rDbNOmpUSvbNnJkGORQKKjb4LtCZsIY=",
+        "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a799d3e3886da994fa307f817a6bc705ae538eeb",
+        "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238",
         "type": "github"
       },
       "original": {
@@ -199,22 +199,6 @@
         "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,
@@ -264,8 +248,7 @@
         "impermanence": "impermanence",
         "lanzaboote": "lanzaboote",
         "nix_builder": "nix_builder",
-        "nixpkgs": "nixpkgs",
+        "nixpkgs": "nixpkgs"
-        "nixpkgs-google": "nixpkgs-google"
       }
     },
     "rust-overlay": {

nix/configuration/flake.nix

@@ -20,7 +20,6 @@
       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";
@@ -39,7 +38,6 @@
     {
       self,
       nixpkgs,
-      nixpkgs-google,
       disko,
       impermanence,
       lanzaboote,
@@ -99,9 +97,6 @@
                       hostPlatform.gcc.arch = "default";
                       hostPlatform.gcc.tune = "default";
                     };
-                    google = import nixpkgs-google {
-                      system = prev.stdenv.hostPlatform.system;
-                    };
                   })
                 ];
               };

nix/configuration/roles/gcloud/default.nix

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

nix/configuration/roles/latex/default.nix

@@ -25,8 +25,8 @@
     nixpkgs.overlays = [
       (final: prev: {
         tex = (
-          pkgs.texlive.combine {
+          pkgs.texliveSmall.withPackages (
-            inherit (pkgs.texlive)
+            ps: with ps; [
               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/nix-darwin/flake.lock

@@ -1,49 +0,0 @@
-{
-  "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

@@ -1,128 +0,0 @@
-# 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 ];
-    };
-  };
-}