From a96d365d58e132f49a556db5778d492873dbed1d Mon Sep 17 00:00:00 2001 From: chn Date: Sun, 29 Jun 2025 14:57:06 +0800 Subject: [PATCH] Revert "flake: remove nur-linyinfeng" This reverts commit e6c4fbddab4a2f6c87ea5cb816ead16869bbf4f7. # Conflicts: # flake.lock # flake.nix # modules/packages/desktop.nix --- flake.lock | 203 ++++++++++++++++++++++- flake.nix | 1 + flake/lib/buildNixpkgsConfig/default.nix | 1 + modules/packages/desktop.nix | 2 +- 4 files changed, 197 insertions(+), 10 deletions(-) diff --git a/flake.lock b/flake.lock index 7f143574..25bf265c 100644 --- a/flake.lock +++ b/flake.lock @@ -149,6 +149,27 @@ } }, "devshell": { + "inputs": { + "nixpkgs": [ + "nur-linyinfeng", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1741473158, + "narHash": "sha256-kWNaq6wQUbUMlPgw8Y+9/9wP0F8SHkjy24/mN3UAppg=", + "owner": "numtide", + "repo": "devshell", + "rev": "7c9e793ebe66bcba8292989a68c0419b737a22a0", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "devshell", + "type": "github" + } + }, + "devshell_2": { "inputs": { "nixpkgs": [ "nur-xddxdd", @@ -204,11 +225,11 @@ "flake-compat_2": { "flake": false, "locked": { - "lastModified": 1696426674, - "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "lastModified": 1747046372, + "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "owner": "edolstra", "repo": "flake-compat", - "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "rev": "9100a0f413b0c601e0533d1d94ffd501ce2e7885", "type": "github" }, "original": { @@ -233,7 +254,44 @@ "type": "github" } }, + "flake-compat_4": { + "flake": false, + "locked": { + "lastModified": 1696426674, + "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=", + "owner": "edolstra", + "repo": "flake-compat", + "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33", + "type": "github" + }, + "original": { + "owner": "edolstra", + "repo": "flake-compat", + "type": "github" + } + }, "flake-parts": { + "inputs": { + "nixpkgs-lib": [ + "nur-linyinfeng", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1749398372, + "narHash": "sha256-tYBdgS56eXYaWVW3fsnPQ/nFlgWi/Z2Ymhyu21zVM98=", + "owner": "hercules-ci", + "repo": "flake-parts", + "rev": "9305fe4e5c2a6fcf5ba6a3ff155720fbe4076569", + "type": "github" + }, + "original": { + "owner": "hercules-ci", + "repo": "flake-parts", + "type": "github" + } + }, + "flake-parts_2": { "inputs": { "nixpkgs-lib": "nixpkgs-lib" }, @@ -287,6 +345,24 @@ "type": "github" } }, + "flake-utils_3": { + "inputs": { + "systems": "systems_3" + }, + "locked": { + "lastModified": 1731533236, + "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=", + "owner": "numtide", + "repo": "flake-utils", + "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "flake-utils", + "type": "github" + } + }, "gitignore": { "inputs": { "nixpkgs": [ @@ -538,6 +614,22 @@ "type": "github" } }, + "nixos-stable": { + "locked": { + "lastModified": 1750646418, + "narHash": "sha256-4UAN+W0Lp4xnUiHYXUXAPX18t+bn6c4Btry2RqM9JHY=", + "owner": "nixos", + "repo": "nixpkgs", + "rev": "1f426f65ac4e6bf808923eb6f8b8c2bfba3d18c5", + "type": "github" + }, + "original": { + "owner": "nixos", + "ref": "nixos-24.11", + "repo": "nixpkgs", + "type": "github" + } + }, "nixos-wallpaper": { "flake": false, "locked": { @@ -703,18 +795,45 @@ "type": "github" } }, - "nur-xddxdd": { + "nur-linyinfeng": { "inputs": { "devshell": "devshell", + "flake-compat": "flake-compat_2", "flake-parts": "flake-parts", + "flake-utils": "flake-utils_2", + "nixos-stable": "nixos-stable", + "nixpkgs": [ + "nixpkgs" + ], + "nvfetcher": "nvfetcher", + "treefmt-nix": "treefmt-nix" + }, + "locked": { + "lastModified": 1751049834, + "narHash": "sha256-xgLH6/ZtQJKWsham0Cj0nKGY8hde2fY8vZgSM5JfRik=", + "owner": "linyinfeng", + "repo": "nur-packages", + "rev": "d7a4ee64345bae20e75f40d6f35c705d22c216d4", + "type": "github" + }, + "original": { + "owner": "linyinfeng", + "repo": "nur-packages", + "type": "github" + } + }, + "nur-xddxdd": { + "inputs": { + "devshell": "devshell_2", + "flake-parts": "flake-parts_2", "nix-index-database": "nix-index-database_2", "nixpkgs": [ "nixpkgs" ], "nixpkgs-24_05": "nixpkgs-24_05", - "nvfetcher": "nvfetcher", + "nvfetcher": "nvfetcher_2", "pre-commit-hooks-nix": "pre-commit-hooks-nix", - "treefmt-nix": "treefmt-nix" + "treefmt-nix": "treefmt-nix_2" }, "locked": { "lastModified": 1748081225, @@ -732,8 +851,37 @@ }, "nvfetcher": { "inputs": { - "flake-compat": "flake-compat_2", - "flake-utils": "flake-utils_2", + "flake-compat": [ + "nur-linyinfeng", + "flake-compat" + ], + "flake-utils": [ + "nur-linyinfeng", + "flake-utils" + ], + "nixpkgs": [ + "nur-linyinfeng", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1732501185, + "narHash": "sha256-Z0BpHelaGQsE5VD9hBsBHsvMU9h+Xt0kfkDJyFivZOU=", + "owner": "berberman", + "repo": "nvfetcher", + "rev": "bdb14eab6fe9cefc29efe01e60c3a3f616d6b62a", + "type": "github" + }, + "original": { + "owner": "berberman", + "repo": "nvfetcher", + "type": "github" + } + }, + "nvfetcher_2": { + "inputs": { + "flake-compat": "flake-compat_3", + "flake-utils": "flake-utils_3", "nixpkgs": [ "nur-xddxdd", "nixpkgs" @@ -827,7 +975,7 @@ }, "pre-commit-hooks-nix": { "inputs": { - "flake-compat": "flake-compat_3", + "flake-compat": "flake-compat_4", "gitignore": "gitignore", "nixpkgs": [ "nur-xddxdd", @@ -895,6 +1043,7 @@ "nixpkgs-unstable": "nixpkgs-unstable", "nixvirt": "nixvirt", "nu-scripts": "nu-scripts", + "nur-linyinfeng": "nur-linyinfeng", "nur-xddxdd": "nur-xddxdd", "openxlsx": "openxlsx", "phono3py": "phono3py", @@ -1046,6 +1195,21 @@ "type": "github" } }, + "systems_3": { + "locked": { + "lastModified": 1681028828, + "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=", + "owner": "nix-systems", + "repo": "default", + "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e", + "type": "github" + }, + "original": { + "owner": "nix-systems", + "repo": "default", + "type": "github" + } + }, "tgbot-cpp": { "flake": false, "locked": { @@ -1063,6 +1227,27 @@ } }, "treefmt-nix": { + "inputs": { + "nixpkgs": [ + "nur-linyinfeng", + "nixpkgs" + ] + }, + "locked": { + "lastModified": 1750931469, + "narHash": "sha256-0IEdQB1nS+uViQw4k3VGUXntjkDp7aAlqcxdewb/hAc=", + "owner": "numtide", + "repo": "treefmt-nix", + "rev": "ac8e6f32e11e9c7f153823abc3ab007f2a65d3e1", + "type": "github" + }, + "original": { + "owner": "numtide", + "repo": "treefmt-nix", + "type": "github" + } + }, + "treefmt-nix_2": { "inputs": { "nixpkgs": [ "nur-xddxdd", diff --git a/flake.nix b/flake.nix index 66242826..1bf6578d 100644 --- a/flake.nix +++ b/flake.nix @@ -23,6 +23,7 @@ url = "github:pjones/plasma-manager"; inputs = { nixpkgs.follows = "nixpkgs"; home-manager.follows = "home-manager"; }; }; + nur-linyinfeng = { url = "github:linyinfeng/nur-packages"; inputs.nixpkgs.follows = "nixpkgs"; }; catppuccin = { url = "github:catppuccin/nix"; inputs.nixpkgs.follows = "nixpkgs"; }; bscpkgs = { url = "github:CHN-beta/bscpkgs"; inputs.nixpkgs.follows = "nixpkgs"; }; aagl = { url = "github:ezKEa/aagl-gtk-on-nix/release-25.05"; inputs.nixpkgs.follows = "nixpkgs"; }; diff --git a/flake/lib/buildNixpkgsConfig/default.nix b/flake/lib/buildNixpkgsConfig/default.nix index 5fd9fc73..b3c80d33 100644 --- a/flake/lib/buildNixpkgsConfig/default.nix +++ b/flake/lib/buildNixpkgsConfig/default.nix @@ -40,6 +40,7 @@ in platformConfig // (final: prev: { inherit (inputs.topInputs.nix-vscode-extensions.overlays.default final prev) nix-vscode-extensions; + nur-linyinfeng = (inputs.topInputs.nur-linyinfeng.overlays.default final prev).linyinfeng; firefox-addons = (import "${inputs.topInputs.rycee}" { inherit (prev) pkgs; }).firefox-addons; }) inputs.topInputs.self.overlays.default diff --git a/modules/packages/desktop.nix b/modules/packages/desktop.nix index 09ef234e..6eb48e89 100644 --- a/modules/packages/desktop.nix +++ b/modules/packages/desktop.nix @@ -45,7 +45,7 @@ inputs: # required by vscode nix tools nil # instant messager - element-desktop telegram-desktop discord zoom-us slack nheko + element-desktop telegram-desktop discord zoom-us slack nheko nur-linyinfeng.wemeet # browser google-chrome tor-browser # office