treewide: apply Nixpkgs update and update treefmt-nix input (#1968)

Link: https://github.com/nix-community/stylix/pull/1968

Reviewed-by: Daniel Thwaites <danth@danth.me>
Reviewed-by: 0xda157 <da157@voidq.com>

doc/src/modules.md

@@ -246,8 +246,8 @@ number of maintainers:
   { lib, ... }:
   {
     maintainers = with lib.maintainers; [
-      awwpotato
       danth
+      da157
       naho
     ];
   }

flake.nix

@@ -33,7 +33,7 @@
 
     base16-vim = {
       # TODO: Unlock this input once [1] ("Seemingly bad parsing of whitespace
-      # in abbriviated lists (affecting stylix's handling of base16-vim)") is
+      # in abbreviated lists (affecting stylix's handling of base16-vim)") is
       # resolved, preventing us from fetching commit [2] ("fix(theme): Remove
       # illegal style attributes").
       #

flake/dev/flake.lock

@@ -22,11 +22,11 @@
     },
     "dev-nixpkgs": {
       "locked": {
-        "lastModified": 1758690382,
-        "narHash": "sha256-NY3kSorgqE5LMm1LqNwGne3ZLMF2/ILgLpFr1fS4X3o=",
+        "lastModified": 1762977756,
+        "narHash": "sha256-4PqRErxfe+2toFJFgcRKZ0UI9NSIOJa+7RXVtBhy4KE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "e643668fd71b949c53f8626614b21ff71a07379d",
+        "rev": "c5ae371f1a6a7fd27823bc500d9390b38c05fa55",
         "type": "github"
       },
       "original": {
@@ -349,11 +349,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1758728421,
-        "narHash": "sha256-ySNJ008muQAds2JemiyrWYbwbG+V7S5wg3ZVKGHSFu8=",
+        "lastModified": 1762938485,
+        "narHash": "sha256-AlEObg0syDl+Spi4LsZIBrjw+snSVU4T8MOeuZJUJjM=",
         "owner": "numtide",
         "repo": "treefmt-nix",
-        "rev": "5eda4ee8121f97b218f7cc73f5172098d458f1d1",
+        "rev": "5b4ee75aeefd1e2d5a1cc43cf6ba65eba75e83e4",
         "type": "github"
       },
       "original": {

generated/all-maintainers.nix

@@ -13,6 +13,13 @@
     githubId = 54070204;
     name = "0x5a4";
   };
+  "0xda157" = {
+    email = "da157@voidq.com";
+    github = "0xda157";
+    githubId = 153149335;
+    matrix = "@da157:catgirl.cloud";
+    name = "0xda157";
+  };
   Eveeifyeve = {
     email = "eveeg1971@gmail.com";
     github = "Eveeifyeve";
@@ -69,13 +76,6 @@
     githubId = 21687187;
     name = "Mirza Arnaut";
   };
-  awwpotato = {
-    email = "awwpotato@voidq.com";
-    github = "awwpotato";
-    githubId = 153149335;
-    matrix = "@awwpotato:envs.net";
-    name = "awwpotato";
-  };
   brckd = {
     email = "hello@bricked.dev";
     github = "brckd";

modules/alacritty/meta.nix

@@ -2,5 +2,5 @@
 {
   name = "Alacritty";
   homepage = "https://github.com/alacritty/alacritty";
-  maintainers = [ lib.maintainers.awwpotato ];
+  maintainers = [ lib.maintainers.da157 ];
 }

modules/fnott/meta.nix

@@ -3,7 +3,7 @@
   name = "Fnott";
   homepage = "https://codeberg.org/dnkl/fnott";
   maintainers = with lib.maintainers; [
-    awwpotato
+    da157
     MrSom3body
   ];
 }

modules/mpv/meta.nix

@@ -3,7 +3,7 @@
   name = "mpv";
   homepage = "https://mpv.io";
   maintainers = with lib.maintainers; [
-    awwpotato
+    da157
     naho
   ];
 }

modules/ncspot/meta.nix

@@ -2,5 +2,5 @@
 {
   name = "ncspot";
   homepage = "https://github.com/hrkfdn/ncspot";
-  maintainers = [ lib.maintainers.awwpotato ];
+  maintainers = [ lib.maintainers.da157 ];
 }

modules/waybar/meta.nix

@@ -2,5 +2,5 @@
 {
   name = "Waybar";
   homepage = "https://github.com/alexays/waybar";
-  maintainers = [ lib.maintainers.awwpotato ];
+  maintainers = [ lib.maintainers.da157 ];
 }

modules/yazi/hm.nix

@@ -25,7 +25,7 @@ mkTarget {
         in
         {
           mgr = rec {
-            # Reusing bat themes, since it's suggested in the stying guide
+            # Reusing bat themes, since it's suggested in the styling guide
             # https://yazi-rs.github.io/docs/configuration/theme#mgr
             syntect_theme = colors {
               template = ../bat/base16-stylix.tmTheme.mustache;

stylix/maintainers.nix

@@ -31,13 +31,6 @@
     github = "khas-amir";
     githubId = 11248328;
   };
-  lomenzel = {
-    name = "Leonard-Orlando Menzel";
-    email = "leonard.menzel@tutanota.com";
-    matrix = "@leonard:menzel.lol";
-    github = "lomenzel";
-    githubId = 79226837;
-  };
   make-42 = {
     email = "ontake@ontake.dev";
     name = "Louis Dalibard";

stylix/meta.nix

@@ -10,7 +10,9 @@ builtins.mapAttrs
         inherit pkgs;
         lib = lib.extend (
           _: prev: {
-            maintainers = lib.attrsets.unionOfDisjoint prev.maintainers (import ./maintainers.nix);
+            maintainers = lib.attrsets.unionOfDisjoint prev.maintainers (
+              import ./maintainers.nix
+            );
           }
         );
       })

stylix/testbed/default.nix

@@ -10,7 +10,7 @@ let
     name: testbed:
     let
       system = lib.nixosSystem {
-        inherit (pkgs) system;
+        inherit (pkgs.stdenv.hostPlatform) system;
 
         modules = [
           (lib.modules.importApply ./modules/flake-parts.nix inputs)