From 3898153f272fa6c2d30d65341ea9966b68c6c692 Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Fri, 14 Aug 2026 18:55:55 +0800 Subject: [PATCH] flake: update flake.lock; use nixpkgs-multiverse --- flake.lock | 131 ++++++++++++++++--------------------- flake.nix | 7 +- flake/overlays/default.nix | 20 +++--- 3 files changed, 68 insertions(+), 90 deletions(-) diff --git a/flake.lock b/flake.lock index 709c8e8..7378062 100644 --- a/flake.lock +++ b/flake.lock @@ -165,11 +165,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1786258988, - "narHash": "sha256-HQ9V1XsHy6Qf2pAy6lru1W47NILqLWb6yix4/5IToDA=", + "lastModified": 1786693132, + "narHash": "sha256-Mat1FwhwqpX0ziRp8bg1u3Qxxf8KIc2MxocRiw+lm9o=", "owner": "nix-community", "repo": "fenix", - "rev": "36ef6893e18fb070e33a1d17cd5296382c9519d4", + "rev": "ed4c4c6f0f5c15ff0783b6de488eec027f712585", "type": "github" }, "original": { @@ -312,11 +312,11 @@ ] }, "locked": { - "lastModified": 1786031233, - "narHash": "sha256-TIDlLTLI1/pB7IqgjzcKQjpODQsZE2oII4XGG9B6KjI=", + "lastModified": 1786656209, + "narHash": "sha256-ybGtuwGKTUCefKYsplzvw4xcCqznto0c7BaiQhgILtA=", "owner": "nix-community", "repo": "home-manager", - "rev": "7834e82588860aaf780cec1366524456a70898d7", + "rev": "c554d3441f725537854e877519f01cbd60680174", "type": "github" }, "original": { @@ -380,11 +380,11 @@ ] }, "locked": { - "lastModified": 1786252007, - "narHash": "sha256-B43/S2NVWQ3CJslyQPkvKQzkEgZLzYpyZr3iGiQZHEo=", + "lastModified": 1786704638, + "narHash": "sha256-/fVVDevImdj8PFczYgd9WFm0k8nxESbfWVgmy4pFR/k=", "owner": "numtide", "repo": "llm-agents.nix", - "rev": "2c27c5fcb51edf0ac740e944c2c357016d9ea2d9", + "rev": "901c200318d2b06ce3c31e667fd63e979a22ec42", "type": "github" }, "original": { @@ -393,6 +393,21 @@ "type": "github" } }, + "multiverse": { + "locked": { + "lastModified": 1786656216, + "narHash": "sha256-znAyCzzU/xz/56FaAGKRZGRYhYYQuCuirYa6Z1cQPOo=", + "owner": "fzakaria", + "repo": "nixpkgs-multiverse", + "rev": "ff816217c1255b0e7cdaba04511ed5fa03815177", + "type": "github" + }, + "original": { + "owner": "fzakaria", + "repo": "nixpkgs-multiverse", + "type": "github" + } + }, "my-templates": { "locked": { "lastModified": 1765097937, @@ -417,11 +432,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1786233771, - "narHash": "sha256-Sh2XpMoVod4BCJnDgL06XgHdxzxCCHJmdxE+GdQv2Ys=", + "lastModified": 1786665887, + "narHash": "sha256-Ye1UgeYHuUi+xagVwjGCQ1W60wfc8ZIDqhdvTml1Hn0=", "ref": "refs/heads/main", - "rev": "d0e55a12ec2fc62524e3de621f77706a1854601b", - "revCount": 164, + "rev": "96f2b99fb3bf6d5788756faf23b73087c67a4460", + "revCount": 168, "type": "git", "url": "https://codeberg.org/bananad3v/niri-nix" }, @@ -433,11 +448,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1786132078, - "narHash": "sha256-itOJjhjujC3R/V3LuTDr5J9fASyyAOR4BjOAKGsY0IA=", + "lastModified": 1786626375, + "narHash": "sha256-Yq5bu6KDiG5xttJ9wVsE/dKQ0AvO4RYx2YQmDaYVsXg=", "owner": "YaLTeR", "repo": "niri", - "rev": "59a10015610bb7d068a82ce1c386fcd8b44f6c52", + "rev": "720c388427c5589cc630f8188d44153d93ff8b0c", "type": "github" }, "original": { @@ -471,11 +486,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1785975029, - "narHash": "sha256-X44cn5rzytELc3NNoQsh0aLkjWA/QzPfc6HPQmsG3sU=", + "lastModified": 1786410043, + "narHash": "sha256-JTbODJPDcd3d8U7lO4MVUU3Yo0jz2KQSAHXka+IWBEo=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "70ce234312134a463ba7728e94da2486a1d237ac", + "rev": "8e2eeb9477c9d40009a5bd51cd3eef2f5abb26f1", "type": "github" }, "original": { @@ -485,29 +500,13 @@ "type": "github" } }, - "nixpkgs-stable": { + "nixpkgs_2": { "locked": { - "lastModified": 1786245335, - "narHash": "sha256-NVDxntpqjGupi9GU2vQPrWKzgOL2rjGxedlshk65kNk=", + "lastModified": 1786599213, + "narHash": "sha256-yNJd40f11EzXBjSByCB7IPpeFFAdeoSKKM67dGkfFoU=", "owner": "nixos", "repo": "nixpkgs", - "rev": "33ddeb9e7c03403e17814e8aac1f7affe6d70b21", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "release-26.05", - "repo": "nixpkgs", - "type": "github" - } - }, - "nixpkgs-unstable": { - "locked": { - "lastModified": 1786106723, - "narHash": "sha256-zDSUbpoeo/9ZmD2+wXnzxoo1+uhL8vxc0b8yuYMKYq0=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "f13ff45afd1bb73e640eaa08a7066dbed07e3238", + "rev": "0e251e24a4f24e036a084b6b4b2d2491af4167f4", "type": "github" }, "original": { @@ -517,22 +516,6 @@ "type": "github" } }, - "nixpkgs-unstable-small": { - "locked": { - "lastModified": 1786204308, - "narHash": "sha256-0YyjzJ8pzr08B90QPT7/Hz69Nd97hO/VzG0u6Mf/t9E=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "508359b3ad6abb6d4f674e473a4870fc4d9da2ba", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable-small", - "repo": "nixpkgs", - "type": "github" - } - }, "noctalia": { "inputs": { "nixpkgs": [ @@ -619,15 +602,11 @@ "impermanence": "impermanence", "infuse": "infuse", "llm-agents": "llm-agents", + "multiverse": "multiverse", "my-templates": "my-templates", "niri-nix": "niri-nix", "nixos-wsl": "nixos-wsl", - "nixpkgs": [ - "nixpkgs-unstable" - ], - "nixpkgs-stable": "nixpkgs-stable", - "nixpkgs-unstable": "nixpkgs-unstable", - "nixpkgs-unstable-small": "nixpkgs-unstable-small", + "nixpkgs": "nixpkgs_2", "noctalia": "noctalia", "selector4nix": "selector4nix", "sops-nix": "sops-nix", @@ -641,11 +620,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1786211888, - "narHash": "sha256-wx2c0jMH+ojB8UPy6pxUmraMS615EXZvhOQzevM1dF0=", + "lastModified": 1786661453, + "narHash": "sha256-OylLsJCF9/znjtYAPl6Hm7MJ+j2dVzk3HUGsFmADjEM=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "352d11db5cae4447313258eba8011679df202e59", + "rev": "baabc5825f3f6640e99fe32887bbeced640f825e", "type": "github" }, "original": { @@ -666,11 +645,11 @@ ] }, "locked": { - "lastModified": 1786180484, - "narHash": "sha256-uhhphMne1ZGqw7eJmmao34UGLPp0HsbfvRd3zr443zM=", + "lastModified": 1786639709, + "narHash": "sha256-7cAzmCBAxG4KWGDKAKJF8f8yZryzFZp3hNnXNjemHrk=", "owner": "StarryReverie", "repo": "selector4nix", - "rev": "58b01a264fc469bec22868913f6f221a52370494", + "rev": "99d058d235409dcbde0f5c973176254d419f08c9", "type": "github" }, "original": { @@ -686,11 +665,11 @@ ] }, "locked": { - "lastModified": 1783174389, - "narHash": "sha256-aCWC8ngycU7OdJrU2+Je3qf+1a2ykuBvpPhZT/9tXMc=", + "lastModified": 1786629091, + "narHash": "sha256-gkig4nPi1CWc4Z50GBsjE4ygSE7hMpl/TwID2an2Cck=", "owner": "Mic92", "repo": "sops-nix", - "rev": "f1406619a3884cd5c47992a70b8b35c9c0fcb4c9", + "rev": "a8627b21b9107c5711c96b84f32a9a4b3d45295f", "type": "github" }, "original": { @@ -723,11 +702,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1786216702, - "narHash": "sha256-fOOmw9tUYeqWVnK2w2NiuMTmGIbluj8xiBFTTFDCcEE=", + "lastModified": 1786531493, + "narHash": "sha256-F93yabBSW2TpxKYMcArQOnFuCqBgAdbfZsdl0w5Pojg=", "owner": "danth", "repo": "stylix", - "rev": "b67debfd2db1eb1f0fd8740b950f598bbaf74b8f", + "rev": "1e6ccadeda179d96728b4a9f20fc9d4dcf6b6059", "type": "github" }, "original": { @@ -881,11 +860,11 @@ ] }, "locked": { - "lastModified": 1786239946, - "narHash": "sha256-V5WOJhCGsuSRkz60K8TcALKMiMVCNubfJquMJqoCow0=", + "lastModified": 1786688050, + "narHash": "sha256-qo3nSI7PgaGiVTMkSvU6EMx1A/7dUyCvH4lTEpEan4M=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "cf55fc2a2d26819d0dfb4f5e21fad13d70a612e9", + "rev": "771b9a9c443d0e95815ebe2ac75e8acff99ac631", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7f307bb..bfe3287 100644 --- a/flake.nix +++ b/flake.nix @@ -3,11 +3,8 @@ inputs = { # Nixpkgs - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; - nixpkgs-unstable-small.url = "github:nixos/nixpkgs/nixos-unstable-small"; - nixpkgs-stable.url = "github:nixos/nixpkgs/release-26.05"; - # nixpkgs.follows = "nixpkgs-stable"; - nixpkgs.follows = "nixpkgs-unstable"; + nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; + multiverse.url = "github:fzakaria/nixpkgs-multiverse"; # Home manager home-manager = { diff --git a/flake/overlays/default.nix b/flake/overlays/default.nix index 07234b1..c647714 100644 --- a/flake/overlays/default.nix +++ b/flake/overlays/default.nix @@ -4,23 +4,25 @@ config, ... }: -let - channel = channel: final: _prev: { - ${channel} = import inputs."nixpkgs-${channel}" { +[ + (final: _prev: { + mv = inputs.multiverse.lib.mkMultiverse { inherit (final.stdenv.hostPlatform) system; inherit (config.nixpkgs) config; }; - }; -in -[ + }) ( final: prev: lib.infuse prev { cage.__output.patches.__append = [ ./cage-specify-output-name.patch ]; bottles.__input.removeWarningPopup.__assign = true; + + jetbrains-mono.__assign = lib.warn '' + nanoemoji https://github.com/NixOS/nixpkgs/pull/552075 + '' (final.mv.at "2026-08-12").jetbrains-mono; + moonlight-qt.__assign = lib.warn '' + moonlight-qt https://github.com/NixOS/nixpkgs/pull/552544 + '' (final.mv.at "2026-08-10").moonlight-qt; } ) - (channel "stable") - (channel "unstable-small") - (channel "master") ]