From 3c5c96d623057865781ce14d89c309838173c2bd Mon Sep 17 00:00:00 2001 From: imxyy_soope_ Date: Sat, 23 Aug 2025 09:44:28 +0800 Subject: [PATCH] chore: update flake.lock; drop NUR --- flake.lock | 191 +++++++++++++++---------------------------- flake.nix | 5 +- overlays/default.nix | 2 - 3 files changed, 68 insertions(+), 130 deletions(-) diff --git a/flake.lock b/flake.lock index 4e28157..1cda4ec 100644 --- a/flake.lock +++ b/flake.lock @@ -105,11 +105,11 @@ ] }, "locked": { - "lastModified": 1754950929, - "narHash": "sha256-75hsUMshZ5ZlO/X2JWfZqKHPM66uhUNsDG/Zozwh/xs=", + "lastModified": 1755850042, + "narHash": "sha256-YooO7k/ufm8KGVqSAV9edGkv3Cm07cvINSP478sWppo=", "owner": "catppuccin", "repo": "nix", - "rev": "45512611f1537c75e439d508409efc6901286645", + "rev": "233b344b42072b30a00fef1d8bb9ffb73bf1af3d", "type": "github" }, "original": { @@ -127,11 +127,11 @@ "rust-overlay": "rust-overlay" }, "locked": { - "lastModified": 1755169038, - "narHash": "sha256-lIAE8ou7ukvoOE0nZ2lNcl/n8mnj6m2cGsx9U7Xhew4=", + "lastModified": 1755859279, + "narHash": "sha256-yWx8vuyIlIDitOREOBs/ZjU67bl6oPc74AfV0QxvraQ=", "owner": "chaotic-cx", "repo": "nyx", - "rev": "5efc0389eaca14046e1ee2068bcba6fe64cf6e2e", + "rev": "a970ec75b7a3ca5192476330ff0d10c4c2fc029e", "type": "github" }, "original": { @@ -191,11 +191,11 @@ "rust-analyzer-src": "rust-analyzer-src" }, "locked": { - "lastModified": 1755240331, - "narHash": "sha256-wEtw76+R/TOHEIjYOnxADC91G6s422HGruAngbjzsDw=", + "lastModified": 1755585599, + "narHash": "sha256-tl/0cnsqB/Yt7DbaGMel2RLa7QG5elA8lkaOXli6VdY=", "owner": "nix-community", "repo": "fenix", - "rev": "3f076d4502001c64877099093318b2dbd8b062a1", + "rev": "6ed03ef4c8ec36d193c18e06b9ecddde78fb7e42", "type": "github" }, "original": { @@ -293,27 +293,6 @@ } }, "flake-parts_3": { - "inputs": { - "nixpkgs-lib": [ - "nur", - "nixpkgs" - ] - }, - "locked": { - "lastModified": 1733312601, - "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=", - "owner": "hercules-ci", - "repo": "flake-parts", - "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9", - "type": "github" - }, - "original": { - "owner": "hercules-ci", - "repo": "flake-parts", - "type": "github" - } - }, - "flake-parts_4": { "inputs": { "nixpkgs-lib": [ "stylix", @@ -520,11 +499,11 @@ ] }, "locked": { - "lastModified": 1755121891, - "narHash": "sha256-UtYkukiGnPRJ5rpd4W/wFVrLMh8fqtNkqHTPgHEtrqU=", + "lastModified": 1755755322, + "narHash": "sha256-spCxkNihCk3uT3LUrUwzdEAjLA/E0EtEgF3KVI05nlM=", "owner": "nix-community", "repo": "home-manager", - "rev": "279ca5addcdcfa31ac852b3ecb39fc372684f426", + "rev": "282b4c98de97da6667cb03de4f427371734bc39c", "type": "github" }, "original": { @@ -540,11 +519,11 @@ ] }, "locked": { - "lastModified": 1755229570, - "narHash": "sha256-soZegto0xXzG2zYlu/zjknDHv0Z7tRS5EQs+Z/VRTBg=", + "lastModified": 1755810213, + "narHash": "sha256-QdenO8f0PTg+tC6HuSvngKcbRZA5oZKmjUT+MXKOLQg=", "owner": "nix-community", "repo": "home-manager", - "rev": "11626a4383b458f8dc5ea3237eaa04e8ab1912f3", + "rev": "6911d3e7f475f7b3558b4f5a6aba90fa86099baa", "type": "github" }, "original": { @@ -615,11 +594,11 @@ ] }, "locked": { - "lastModified": 1755151620, - "narHash": "sha256-fVMalQZ+tRXR8oue2SdWu4CdlsS2NII+++rI40XQ8rU=", + "lastModified": 1755670950, + "narHash": "sha256-x84lAqhbz752SU6zZY1yixm9Cbz6kdHtJs/5XE1LKGk=", "owner": "Jovian-Experiments", "repo": "Jovian-NixOS", - "rev": "16e12d22754d97064867006acae6e16da7a142a6", + "rev": "7caed3afea56de2b68b74d7a3b580d5b8ca8f445", "type": "github" }, "original": { @@ -684,11 +663,11 @@ "xwayland-satellite-unstable": "xwayland-satellite-unstable" }, "locked": { - "lastModified": 1755104498, - "narHash": "sha256-kMosXLeEB43OtUKvhvzikKfFLpv7H7JzObCQO0j4X34=", + "lastModified": 1755846233, + "narHash": "sha256-1+Jd9Jw4J7zZlaWKN3O5soybRguiOd4+PkkVPc3m5FM=", "owner": "sodiboo", "repo": "niri-flake", - "rev": "22a24ab05a9f4b3a94fba0aa0d8d850e6269241a", + "rev": "1cf4c528db26dd5c429ca6807ba47ba79c88dea3", "type": "github" }, "original": { @@ -717,11 +696,11 @@ "niri-unstable": { "flake": false, "locked": { - "lastModified": 1755074352, - "narHash": "sha256-I+kpboTzfMwRVK76OoTmHStrGuzJPcmvZKxmlmL9q+A=", + "lastModified": 1755842228, + "narHash": "sha256-mEB25RQXApWIQq5RDNtUZgZW7UyT7kVOjAQmPoMopac=", "owner": "YaLTeR", "repo": "niri", - "rev": "af9ce533100b49e8bc879b557ab830f5d3a18805", + "rev": "210d5e90fe00ae9add5d841e1752b7f8c4a639a7", "type": "github" }, "original": { @@ -820,11 +799,11 @@ ] }, "locked": { - "lastModified": 1755171343, - "narHash": "sha256-h6bbfhqWcHlx9tcyYa7dhaEiNpusLCcFYkJ/AnltLW8=", + "lastModified": 1755261305, + "narHash": "sha256-EOqCupB5X5WoGVHVcfOZcqy0SbKWNuY3kq+lj1wHdu8=", "owner": "nix-community", "repo": "NixOS-WSL", - "rev": "e37cfef071466a9ca649f6899aff05226ce17e9e", + "rev": "203a7b463f307c60026136dd1191d9001c43457f", "type": "github" }, "original": { @@ -835,11 +814,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -863,11 +842,11 @@ }, "nixpkgs-master": { "locked": { - "lastModified": 1755243717, - "narHash": "sha256-x2YnDp3CsXwrRMaUHtNacD15uG7I9+IRzodafD3DjHc=", + "lastModified": 1755876413, + "narHash": "sha256-YN7Vxe4YfU6yw+nhcSlZnt2MD/It1wGF/JexQBlmCaE=", "owner": "nixos", "repo": "nixpkgs", - "rev": "b4516d45cfdf4b37c1643eafcefe8620896a8aeb", + "rev": "53203bd286108e01e4321728323e25bdb37e6c32", "type": "github" }, "original": { @@ -879,11 +858,11 @@ }, "nixpkgs-stable": { "locked": { - "lastModified": 1754937576, - "narHash": "sha256-3sWA5WJybUE16kIMZ3+uxcxKZY/JRR4DFBqLdSLBo7w=", + "lastModified": 1755704039, + "narHash": "sha256-gKlP0LbyJ3qX0KObfIWcp5nbuHSb5EHwIvU6UcNBg2A=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "ddae11e58c0c345bf66efbddbf2192ed0e58f896", + "rev": "9cb344e96d5b6918e94e1bca2d9f3ea1e9615545", "type": "github" }, "original": { @@ -895,11 +874,11 @@ }, "nixpkgs-stable_2": { "locked": { - "lastModified": 1755243528, - "narHash": "sha256-YGBq/8D3gWuwLmDZb63h4a21GOMquBH8JcZsrJFL43Y=", + "lastModified": 1755872495, + "narHash": "sha256-5+l/OdCHqvwlAC3Wjc4yH/A5CjvSlrhaorfPuV6olVM=", "owner": "nixos", "repo": "nixpkgs", - "rev": "c3a6f30dea7d1e58267488a687db1a6f07ff6063", + "rev": "413daa84dd16bb6ee08fc59c052a2376ef780ebe", "type": "github" }, "original": { @@ -911,16 +890,16 @@ }, "nixpkgs-unstable": { "locked": { - "lastModified": 1755166611, - "narHash": "sha256-sk8pK8kWz4IE4ErAjKE1d8tMChY6VQR32U4yS68FIog=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "nixos", "repo": "nixpkgs", - "rev": "1a341e3c908f4a3105e737bd13af0318dc06fbe3", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { "owner": "nixos", - "ref": "nixos-unstable-small", + "ref": "nixos-unstable", "repo": "nixpkgs", "type": "github" } @@ -975,11 +954,11 @@ }, "nixpkgs_5": { "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", + "lastModified": 1755615617, + "narHash": "sha256-HMwfAJBdrr8wXAkbGhtcby1zGFvs+StOp19xNsbqdOg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", + "rev": "20075955deac2583bb12f07151c2df830ef346b4", "type": "github" }, "original": { @@ -989,42 +968,7 @@ "type": "github" } }, - "nixpkgs_6": { - "locked": { - "lastModified": 1755027561, - "narHash": "sha256-IVft239Bc8p8Dtvf7UAACMG5P3ZV+3/aO28gXpGtMXI=", - "owner": "nixos", - "repo": "nixpkgs", - "rev": "005433b926e16227259a1843015b5b2b7f7d1fc3", - "type": "github" - }, - "original": { - "owner": "nixos", - "ref": "nixos-unstable", - "repo": "nixpkgs", - "type": "github" - } - }, "nur": { - "inputs": { - "flake-parts": "flake-parts_3", - "nixpkgs": "nixpkgs_6" - }, - "locked": { - "lastModified": 1755102471, - "narHash": "sha256-ecWsZvrU/v7phSRIulxUYoCZ+i8s+mQ0ecmxxcgHUko=", - "owner": "nix-community", - "repo": "NUR", - "rev": "94c6c5b9798480dc220ee2cc8b1ce93a472a8d8f", - "type": "github" - }, - "original": { - "owner": "nix-community", - "repo": "NUR", - "type": "github" - } - }, - "nur_2": { "inputs": { "flake-parts": [ "stylix", @@ -1068,7 +1012,6 @@ "nixpkgs-master": "nixpkgs-master", "nixpkgs-stable": "nixpkgs-stable_2", "nixpkgs-unstable": "nixpkgs-unstable", - "nur": "nur", "sops-nix": "sops-nix", "stylix": "stylix", "zen": "zen" @@ -1077,11 +1020,11 @@ "rust-analyzer-src": { "flake": false, "locked": { - "lastModified": 1755004716, - "narHash": "sha256-TbhPR5Fqw5LjAeI3/FOPhNNFQCF3cieKCJWWupeZmiA=", + "lastModified": 1755504847, + "narHash": "sha256-VX0B9hwhJypCGqncVVLC+SmeMVd/GAYbJZ0MiiUn2Pk=", "owner": "rust-lang", "repo": "rust-analyzer", - "rev": "b2a58b8c6eff3c3a2c8b5c70dbf69ead78284194", + "rev": "a905e3b21b144d77e1b304e49f3264f6f8d4db75", "type": "github" }, "original": { @@ -1099,11 +1042,11 @@ ] }, "locked": { - "lastModified": 1755139244, - "narHash": "sha256-SN1BFA00m+siVAQiGLtTwjv9LV9TH5n8tQcSziV6Nv4=", + "lastModified": 1755743804, + "narHash": "sha256-M6qT02voARH5e9eTXQBzpYIE/hAp6jPgBCyxLmw5uBM=", "owner": "oxalica", "repo": "rust-overlay", - "rev": "aeae248beb2a419e39d483dd9b7fec924aba8d4d", + "rev": "80322e975e27d834451d6b66e63f8abae9d74bf2", "type": "github" }, "original": { @@ -1140,12 +1083,12 @@ "base16-helix": "base16-helix", "base16-vim": "base16-vim", "firefox-gnome-theme": "firefox-gnome-theme", - "flake-parts": "flake-parts_4", + "flake-parts": "flake-parts_3", "gnome-shell": "gnome-shell", "nixpkgs": [ "nixpkgs" ], - "nur": "nur_2", + "nur": "nur", "systems": "systems_2", "tinted-foot": "tinted-foot", "tinted-kitty": "tinted-kitty", @@ -1154,11 +1097,11 @@ "tinted-zed": "tinted-zed" }, "locked": { - "lastModified": 1755211397, - "narHash": "sha256-kw6iLWUj6+fiEpuc8ntrIzJ2gdS36wIcRINbKU0AIbA=", + "lastModified": 1755708361, + "narHash": "sha256-RmqBx2EamhIk0WVhQSNb8iehaVhilO7D0YAnMoFPqJQ=", "owner": "danth", "repo": "stylix", - "rev": "928ca832d22ab3167b49dc5f4d52ff5d26b0b52a", + "rev": "2355da455d7188228aaf20ac16ea9386e5aa6f0c", "type": "github" }, "original": { @@ -1281,16 +1224,16 @@ "xwayland-satellite-stable": { "flake": false, "locked": { - "lastModified": 1748488455, - "narHash": "sha256-IiLr1alzKFIy5tGGpDlabQbe6LV1c9ABvkH6T5WmyRI=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "3ba30b149f9eb2bbf42cf4758d2158ca8cceef73", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { "owner": "Supreeeme", - "ref": "v0.6", + "ref": "v0.7", "repo": "xwayland-satellite", "type": "github" } @@ -1298,11 +1241,11 @@ "xwayland-satellite-unstable": { "flake": false, "locked": { - "lastModified": 1754533920, - "narHash": "sha256-fCZ68Yud1sUCq6UNXj0SDyiBgVA8gJUE+14ZFGsFJG8=", + "lastModified": 1755491097, + "narHash": "sha256-m+9tUfsmBeF2Gn4HWa6vSITZ4Gz1eA1F5Kh62B0N4oE=", "owner": "Supreeeme", "repo": "xwayland-satellite", - "rev": "e0d1dad25a158551ab58547b2ece4b7d5a19929c", + "rev": "388d291e82ffbc73be18169d39470f340707edaa", "type": "github" }, "original": { @@ -1319,11 +1262,11 @@ ] }, "locked": { - "lastModified": 1755199018, - "narHash": "sha256-y7dM6ihF4feDgbssaeFxKXjsJb6Rzjz1brc17kSkcoQ=", + "lastModified": 1755836873, + "narHash": "sha256-kqBx9zxViNZsg7rD2zqzOQgCWJF/VNrAn0/T1Q7RuBM=", "owner": "0xc000022070", "repo": "zen-browser-flake", - "rev": "8bf64e38baa26429c31d0623c3f16812b794b436", + "rev": "a1bb1b39bee59f537799d9937c6919544c841e5b", "type": "github" }, "original": { diff --git a/flake.nix b/flake.nix index 7cdf81f..1a645a1 100644 --- a/flake.nix +++ b/flake.nix @@ -3,7 +3,7 @@ inputs = { # Nixpkgs - nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable-small"; + nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs-stable.url = "github:nixos/nixpkgs/release-25.05"; nixpkgs-master.url = "github:nixos/nixpkgs/master"; # nixpkgs.follows = "nixpkgs-stable"; @@ -25,9 +25,6 @@ # Impermanence impermanence.url = "github:nix-community/impermanence"; - # NUR - nur.url = "github:nix-community/NUR"; - # Niri niri.url = "github:sodiboo/niri-flake"; diff --git a/overlays/default.nix b/overlays/default.nix index a2dfe65..7db5421 100644 --- a/overlays/default.nix +++ b/overlays/default.nix @@ -59,6 +59,4 @@ config.allowUnfree = true; }; }; - - nur-packages = inputs.nur.overlays.default; }