From 3bf1b986cfbfcd333f0a835861728ec405a0a759 Mon Sep 17 00:00:00 2001 From: Ryan Yin Date: Thu, 27 Nov 2025 10:54:44 +0800 Subject: [PATCH] =?UTF-8?q?feat:=20upgrade=20nixpkgs=20stable=20to=2025.11?= =?UTF-8?q?,=20update=20nixos-apple-silicon,=20gh=E2=80=A6=20(#236)?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit * feat: upgrade nixpkgs stable to 25.11, update nixos-apple-silicon, ghostty, anyrun, etc * fix: asahi-nixos - revert mesa to 25.2.6 * fix: disable gitui - it's broken on aarch64-darwin currently --------- Signed-off-by: Ryan Yin --- README.md | 2 +- flake.lock | 205 ++++++++++-------- flake.nix | 19 +- home/base/core/git.nix | 2 +- home/base/gui/terminal/README.md | 2 +- hosts/12kingdoms-shoukei/apple-silicon.nix | 8 + hosts/idols-ai/default.nix | 2 +- hosts/idols-aquamarine/gitea.nix | 2 +- hosts/idols-aquamarine/minio.nix | 2 +- .../oci-containers/homepage/default.nix | 2 +- .../oci-containers/uptime-kuma/default.nix | 2 +- hosts/idols-aquamarine/proxy.nix | 2 +- hosts/idols-aquamarine/restic.nix | 2 +- hosts/idols-aquamarine/transmission.nix | 2 +- modules/nixos/base/monitoring.nix | 2 +- modules/nixos/base/ssh.nix | 2 +- modules/nixos/desktop/fhs.nix | 2 +- .../desktop/networking/remote-desktop.nix | 2 +- .../nixos/desktop/networking/tailscale.nix | 2 +- 19 files changed, 146 insertions(+), 118 deletions(-) diff --git a/README.md b/README.md index d7b31308..61c23d65 100644 --- a/README.md +++ b/README.md @@ -8,7 +8,7 @@ Stargazers - + diff --git a/flake.lock b/flake.lock index df572d1b..555c925f 100644 --- a/flake.lock +++ b/flake.lock @@ -7,15 +7,16 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1762188647, - "narHash": "sha256-OAXK4p7WIYUcp8xx9m0RZUpV6XUDEhkoM4efI8dzPiU=", + "lastModified": 1764168798, + "narHash": "sha256-aB2OhrotdYU8w3uQLio5a/IiyAQvzywOKr81oldqxss=", "owner": "ezKEa", "repo": "aagl-gtk-on-nix", - "rev": "1172be1377bc65581004f4d5927b58c5c7d96639", + "rev": "e272196d003064dfb177ed9cae6a12021b806048", "type": "github" }, "original": { "owner": "ezKEa", + "ref": "release-25.11", "repo": "aagl-gtk-on-nix", "type": "github" } @@ -53,16 +54,16 @@ "systems": "systems_2" }, "locked": { - "lastModified": 1756708978, - "narHash": "sha256-01XBO8U2PyhhYXo3oZAu7dghqXkxdemeG82MqnNp4wE=", + "lastModified": 1758121794, + "narHash": "sha256-IlnFA/a9Clgbt+FuavIKWtauhtH4Fo/rGJIjJDDeYRs=", "owner": "anyrun-org", "repo": "anyrun", - "rev": "b6d08eea668feb8c183ee2a1822f909949792676", + "rev": "c787318f590102b68fbd2e5b02ea47e96f4ecb62", "type": "github" }, "original": { "owner": "anyrun-org", - "ref": "v25.9.0", + "ref": "v25.9.3", "repo": "anyrun", "type": "github" } @@ -75,11 +76,11 @@ }, "locked": { "dir": "blender", - "lastModified": 1758185131, - "narHash": "sha256-GlScQnoFgaFLQ9cd4llbJSisR0LjafjMAkBZQV7m4uk=", + "lastModified": 1763587309, + "narHash": "sha256-thH+603iAFvKojLbI+LiJXtrR0WwlikZpyp68C2nD1A=", "owner": "edolstra", "repo": "nix-warez", - "rev": "f49a87422539d748a34b9f3b07a7b8ced7242dff", + "rev": "9417de2cd97c03c12cd063e01e95eda790177dcb", "type": "github" }, "original": { @@ -96,11 +97,11 @@ ] }, "locked": { - "lastModified": 1762510976, - "narHash": "sha256-KGoSj8qMOOPaNE48RTtuNBbqOvKLTeklnRHWWvE/TXo=", + "lastModified": 1763974424, + "narHash": "sha256-jPpxBhrBOAKrXPxdrdXnq4w7x3UIkUZjarNLNYkb7Zo=", "owner": "catppuccin", "repo": "nix", - "rev": "728cb0a667ce37bb0c68557dba819c7fb54ff1c8", + "rev": "931c6465c3eac4709684dbc320bca243252927df", "type": "github" }, "original": { @@ -233,11 +234,11 @@ "flake-compat_5": { "flake": false, "locked": { - "lastModified": 1747046372, - "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", + "lastModified": 1761588595, + "narHash": "sha256-XKUZz9zewJNUj46b4AJdiRZJAvSZ0Dqj2BNfXvFlJC4=", "owner": "edolstra", "repo": "flake-compat", - "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", + "rev": "f387cd2afec9419c8ee37694406ca490c3f34ee5", "type": "github" }, "original": { @@ -293,11 +294,11 @@ "nixpkgs-lib": "nixpkgs-lib" }, "locked": { - "lastModified": 1762440070, - "narHash": "sha256-xxdepIcb39UJ94+YydGP221rjnpkDZUlykKuF54PsqI=", + "lastModified": 1763759067, + "narHash": "sha256-LlLt2Jo/gMNYAwOgdRQBrsRoOz7BPRkzvNaI/fzXi2Q=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "26d05891e14c88eb4a5d5bee659c0db5afb609d8", + "rev": "2cccadc7357c0ba201788ae99c4dfa90728ef5e0", "type": "github" }, "original": { @@ -314,11 +315,11 @@ ] }, "locked": { - "lastModified": 1762040540, - "narHash": "sha256-z5PlZ47j50VNF3R+IMS9LmzI5fYRGY/Z5O5tol1c9I4=", + "lastModified": 1762980239, + "narHash": "sha256-8oNVE8TrD19ulHinjaqONf9QWCKK+w4url56cdStMpM=", "owner": "hercules-ci", "repo": "flake-parts", - "rev": "0010412d62a25d959151790968765a70c436598b", + "rev": "52a2caecc898d0b46b2b905f058ccc5081f842da", "type": "github" }, "original": { @@ -372,15 +373,16 @@ "zon2nix": "zon2nix" }, "locked": { - "lastModified": 1762810863, - "narHash": "sha256-sic0p21KmUz/u9KsdVTIfZRDDRg9brTWs2IDb4F+y48=", + "lastModified": 1764166758, + "narHash": "sha256-bTElYF0d4XEGK9pT4I22+XSGZIN26lWEvk5D06cyZak=", "owner": "ghostty-org", "repo": "ghostty", - "rev": "bed219c132f1940a23eba50cdd7a40e4c2718149", + "rev": "d9529947a40e16f8e7efd8a1f680d01ff99f213b", "type": "github" }, "original": { "owner": "ghostty-org", + "ref": "tip", "repo": "ghostty", "type": "github" } @@ -457,11 +459,11 @@ "rust-overlay": "rust-overlay_2" }, "locked": { - "lastModified": 1763684023, - "narHash": "sha256-qqs3d78CjGiU/6kebCLnrZZ5RSe3d89dDNnWohYooII=", + "lastModified": 1763950724, + "narHash": "sha256-HoGhLWTqiwr2GCUPSen7f20snqxyTGWhcd84VClHmI4=", "owner": "mattwparas", "repo": "helix", - "rev": "9044221322996b579c75bc1733f55da27301ad05", + "rev": "92bc3db129c639b4133a0a117cc8f3943b840886", "type": "github" }, "original": { @@ -483,11 +485,11 @@ ] }, "locked": { - "lastModified": 1761230615, - "narHash": "sha256-pLE7U5gOtlA/2wbKCsVRYf5DqMQ5TWBCrCfZGytDDeo=", + "lastModified": 1763182882, + "narHash": "sha256-jZi+9yKmeTMsJ4ZNqRei/wL16+QwYGrCl4EJ3QHfoDU=", "owner": "hercules-ci", "repo": "hercules-ci-effects", - "rev": "7db2b867219a26781437d840ce457b75b7645154", + "rev": "b0585849abe7d02a774a853f7952d07bb910fd9e", "type": "github" }, "original": { @@ -524,11 +526,11 @@ ] }, "locked": { - "lastModified": 1762787259, - "narHash": "sha256-t2U/GLLXHa2+kJkwnFNRVc2fEJ/lUfyZXBE5iKzJdcs=", + "lastModified": 1764135300, + "narHash": "sha256-5xOuutXM7UPTUcn3uDAD8UlPQsXmqPrX81cXoDOAGcA=", "owner": "nix-community", "repo": "home-manager", - "rev": "37a3d97f2873e0f68711117c34d04b7c7ead8f4e", + "rev": "f4cb25928fafa9ae68660fe71f730fc820a59028", "type": "github" }, "original": { @@ -608,11 +610,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1762810134, - "narHash": "sha256-eu8Gkb/y/5pRS3Ml/sg3oeUtFFzlJMpDrJRgPgOXz38=", + "lastModified": 1764165116, + "narHash": "sha256-DN0m9X9dFPxNTfhaUWlHoM2CFbNiWgxVHzC4j0AIiuc=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "44c5a2c19b7b22d1b2375ef95f656291a0af3a1b", + "rev": "ae097a3c5ef217f9441d0da1c0bc14bbb4796b94", "type": "github" }, "original": { @@ -641,11 +643,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1762804232, - "narHash": "sha256-LCddK36/6u73jed1yuqbu6JKWIITsc42qoM883DgwJg=", + "lastModified": 1764160906, + "narHash": "sha256-6Dud/oe0UnkgCe+JAGF+GjXl6S6ynpcAUYWCdbXjJL4=", "owner": "YaLTeR", "repo": "niri", - "rev": "978c4e6c8afc0199e2cbd9037bdc7c41fbbab2a3", + "rev": "8370c539fb584f78924b826d0ac0ad8fa068cf95", "type": "github" }, "original": { @@ -661,11 +663,11 @@ ] }, "locked": { - "lastModified": 1762627886, - "narHash": "sha256-/QLk1bzmbcqJt9sU43+y/3tHtXhAy0l8Ck0MoO2+evQ=", + "lastModified": 1764161084, + "narHash": "sha256-HN84sByg9FhJnojkGGDSrcjcbeioFWoNXfuyYfJ1kBE=", "owner": "lnl7", "repo": "nix-darwin", - "rev": "5125a3cd414dc98bbe2c528227aa6b62ee61f733", + "rev": "e95de00a471d07435e0527ff4db092c84998698e", "type": "github" }, "original": { @@ -682,11 +684,11 @@ ] }, "locked": { - "lastModified": 1762826226, - "narHash": "sha256-M4rbwlO4peCHRvA+WNYCmg8je4YBF7kSY9tG+p1kEKo=", + "lastModified": 1764122225, + "narHash": "sha256-N6DsDLb8oDBWQ+QAq7qKmgk4jhW9AkzHjvXiUiT//Cw=", "owner": "fufexan", "repo": "nix-gaming", - "rev": "eefca17cb40462878ee1c46ac6910b2ec21adaa8", + "rev": "80e0aed8c6dd00c9fa41f82c808a8972632e3016", "type": "github" }, "original": { @@ -718,17 +720,17 @@ ] }, "locked": { - "lastModified": 1759818599, - "narHash": "sha256-4Go3gVl3E+geWMcFQ+06qlkO/lJlSvS9dyhYiXLWYq0=", + "lastModified": 1763596466, + "narHash": "sha256-CTSUc4Fk1lHMQZMJ5LczPDYGLq5UjXDFKLSpuA3mKmI=", "owner": "nix-community", "repo": "nixos-apple-silicon", - "rev": "24ab28e47b586f741910b3a2f0428f3523a0fff3", + "rev": "73b7103c4e3996e3e20868d510b0e8797f279323", "type": "github" }, "original": { "owner": "nix-community", + "ref": "release-2025-11-18", "repo": "nixos-apple-silicon", - "rev": "24ab28e47b586f741910b3a2f0428f3523a0fff3", "type": "github" } }, @@ -762,11 +764,11 @@ ] }, "locked": { - "lastModified": 1762396580, - "narHash": "sha256-riBOo30D8DhqQobcIYAC6sDl9PHBUq9ukjS4NjnjEM4=", + "lastModified": 1763605982, + "narHash": "sha256-gFjePmr09rRoAUfih4eeHX7aU3GTBUeaZvglKV+1ztI=", "owner": "nixpak", "repo": "nixpak", - "rev": "e4bcce21a735a07c409b696b31c17f6640ca0aa2", + "rev": "fd7e8f5d315158089ffbc34cc20792e43be6e666", "type": "github" }, "original": { @@ -777,27 +779,27 @@ }, "nixpkgs": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } }, "nixpkgs-darwin": { "locked": { - "lastModified": 1762482733, - "narHash": "sha256-g/da4FzvckvbiZT075Sb1/YDNDr+tGQgh4N8i5ceYMg=", + "lastModified": 1764081664, + "narHash": "sha256-sUoHmPr/EwXzRMpv1u/kH+dXuvJEyyF2Q7muE+t0EU4=", "owner": "nixos", "repo": "nixpkgs", - "rev": "e1ebeec86b771e9d387dd02d82ffdc77ac753abc", + "rev": "dc205f7b4fdb04c8b7877b43edb7b73be7730081", "type": "github" }, "original": { @@ -824,11 +826,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1762828101, - "narHash": "sha256-QiSTsHcXiu2O84iPhedQde/62TlUWwj+jqoYNpE+Q28=", + "lastModified": 1764167966, + "narHash": "sha256-nXv6xb7cq+XpjBYIjWEGTLCqQetxJu6zvVlrqHMsCOA=", "owner": "nixos", "repo": "nixpkgs", - "rev": "31fa703ba440e16d86d31598dc0601b117769b91", + "rev": "5c46f3bd98147c8d82366df95bbef2cab3a967ea", "type": "github" }, "original": { @@ -838,13 +840,29 @@ "type": "github" } }, + "nixpkgs-mesa": { + "locked": { + "lastModified": 1761817761, + "narHash": "sha256-qAEhDH77SIUUOUQC6DYYR+LGTAK+OctxBJPpo9rGMwc=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781", + "type": "github" + }, + "original": { + "owner": "nixos", + "repo": "nixpkgs", + "rev": "2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781", + "type": "github" + } + }, "nixpkgs-patched": { "locked": { - "lastModified": 1761672384, - "narHash": "sha256-o9KF3DJL7g7iYMZq9SWgfS1BFlNbsm6xplRjVlOCkXI=", + "lastModified": 1762844143, + "narHash": "sha256-SlybxLZ1/e4T2lb1czEtWVzDCVSTvk9WLwGhmxFmBxI=", "owner": "ryan4yin", "repo": "nixpkgs", - "rev": "08dacfca559e1d7da38f3cf05f1f45ee9bfd213c", + "rev": "9da7f1cf7f8a6e2a7cb3001b048546c92a8258b4", "type": "github" }, "original": { @@ -856,11 +874,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1763948260, + "narHash": "sha256-dY9qLD0H0zOUgU3vWacPY6Qc421BeQAfm8kBuBtPVE0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "1c8ba8d3f7634acac4a2094eef7c32ad9106532c", "type": "github" }, "original": { @@ -872,16 +890,16 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1762756533, - "narHash": "sha256-HiRDeUOD1VLklHeOmaKDzf+8Hb7vSWPVFcWwaTrpm+U=", + "lastModified": 1764020296, + "narHash": "sha256-6zddwDs2n+n01l+1TG6PlyokDdXzu/oBmEejcH5L5+A=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c2448301fb856e351aab33e64c33a3fc8bcf637d", + "rev": "a320ce8e6e2cc6b4397eef214d202a50a4583829", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-25.05", + "ref": "nixos-25.11", "repo": "nixpkgs", "type": "github" } @@ -930,11 +948,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -946,11 +964,11 @@ }, "nixpkgs_6": { "locked": { - "lastModified": 1762596750, - "narHash": "sha256-rXXuz51Bq7DHBlfIjN7jO8Bu3du5TV+3DSADBX7/9YQ=", + "lastModified": 1763966396, + "narHash": "sha256-6eeL1YPcY1MV3DDStIDIdy/zZCDKgHdkCmsrLJFiZf0=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b6a8526db03f735b89dd5ff348f53f752e7ddc8e", + "rev": "5ae3b07d8d6527c42f17c876e404993199144b6a", "type": "github" }, "original": { @@ -963,11 +981,11 @@ "nu_scripts": { "flake": false, "locked": { - "lastModified": 1762835849, + "lastModified": 1762863367, "narHash": "sha256-oxnXzxQkNccCs36j+aMzg4QGHDcX7niJruqxCkeg0LM=", "owner": "ryan4yin", "repo": "nu_scripts", - "rev": "4ec4c2ac3a0ce6eb82ca1b7ddb2d386e24530000", + "rev": "ff8092707054ad091d67bd408374a39977e33c1b", "type": "github" }, "original": { @@ -1004,11 +1022,11 @@ ] }, "locked": { - "lastModified": 1751086727, - "narHash": "sha256-5y9aE/o+KwEg075R5m/13Z1mavtyWv+9DE5uppLdRlo=", + "lastModified": 1764057454, + "narHash": "sha256-/E/H334pr4qo8bdTLjYahL7Tx3HMMJvKmNHDbhjq3Dc=", "owner": "ryan4yin", "repo": "nur-packages", - "rev": "a41be29389c8503f67b9f5cd47fa8b99a5bb3fe5", + "rev": "89e4e49bc0279d5c379526b16360e20ca901e226", "type": "github" }, "original": { @@ -1026,11 +1044,11 @@ ] }, "locked": { - "lastModified": 1762441963, - "narHash": "sha256-j+rNQ119ffYUkYt2YYS6rnd6Jh/crMZmbqpkGLXaEt0=", + "lastModified": 1763988335, + "narHash": "sha256-QlcnByMc8KBjpU37rbq5iP7Cp97HvjRP0ucfdh+M4Qc=", "owner": "cachix", "repo": "git-hooks.nix", - "rev": "8e7576e79b88c16d7ee3bbd112c8d90070832885", + "rev": "50b9238891e388c9fdc6a5c49e49c42533a1b5ce", "type": "github" }, "original": { @@ -1104,6 +1122,7 @@ "nixpkgs": "nixpkgs_6", "nixpkgs-darwin": "nixpkgs-darwin", "nixpkgs-master": "nixpkgs-master", + "nixpkgs-mesa": "nixpkgs-mesa", "nixpkgs-patched": "nixpkgs-patched", "nixpkgs-stable": "nixpkgs-stable_2", "nu_scripts": "nu_scripts", @@ -1119,11 +1138,11 @@ "nixpkgs": "nixpkgs_2" }, "locked": { - "lastModified": 1761791894, - "narHash": "sha256-myRIDh+PxaREz+z9LzbqBJF+SnTFJwkthKDX9zMyddY=", + "lastModified": 1764124769, + "narHash": "sha256-vcoOEy3i8AGJi3Y2C48hrf6CuL2h8W1gLe1gNt72Kxg=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "59c45eb69d9222a4362673141e00ff77842cd219", + "rev": "5da8c00313b4434f00aed6b4c94cd3b207bafdc5", "type": "github" }, "original": { @@ -1292,11 +1311,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1762747449, - "narHash": "sha256-Z1TKiux8K09a93w4PFDFsj8HFugXNy3iCC3Z8MpR5Rk=", + "lastModified": 1763704521, + "narHash": "sha256-ceYEV6PnvUN8Zixao4gpPuN+VT3B0SlAXKuPNHZhqUY=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "6338574bc5c036487486acde264f38f39ea15fad", + "rev": "f379ff5722a821212eb59ada9cf8e51cb3654aad", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 5c440a76..6528feec 100644 --- a/flake.nix +++ b/flake.nix @@ -35,8 +35,9 @@ # Official NixOS package source, using nixos's unstable branch by default nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.05"; - # nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; + nixpkgs-stable.url = "github:nixos/nixpkgs/nixos-25.11"; + # revert mesa to 25.2.6 + nixpkgs-mesa.url = "github:nixos/nixpkgs/2b1f0ea3ee3952e68b164efa0a1c5e394ef2e781"; # nixpkgs with some custom patches nixpkgs-patched.url = "github:ryan4yin/nixpkgs/nixos-unstable-patched"; @@ -44,7 +45,7 @@ nixpkgs-master.url = "github:nixos/nixpkgs/master"; # for macos - # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.05-darwin"; + # nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-25.11-darwin"; nixpkgs-darwin.url = "github:nixos/nixpkgs/nixpkgs-unstable"; nix-darwin = { url = "github:lnl7/nix-darwin"; @@ -54,7 +55,7 @@ # home-manager, used for managing user configuration home-manager = { url = "github:nix-community/home-manager/master"; - # url = "github:nix-community/home-manager/release-25.05"; + # url = "github:nix-community/home-manager/release-25.11"; # The `follows` keyword in inputs is used for inheritance. # Here, `inputs.nixpkgs` of home-manager is kept consistent with the `inputs.nixpkgs` of the current flake, @@ -82,7 +83,7 @@ # anyrun - a wayland launcher anyrun = { - url = "github:/anyrun-org/anyrun/v25.9.0"; + url = "github:/anyrun-org/anyrun/v25.9.3"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -127,7 +128,7 @@ }; ghostty = { - url = "github:ghostty-org/ghostty"; + url = "github:ghostty-org/ghostty/tip"; # Latest Continuous Release }; blender-bin = { @@ -136,8 +137,8 @@ }; nixos-apple-silicon = { - # 2025-10-07 asahi-6.16.8-1 - url = "github:nix-community/nixos-apple-silicon/24ab28e47b586f741910b3a2f0428f3523a0fff3"; + # asahi-6.17.7-2 + url = "github:nix-community/nixos-apple-silicon/release-2025-11-18"; inputs.nixpkgs.follows = "nixpkgs"; }; @@ -157,7 +158,7 @@ inputs.nixpkgs.follows = "nixpkgs"; }; aagl = { - url = "github:ezKEa/aagl-gtk-on-nix"; + url = "github:ezKEa/aagl-gtk-on-nix/release-25.11"; # inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/home/base/core/git.nix b/home/base/core/git.nix index 4a3be479..3c54b0af 100644 --- a/home/base/core/git.nix +++ b/home/base/core/git.nix @@ -124,5 +124,5 @@ programs.lazygit.enable = true; # Yet another Git TUI (written in rust). - programs.gitui.enable = true; + programs.gitui.enable = false; } diff --git a/home/base/gui/terminal/README.md b/home/base/gui/terminal/README.md index 63d88aef..5d1ce771 100644 --- a/home/base/gui/terminal/README.md +++ b/home/base/gui/terminal/README.md @@ -52,7 +52,7 @@ Error opening terminal: xterm-kitty. NixOS preserve the `TERMINFO` and `TERMINFO_DIRS` environment variables, for `root` and the `wheel` group: -[nixpkgs/nixos/modules/config/terminfo.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/config/terminfo.nix#L18) +[nixpkgs/nixos/modules/config/terminfo.nix](https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/config/terminfo.nix#L18) For nix-darwin, take a look at diff --git a/hosts/12kingdoms-shoukei/apple-silicon.nix b/hosts/12kingdoms-shoukei/apple-silicon.nix index 3abea7e9..98a21c24 100644 --- a/hosts/12kingdoms-shoukei/apple-silicon.nix +++ b/hosts/12kingdoms-shoukei/apple-silicon.nix @@ -2,6 +2,7 @@ pkgs, nixos-apple-silicon, my-asahi-firmware, + nixpkgs-mesa, ... }: { @@ -9,6 +10,13 @@ nixos-apple-silicon.nixosModules.default ]; + # Workaround for Mesa 25.3.0 regression + # https://github.com/nix-community/nixos-apple-silicon/issues/380 + # https://github.com/NixOS/nixpkgs/pull/461866 + hardware.graphics.package = + assert pkgs.mesa.version == "25.3.0"; + (import nixpkgs-mesa { localSystem = pkgs.stdenv.hostPlatform; }).mesa; + nix.settings = { extra-substituters = [ "https://nixos-apple-silicon.cachix.org" diff --git a/hosts/idols-ai/default.nix b/hosts/idols-ai/default.nix index 43f38d45..ea731885 100644 --- a/hosts/idols-ai/default.nix +++ b/hosts/idols-ai/default.nix @@ -69,5 +69,5 @@ in # this value at the release version of the first install of this system. # Before changing this value read the documentation for this option # (e.g. man configuration.nix or on https://nixos.org/nixos/options.html). - system.stateVersion = "25.05"; # Did you read the comment? + system.stateVersion = "25.11"; # Did you read the comment? } diff --git a/hosts/idols-aquamarine/gitea.nix b/hosts/idols-aquamarine/gitea.nix index 4b5aaba5..39bcc365 100644 --- a/hosts/idols-aquamarine/gitea.nix +++ b/hosts/idols-aquamarine/gitea.nix @@ -1,6 +1,6 @@ { pkgs, ... }: { - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/misc/gitea.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/misc/gitea.nix services.gitea = { enable = true; user = "gitea"; diff --git a/hosts/idols-aquamarine/minio.nix b/hosts/idols-aquamarine/minio.nix index b51a5cd9..fcd830ab 100644 --- a/hosts/idols-aquamarine/minio.nix +++ b/hosts/idols-aquamarine/minio.nix @@ -4,7 +4,7 @@ let configDir = "/data/apps/minio/config"; in { - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/web-servers/minio.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/web-servers/minio.nix services.minio = { enable = true; browser = true; # Enable or disable access to web UI. diff --git a/hosts/idols-aquamarine/oci-containers/homepage/default.nix b/hosts/idols-aquamarine/oci-containers/homepage/default.nix index b094a4f4..1686e673 100644 --- a/hosts/idols-aquamarine/oci-containers/homepage/default.nix +++ b/hosts/idols-aquamarine/oci-containers/homepage/default.nix @@ -22,7 +22,7 @@ in chown -R ${user}:${user} ${configDir} ''; - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/virtualisation/oci-containers.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/virtualisation/oci-containers.nix virtualisation.oci-containers.containers = { # check its logs via `journalctl -u podman-homepage` homepage = { diff --git a/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix b/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix index 118cba46..b39b4e3c 100644 --- a/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix +++ b/hosts/idols-aquamarine/oci-containers/uptime-kuma/default.nix @@ -17,7 +17,7 @@ in "d ${dataDir} 0755 ${user} ${user}" ]; - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/virtualisation/oci-containers.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/virtualisation/oci-containers.nix virtualisation.oci-containers.containers = { # check its logs via `journalctl -u podman-homepage` uptime-kuma = { diff --git a/hosts/idols-aquamarine/proxy.nix b/hosts/idols-aquamarine/proxy.nix index 122de3b8..a30da7ef 100644 --- a/hosts/idols-aquamarine/proxy.nix +++ b/hosts/idols-aquamarine/proxy.nix @@ -78,7 +78,7 @@ }; }; - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/monitoring/prometheus/exporters/v2ray.nix # https://github.com/wi1dcard/v2ray-exporter services.prometheus.exporters.v2ray = { enable = true; diff --git a/hosts/idols-aquamarine/restic.nix b/hosts/idols-aquamarine/restic.nix index 1879b726..a89db21f 100644 --- a/hosts/idols-aquamarine/restic.nix +++ b/hosts/idols-aquamarine/restic.nix @@ -5,7 +5,7 @@ let rcloneConfigFile = "/etc/agenix/rclone-conf-for-restic-backup"; in { - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/backup/restic.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/backup/restic.nix services.restic.backups = { homelab-backup = { inherit passwordFile; diff --git a/hosts/idols-aquamarine/transmission.nix b/hosts/idols-aquamarine/transmission.nix index 670f40df..d1b36613 100644 --- a/hosts/idols-aquamarine/transmission.nix +++ b/hosts/idols-aquamarine/transmission.nix @@ -9,7 +9,7 @@ let in { # the headless Transmission BitTorrent daemon - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/torrent/transmission.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/torrent/transmission.nix # https://wiki.archlinux.org/title/transmission services.transmission = { enable = true; diff --git a/modules/nixos/base/monitoring.nix b/modules/nixos/base/monitoring.nix index cc0803b0..f0aabb07 100644 --- a/modules/nixos/base/monitoring.nix +++ b/modules/nixos/base/monitoring.nix @@ -1,6 +1,6 @@ { # enable the node exporter on all nixos hosts - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/monitoring/prometheus/exporters/node.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/monitoring/prometheus/exporters/node.nix services.prometheus.exporters.node = { enable = true; listenAddress = "0.0.0.0"; diff --git a/modules/nixos/base/ssh.nix b/modules/nixos/base/ssh.nix index 38b42786..756d49ba 100644 --- a/modules/nixos/base/ssh.nix +++ b/modules/nixos/base/ssh.nix @@ -15,6 +15,6 @@ }; # Add terminfo database of all known terminals to the system profile. - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/config/terminfo.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/config/terminfo.nix environment.enableAllTerminfo = true; } diff --git a/modules/nixos/desktop/fhs.nix b/modules/nixos/desktop/fhs.nix index 022e27dc..e2ba2b56 100644 --- a/modules/nixos/desktop/fhs.nix +++ b/modules/nixos/desktop/fhs.nix @@ -35,7 +35,7 @@ # nix-ld's nixos module will set default values for `NIX_LD` and `NIX_LD_LIBRARY_PATH` environment variables, so # it can work out of the box: # - # - https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/programs/nix-ld.nix#L37-L40 + # - https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/programs/nix-ld.nix#L37-L40 # # You can overwrite `NIX_LD_LIBRARY_PATH` in the environment where you run the non-NixOS binaries to customize the # search path for shared libraries. diff --git a/modules/nixos/desktop/networking/remote-desktop.nix b/modules/nixos/desktop/networking/remote-desktop.nix index 8a4753a7..9befd56e 100644 --- a/modules/nixos/desktop/networking/remote-desktop.nix +++ b/modules/nixos/desktop/networking/remote-desktop.nix @@ -22,7 +22,7 @@ # journalctl --user -u sunshine --since "2 minutes ago" # # References: - # https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/networking/sunshine.nix + # https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/networking/sunshine.nix # # =============================================================================== services.sunshine = { diff --git a/modules/nixos/desktop/networking/tailscale.nix b/modules/nixos/desktop/networking/tailscale.nix index ae6099e0..afd1d6a1 100644 --- a/modules/nixos/desktop/networking/tailscale.nix +++ b/modules/nixos/desktop/networking/tailscale.nix @@ -24,7 +24,7 @@ # which is already persistent across reboots(via preservation) # # References: -# https://github.com/NixOS/nixpkgs/blob/nixos-25.05/nixos/modules/services/networking/tailscale.nix +# https://github.com/NixOS/nixpkgs/blob/nixos-25.11/nixos/modules/services/networking/tailscale.nix # # ============================================================= {