update flake inputs and pkgs. change TrackersListCollecton from flake inputs to pkgs
This commit is contained in:
parent
c0f3250730
commit
e041ee95c8
19 changed files with 87 additions and 67 deletions
48
flake.lock
generated
48
flake.lock
generated
|
|
@ -87,22 +87,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"bt-tracker": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747642227,
|
||||
"narHash": "sha256-lQKeG4WR7WIMtbM5y9DcrI4SARb2r4+/yG7ZZUE5ZIY=",
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"rev": "de976e14f3b0461cb61be318c6ebf91fcc95e400",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"dae": {
|
||||
"inputs": {
|
||||
"flake-parts": [
|
||||
|
|
@ -394,11 +378,11 @@
|
|||
]
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747565775,
|
||||
"narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=",
|
||||
"lastModified": 1747688838,
|
||||
"narHash": "sha256-FZq4/3OtGV/cti9Vccsy2tGSUrxTO4hkDF9oeGRTen4=",
|
||||
"owner": "nix-community",
|
||||
"repo": "home-manager",
|
||||
"rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8",
|
||||
"rev": "45c2985644b60ab64de2a2d93a4d132ecb87cf66",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -528,11 +512,11 @@
|
|||
},
|
||||
"nixos-hardware": {
|
||||
"locked": {
|
||||
"lastModified": 1747129300,
|
||||
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=",
|
||||
"lastModified": 1747684167,
|
||||
"narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixos-hardware",
|
||||
"rev": "e81fd167b33121269149c57806599045fd33eeed",
|
||||
"rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -650,11 +634,11 @@
|
|||
"nur-rycee": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1747627410,
|
||||
"narHash": "sha256-iRJOiy0ELTcpv+nV790s5vCEpXbzJ4wkJyBCoksGSEE=",
|
||||
"lastModified": 1747713810,
|
||||
"narHash": "sha256-kcTX99Kz39M3Li9MkeQ/59VDDdm0IrggAE2GjcrVTg8=",
|
||||
"owner": "rycee",
|
||||
"repo": "nur-expressions",
|
||||
"rev": "9663730d3789f4e6aaf77226c951f63d25d064e9",
|
||||
"rev": "f5bb1bfd598b0124116ba9fe975d4858e1e4acfa",
|
||||
"type": "gitlab"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -667,7 +651,6 @@
|
|||
"root": {
|
||||
"inputs": {
|
||||
"betterfox-nix": "betterfox-nix",
|
||||
"bt-tracker": "bt-tracker",
|
||||
"dae": "dae",
|
||||
"deploy-rs": "deploy-rs",
|
||||
"disko": "disko",
|
||||
|
|
@ -775,11 +758,11 @@
|
|||
"tinted-zed": "tinted-zed"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1747655219,
|
||||
"narHash": "sha256-83aDEfrE5doV4gmo85pduoQfTGYwUJ3Wy0dV8gXILmw=",
|
||||
"lastModified": 1747675820,
|
||||
"narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=",
|
||||
"owner": "danth",
|
||||
"repo": "stylix",
|
||||
"rev": "54aa02e6272811233d099ad2493adb2d1b19415e",
|
||||
"rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
|
|
@ -838,17 +821,16 @@
|
|||
"tinted-kitty": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1716423189,
|
||||
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=",
|
||||
"lastModified": 1735730497,
|
||||
"narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-kitty",
|
||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
||||
"rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "tinted-theming",
|
||||
"repo": "tinted-kitty",
|
||||
"rev": "eb39e141db14baef052893285df9f266df041ff8",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
|
|
|
|||
|
|
@ -124,13 +124,6 @@
|
|||
};
|
||||
};
|
||||
|
||||
bt-tracker = {
|
||||
type = "github";
|
||||
owner = "XIU2";
|
||||
repo = "TrackersListCollection";
|
||||
flake = false;
|
||||
};
|
||||
|
||||
deploy-rs = {
|
||||
type = "github";
|
||||
owner = "serokell";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
pkgs,
|
||||
config,
|
||||
lib,
|
||||
inputs,
|
||||
rootPath,
|
||||
...
|
||||
}: let
|
||||
|
|
@ -27,7 +26,7 @@ in {
|
|||
settings = {
|
||||
utp-enabled = true;
|
||||
watch-dir-enabled = true;
|
||||
default-trackers = builtins.readFile "${inputs.bt-tracker}/all.txt";
|
||||
default-trackers = builtins.readFile "${pkgs.TrackersListCollection}/all.txt";
|
||||
rpc-bind-address = "0.0.0.0";
|
||||
speed-limit-up-enabled = true;
|
||||
speed-limit-up = 1000;
|
||||
|
|
|
|||
5
overlays/additions/TrackersListCollection.nix
Normal file
5
overlays/additions/TrackersListCollection.nix
Normal file
|
|
@ -0,0 +1,5 @@
|
|||
{outputs, ...}: final: prev: let
|
||||
inherit (prev.stdenv.hostPlatform) system;
|
||||
in {
|
||||
inherit (outputs.packages."${system}") TrackersListCollection;
|
||||
}
|
||||
|
|
@ -3,6 +3,7 @@
|
|||
in
|
||||
[
|
||||
./rime-ice.nix
|
||||
./TrackersListCollection.nix
|
||||
]
|
||||
|> map (file: import file args)
|
||||
|> (overlays: (lib.composeManyExtensions overlays) final prev)
|
||||
|
|
|
|||
4
pkgs/TrackersListCollection.nix
Normal file
4
pkgs/TrackersListCollection.nix
Normal file
|
|
@ -0,0 +1,4 @@
|
|||
{srcs}: let
|
||||
inherit (srcs) TrackersListCollection;
|
||||
in
|
||||
TrackersListCollection.src
|
||||
|
|
@ -1,4 +1,27 @@
|
|||
{
|
||||
"TrackersListCollection": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-20",
|
||||
"extract": null,
|
||||
"name": "TrackersListCollection",
|
||||
"passthru": null,
|
||||
"pinned": false,
|
||||
"src": {
|
||||
"deepClone": false,
|
||||
"fetchSubmodules": false,
|
||||
"leaveDotGit": false,
|
||||
"name": null,
|
||||
"owner": "XIU2",
|
||||
"repo": "TrackersListCollection",
|
||||
"rev": "4625b564bb0bf03e069c4fbaa42df59c84ff0fdf",
|
||||
"sha256": "sha256-1si2rVI2TB0urt6HhLeMot6tAsfii+uc74zxYc9AJk0=",
|
||||
"sparseCheckout": [
|
||||
"all.txt"
|
||||
],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "4625b564bb0bf03e069c4fbaa42df59c84ff0fdf"
|
||||
},
|
||||
"dioxionary": {
|
||||
"cargoLocks": {
|
||||
"./Cargo.lock": [
|
||||
|
|
@ -92,7 +115,7 @@
|
|||
},
|
||||
"rime-ice": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-08",
|
||||
"date": "2025-05-19",
|
||||
"extract": null,
|
||||
"name": "rime-ice",
|
||||
"passthru": null,
|
||||
|
|
@ -104,16 +127,16 @@
|
|||
"name": null,
|
||||
"owner": "iDvel",
|
||||
"repo": "rime-ice",
|
||||
"rev": "60cd1631f9f5023cf00e86adc535571d1b86f1b2",
|
||||
"sha256": "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y=",
|
||||
"rev": "7fab37280f1a90055007f561518c7daf59da9a09",
|
||||
"sha256": "sha256-vWjAJ7UEnuGpYVfqwLt0Cq1jzz+S+DjivQpR9QKyad8=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "60cd1631f9f5023cf00e86adc535571d1b86f1b2"
|
||||
"version": "7fab37280f1a90055007f561518c7daf59da9a09"
|
||||
},
|
||||
"spotx": {
|
||||
"cargoLocks": null,
|
||||
"date": "2025-05-03",
|
||||
"date": "2025-05-12",
|
||||
"extract": null,
|
||||
"name": "spotx",
|
||||
"passthru": null,
|
||||
|
|
@ -125,12 +148,12 @@
|
|||
"name": null,
|
||||
"owner": "SpotX-Official",
|
||||
"repo": "SpotX-Bash",
|
||||
"rev": "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c",
|
||||
"sha256": "sha256-kSFyKLD8qb4CsbUZuHXA0GgrAsFYdIPF0gxpKwtxTX4=",
|
||||
"rev": "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a",
|
||||
"sha256": "sha256-QKfSQby0hw2X9mHxLSO4I6Z9nXPNWIHqJkdP23BC+48=",
|
||||
"sparseCheckout": [],
|
||||
"type": "github"
|
||||
},
|
||||
"version": "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c"
|
||||
"version": "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a"
|
||||
},
|
||||
"tree-sitter-idris": {
|
||||
"cargoLocks": null,
|
||||
|
|
|
|||
|
|
@ -1,6 +1,21 @@
|
|||
# This file was generated by nvfetcher, please do not modify it manually.
|
||||
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }:
|
||||
{
|
||||
TrackersListCollection = {
|
||||
pname = "TrackersListCollection";
|
||||
version = "4625b564bb0bf03e069c4fbaa42df59c84ff0fdf";
|
||||
src = fetchFromGitHub {
|
||||
owner = "XIU2";
|
||||
repo = "TrackersListCollection";
|
||||
rev = "4625b564bb0bf03e069c4fbaa42df59c84ff0fdf";
|
||||
fetchSubmodules = false;
|
||||
deepClone = false;
|
||||
leaveDotGit = false;
|
||||
sparseCheckout = [ "all.txt" ];
|
||||
sha256 = "sha256-1si2rVI2TB0urt6HhLeMot6tAsfii+uc74zxYc9AJk0=";
|
||||
};
|
||||
date = "2025-05-20";
|
||||
};
|
||||
dioxionary = {
|
||||
pname = "dioxionary";
|
||||
version = "4db80d458ff7494967c94ebb1db596abba0775b2";
|
||||
|
|
@ -65,27 +80,27 @@
|
|||
};
|
||||
rime-ice = {
|
||||
pname = "rime-ice";
|
||||
version = "60cd1631f9f5023cf00e86adc535571d1b86f1b2";
|
||||
version = "7fab37280f1a90055007f561518c7daf59da9a09";
|
||||
src = fetchFromGitHub {
|
||||
owner = "iDvel";
|
||||
repo = "rime-ice";
|
||||
rev = "60cd1631f9f5023cf00e86adc535571d1b86f1b2";
|
||||
rev = "7fab37280f1a90055007f561518c7daf59da9a09";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y=";
|
||||
sha256 = "sha256-vWjAJ7UEnuGpYVfqwLt0Cq1jzz+S+DjivQpR9QKyad8=";
|
||||
};
|
||||
date = "2025-05-08";
|
||||
date = "2025-05-19";
|
||||
};
|
||||
spotx = {
|
||||
pname = "spotx";
|
||||
version = "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c";
|
||||
version = "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a";
|
||||
src = fetchFromGitHub {
|
||||
owner = "SpotX-Official";
|
||||
repo = "SpotX-Bash";
|
||||
rev = "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c";
|
||||
rev = "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a";
|
||||
fetchSubmodules = false;
|
||||
sha256 = "sha256-kSFyKLD8qb4CsbUZuHXA0GgrAsFYdIPF0gxpKwtxTX4=";
|
||||
sha256 = "sha256-QKfSQby0hw2X9mHxLSO4I6Z9nXPNWIHqJkdP23BC+48=";
|
||||
};
|
||||
date = "2025-05-03";
|
||||
date = "2025-05-12";
|
||||
};
|
||||
tree-sitter-idris = {
|
||||
pname = "tree-sitter-idris";
|
||||
|
|
|
|||
|
|
@ -14,6 +14,7 @@ in
|
|||
dioxionary = callPackage ./dioxionary.nix {};
|
||||
spotifyx = callPackage ./spotifyx.nix {};
|
||||
radicle-explorer = callPackage ./radicle-explorer {};
|
||||
TrackersListCollection = callPackage ./TrackersListCollection.nix {};
|
||||
|
||||
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
|
||||
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};
|
||||
|
|
|
|||
|
|
@ -5,7 +5,6 @@
|
|||
openssl,
|
||||
installShellFiles,
|
||||
lib,
|
||||
...
|
||||
}: let
|
||||
src = srcs.dioxionary;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
pkgs,
|
||||
inputs,
|
||||
callPackage,
|
||||
...
|
||||
}: let
|
||||
inherit (inputs.helix.packages."${pkgs.system}") helix;
|
||||
runtime = callPackage ./runtime.nix {};
|
||||
|
|
|
|||
|
|
@ -3,7 +3,6 @@
|
|||
srcs,
|
||||
stdenv,
|
||||
runCommandNoCCLocal,
|
||||
...
|
||||
}: let
|
||||
buildGrammar = grammar:
|
||||
stdenv.mkDerivation {
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
buildGoModule,
|
||||
srcs,
|
||||
...
|
||||
}:
|
||||
buildGoModule rec {
|
||||
name = "juicity";
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
nixosTests,
|
||||
srcs,
|
||||
stdenvNoCC,
|
||||
...
|
||||
}: let
|
||||
source = srcs.noto-sans-cjk;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -2,7 +2,6 @@
|
|||
nixosTests,
|
||||
srcs,
|
||||
stdenvNoCC,
|
||||
...
|
||||
}: let
|
||||
source = srcs.noto-serif-cjk;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -29,3 +29,8 @@ git.sparseCheckout = ["Sans/OTC"]
|
|||
[spotx]
|
||||
src.git = "https://github.com/SpotX-Official/SpotX-Bash.git"
|
||||
fetch.github = "SpotX-Official/SpotX-Bash"
|
||||
|
||||
[TrackersListCollection]
|
||||
src.git = "https://github.com/XIU2/TrackersListCollection.git"
|
||||
fetch.github = "XIU2/TrackersListCollection"
|
||||
git.sparseCheckout = ["all.txt"]
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{pkgs, ...}:
|
||||
{pkgs}:
|
||||
(pkgs.radicle-explorer.withConfig {
|
||||
preferredSeeds = [
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
srcs,
|
||||
stdenvNoCC,
|
||||
...
|
||||
}: let
|
||||
source = srcs.rime-ice;
|
||||
in
|
||||
|
|
|
|||
|
|
@ -1,7 +1,6 @@
|
|||
{
|
||||
pkgs,
|
||||
srcs,
|
||||
...
|
||||
}: let
|
||||
inherit (srcs) spotx;
|
||||
in
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue