Upgrade to Nix 25.11

modules/hosts/common/all-gui.nix

@@ -3,7 +3,7 @@
     # nothing here right now
   ];
   programs = {
-    git.aliases = {
+    git.settings.aliases = {
       kraken = "!gitkraken -p $(cd \"\${1:-.}\" && git rev-parse --show-toplevel)";
     };
   };

modules/hosts/common/default.nix

@@ -1,5 +1,5 @@
 { inputs, pkgs, username, ... }: let
-  sqlite_lib = if builtins.elem pkgs.system [
+  sqlite_lib = if builtins.elem pkgs.stdenv.hostPlatform.system [
                  "aarch64-darwin"
                  "x86_64-darwin"
                ]
@@ -14,8 +14,8 @@ in {
     colordiff
     dogdns
     dos2unix
-    du-dust
     duf
+    dust
     esptool
     fd
     f2
@@ -37,7 +37,6 @@ in {
     nix-search
     nix-zsh-completions
     nodejs
-    nodePackages.npm
     nurl
     nvd
     onefetch
@@ -90,6 +89,10 @@ in {
     };
     bottom.enable = true;
     broot.enable = true;
+    diff-so-fancy = {
+      enable = true;
+      enableGitIntegration = true;
+    };
     direnv = {
       enable = true;
       enableZshIntegration = true;
@@ -100,8 +103,7 @@ in {
     gh.enable = true;
     git = {
       enable = true;
-      diff-so-fancy.enable = true;
-      extraConfig = {
+      settings = {
         diff.sopsdiffer.textconv = "sops --config /dev/null --decrypt";
       };
       ignores = [
@@ -111,9 +113,8 @@ in {
       ];
       includes = [ { path = "~/.gitconfig-local"; }];
       lfs.enable = true;
-      package = pkgs.gitAndTools.gitFull;
-      userName = "Gene Liverman";
-      extraConfig = {
+      package = pkgs.gitFull;
+      settings = {
         init = {
           defaultBranch = "main";
         };
@@ -124,6 +125,9 @@ in {
         pull = {
           rebase = false;
         };
+        user = {
+          name = "Gene Liverman";
+        };
       };
     }; # end git
     irssi.enable = true;

modules/hosts/darwin/mightymac/default.nix

@@ -5,7 +5,7 @@
     systemPackages = with pkgs; [
       chart-testing
       goreleaser
-      inputs.flox.packages.${pkgs.system}.default
+      inputs.flox.packages.${pkgs.stdenv.hostPlatform.system}.default
       kopia
       kubectx
       #reposurgeon # Nix is a major version behind brew

modules/hosts/darwin/mightymac/home-gene.liverman.nix

@@ -1,10 +1,10 @@
-{ username, ... }: {
+{ config, ... }: {
   home.stateVersion = "23.11";
 
   programs = {
     go = {
       enable = true;
-      goPath = "go";
+      env.GOPATH = "${config.home.homeDirectory}/go";
     };
     k9s.enable = true;
   };
@@ -12,10 +12,10 @@
   sops = {
     defaultSopsFile = ./secrets.yaml;
     secrets = {
-      i2cssh_config.path = "/Users/${username}/.i2csshrc";
-      local_git_config.path = "/Users/${username}/.gitconfig-local";
-      local_private_env.path = "/Users/${username}/.private-env";
-      user_nix_conf.path = "/Users/${username}/.config/nix/nix.conf";
+      i2cssh_config.path = "${config.home.homeDirectory}/.i2csshrc";
+      local_git_config.path = "${config.home.homeDirectory}/.gitconfig-local";
+      local_private_env.path = "${config.home.homeDirectory}/.private-env";
+      user_nix_conf.path = "${config.home.homeDirectory}/.config/nix/nix.conf";
     };
   };
 }

modules/hosts/nixos/hetznix01/post-install/default.nix

@@ -23,14 +23,7 @@ in {
       "indianspringsbsa.org"
       "pack1828.org"
     ];
-    forwards = {
-      "webmaster@indianspringsbsa.org" = "gene+indianspringsbsa.org@geneliverman.com";
-      "newsletter@indianspringsbsa.org" = "gene+indianspringsbsa.org@geneliverman.com";
-      "@alt.${domain}" = "gene+alt.${domain}@geneliverman.com";
-      "${username}@localhost" = "${username}@technicalissues.us";
-      "root@localhost" = "root@technicalissues.us";
-      "root@${config.networking.hostName}" = "root@technicalissues.us";
-    };
+    stateVersion = 3;
 
     # Use Let's Encrypt certificates from Nginx
     certificateScheme = "acme";

modules/hosts/nixos/nixnuc/default.nix

@@ -31,29 +31,31 @@ in {
     };
   };
 
-  environment.systemPackages = with pkgs; [
-    inputs.compose2nix.packages.${pkgs.system}.default
-    docker-compose
-    intel-gpu-tools
-    jellyfin
-    jellyfin-ffmpeg
-    jellyfin-web
-    net-snmp
-    nginx
-    nvme-cli
-    podman-compose
-    podman-tui # status of containers in the terminal
-    yt-dlp
-  ];
+  environment = {
+    sessionVariables = { LIBVA_DRIVER_NAME = "iHD"; };
+    systemPackages = with pkgs; [
+      inputs.compose2nix.packages.${pkgs.stdenv.hostPlatform.system}.default
+      docker-compose
+      intel-gpu-tools
+      jellyfin
+      jellyfin-ffmpeg
+      jellyfin-web
+      net-snmp
+      nginx
+      nvme-cli
+      podman-compose
+      podman-tui # status of containers in the terminal
+      yt-dlp
+    ];
+  };
 
+  # https://wiki.nixos.org/wiki/Jellyfin
   hardware.graphics = {
     enable = true;
     extraPackages = with pkgs; [
-      intel-media-driver
-      vaapiIntel
-      vaapiVdpau
-      libvdpau-va-gl
-      intel-compute-runtime # OpenCL filter support (hardware tonemapping and subtitle burn-in)
+      intel-compute-runtime-legacy1 # pre-13th gen cpu
+      intel-media-driver # For Broadwell and newer (ca. 2014+), use with LIBVA_DRIVER_NAME=iHD:
+      intel-ocl # Generic OpenCL support
     ];
   };
   
@@ -70,6 +72,7 @@ in {
       "root@localhost" = "root@technicalissues.us";
       "root@${config.networking.hostName}" = "root@technicalissues.us";
     };
+    stateVersion = 3;
 
     # Use Let's Encrypt certificates from Nginx
     certificateScheme = "acme";
@@ -122,17 +125,6 @@ in {
     };
   };
 
-  # Hardware Transcoding for Jellyfin
-  nixpkgs.overlays = [
-    (self: super: {
-      # "vaapiIntel" is in some docs, but that is an alias
-      # to intel-vaapi-driver as of 2023-05-31
-      intel-vaapi-driver = super.intel-vaapi-driver.override {
-        enableHybridCodec = true;
-      };
-    })
-  ];
-
   # Enable sound with pipewire.
   security.rtkit.enable = true;
   services.pipewire = {
@@ -721,6 +713,7 @@ in {
   };
 
   systemd.services = {
+    jellyfin.environment.LIBVA_DRIVER_NAME = "iHD";
     "mealie" = {
       requires = ["postgresql.service"];
       after = ["postgresql.service"];
@@ -752,7 +745,7 @@ in {
 
   # Compose based apps were crashing with podman compose, so back to Docker...
   virtualisation.docker.enable = true;
-  virtualisation.docker.package = pkgs.docker_26;
+  virtualisation.docker.package = pkgs.docker;
 
   virtualisation.podman = {
     enable = true;

modules/hosts/nixos/rainbow-planet/default.nix

@@ -36,7 +36,7 @@
     go
     hubble
     hugo
-    inputs.flox.packages.${pkgs.system}.default
+    inputs.flox.packages.${pkgs.stdenv.hostPlatform.system}.default
     kdePackages.bluedevil
     kdePackages.bluez-qt
     kdePackages.kdenlive
@@ -189,7 +189,7 @@
     containers.enable = true;
     docker = {
       enable = true;
-      package = pkgs.docker_26;
+      package = pkgs.docker;
     };
     libvirtd = {
       enable = true;