From 06a96146e17ca92731cb2b6517ccf302e402a3c6 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 17 Nov 2025 16:05:42 +0100 Subject: [PATCH 1/4] flake/dev/flake: update nixpkgs input Update the nixpkgs input to fix the nixpkgs-and-dev-nixpkgs-version-consistency check. Fixes: efd80454b484 ("flake: update nixpkgs input") --- flake/dev/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index 91b57d84..9e9dcb81 100644 --- a/flake/dev/flake.lock +++ b/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": { From 628e990ddec8bbb167a3746dedf6cbbcd5be8ab2 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:53:20 +0100 Subject: [PATCH 2/4] treewide: apply Nixpkgs update Fixes: efd80454b484 ("flake: update nixpkgs input") Co-authored-by: 0xda157 --- doc/src/modules.md | 2 +- flake.nix | 2 +- generated/all-maintainers.nix | 14 +++++++------- modules/alacritty/meta.nix | 2 +- modules/fnott/meta.nix | 2 +- modules/mpv/meta.nix | 2 +- modules/ncspot/meta.nix | 2 +- modules/waybar/meta.nix | 2 +- modules/yazi/hm.nix | 2 +- stylix/maintainers.nix | 7 ------- stylix/meta.nix | 4 +++- 11 files changed, 18 insertions(+), 23 deletions(-) diff --git a/doc/src/modules.md b/doc/src/modules.md index 7cc87372..615f268e 100644 --- a/doc/src/modules.md +++ b/doc/src/modules.md @@ -246,8 +246,8 @@ number of maintainers: { lib, ... }: { maintainers = with lib.maintainers; [ - awwpotato danth + da157 naho ]; } diff --git a/flake.nix b/flake.nix index 94a48ef2..9a0502da 100644 --- a/flake.nix +++ b/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"). # diff --git a/generated/all-maintainers.nix b/generated/all-maintainers.nix index 55ea28e2..9c9269cb 100644 --- a/generated/all-maintainers.nix +++ b/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"; diff --git a/modules/alacritty/meta.nix b/modules/alacritty/meta.nix index 1990bbd2..b5935813 100644 --- a/modules/alacritty/meta.nix +++ b/modules/alacritty/meta.nix @@ -2,5 +2,5 @@ { name = "Alacritty"; homepage = "https://github.com/alacritty/alacritty"; - maintainers = [ lib.maintainers.awwpotato ]; + maintainers = [ lib.maintainers.da157 ]; } diff --git a/modules/fnott/meta.nix b/modules/fnott/meta.nix index 029069f9..ff399fe5 100644 --- a/modules/fnott/meta.nix +++ b/modules/fnott/meta.nix @@ -3,7 +3,7 @@ name = "Fnott"; homepage = "https://codeberg.org/dnkl/fnott"; maintainers = with lib.maintainers; [ - awwpotato + da157 MrSom3body ]; } diff --git a/modules/mpv/meta.nix b/modules/mpv/meta.nix index e4acf4a6..08dc4dbf 100644 --- a/modules/mpv/meta.nix +++ b/modules/mpv/meta.nix @@ -3,7 +3,7 @@ name = "mpv"; homepage = "https://mpv.io"; maintainers = with lib.maintainers; [ - awwpotato + da157 naho ]; } diff --git a/modules/ncspot/meta.nix b/modules/ncspot/meta.nix index 89fdb978..942965fa 100644 --- a/modules/ncspot/meta.nix +++ b/modules/ncspot/meta.nix @@ -2,5 +2,5 @@ { name = "ncspot"; homepage = "https://github.com/hrkfdn/ncspot"; - maintainers = [ lib.maintainers.awwpotato ]; + maintainers = [ lib.maintainers.da157 ]; } diff --git a/modules/waybar/meta.nix b/modules/waybar/meta.nix index f41bc311..49b404ad 100644 --- a/modules/waybar/meta.nix +++ b/modules/waybar/meta.nix @@ -2,5 +2,5 @@ { name = "Waybar"; homepage = "https://github.com/alexays/waybar"; - maintainers = [ lib.maintainers.awwpotato ]; + maintainers = [ lib.maintainers.da157 ]; } diff --git a/modules/yazi/hm.nix b/modules/yazi/hm.nix index 78783149..bf01e02e 100644 --- a/modules/yazi/hm.nix +++ b/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; diff --git a/stylix/maintainers.nix b/stylix/maintainers.nix index 997042e7..b2170385 100644 --- a/stylix/maintainers.nix +++ b/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"; diff --git a/stylix/meta.nix b/stylix/meta.nix index 9a6763a6..5557bf0b 100644 --- a/stylix/meta.nix +++ b/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 + ); } ); }) From dcf49c0c55c027b3b0d97c9b606526882bc809d1 Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 17 Nov 2025 11:06:09 +0100 Subject: [PATCH 3/4] stylix/testbed/default: deprecate pkgs.system Deprecate pkgs.system with pkgs.stdenv.hostPlatform.system, following upstream commit [1] ("aliases: add warnings to deprecated system definitions"). [1]: https://github.com/NixOS/nixpkgs/commit/90cb7876446bf1684ffe40ab7832de0ec1b92991 Fixes: efd80454b484 ("flake: update nixpkgs input") --- stylix/testbed/default.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/stylix/testbed/default.nix b/stylix/testbed/default.nix index ecb02113..cd43da05 100644 --- a/stylix/testbed/default.nix +++ b/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) From 536a54bd4d907df3aae548501660bfd8b869bdac Mon Sep 17 00:00:00 2001 From: NAHO <90870942+trueNAHO@users.noreply.github.com> Date: Mon, 17 Nov 2025 10:52:03 +0100 Subject: [PATCH 4/4] flake/dev/flake: update treefmt-nix input Update the treefmt-nix input, primarily to pull commit [1] ("fix(biome): update schema hashes"). [1]: https://github.com/numtide/treefmt-nix/commit/fb030205684fc4b6dee6c7c6bbcd2bc2523270c5 Co-authored-by: Mikilio --- flake/dev/flake.lock | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/flake/dev/flake.lock b/flake/dev/flake.lock index 9e9dcb81..c5d85910 100644 --- a/flake/dev/flake.lock +++ b/flake/dev/flake.lock @@ -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": {