youthlic/nixos
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update flake inputs and pkgs. change TrackersListCollecton from flake inputs to pkgs

Browse source
This commit is contained in:
ulic-youthlic 2025-05-20 11:55:43 +08:00
parent c0f3250730
commit e041ee95c8
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
19 changed files with 87 additions and 67 deletions
Download patch file Download diff file Expand all files Collapse all files

48
flake.lock generated
View file

@ -87,22 +87,6 @@
"type": "github" "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": { "dae": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
@ -394,11 +378,11 @@
] ]
}, },
"locked": { "locked": {
"lastModified": 1747565775, "lastModified": 1747688838,
"narHash": "sha256-B6jmKHUEX1jxxcdoYHl7RVaeohtAVup8o3nuVkzkloA=", "narHash": "sha256-FZq4/3OtGV/cti9Vccsy2tGSUrxTO4hkDF9oeGRTen4=",
"owner": "nix-community", "owner": "nix-community",
"repo": "home-manager", "repo": "home-manager",
"rev": "97118a310eb8e13bc1b9b12d67267e55b7bee6c8", "rev": "45c2985644b60ab64de2a2d93a4d132ecb87cf66",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -528,11 +512,11 @@
}, },
"nixos-hardware": { "nixos-hardware": {
"locked": { "locked": {
"lastModified": 1747129300, "lastModified": 1747684167,
"narHash": "sha256-L3clA5YGeYCF47ghsI7Tcex+DnaaN/BbQ4dR2wzoiKg=", "narHash": "sha256-l6jbonaboCBlB8lCjBkrqgh2zEnvt6F3f4dOU/8CLd4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixos-hardware", "repo": "nixos-hardware",
"rev": "e81fd167b33121269149c57806599045fd33eeed", "rev": "e8f38b2c19c0647e39021c3d47172ff5469af8a9",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -650,11 +634,11 @@
"nur-rycee": { "nur-rycee": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1747627410, "lastModified": 1747713810,
"narHash": "sha256-iRJOiy0ELTcpv+nV790s5vCEpXbzJ4wkJyBCoksGSEE=", "narHash": "sha256-kcTX99Kz39M3Li9MkeQ/59VDDdm0IrggAE2GjcrVTg8=",
"owner": "rycee", "owner": "rycee",
"repo": "nur-expressions", "repo": "nur-expressions",
"rev": "9663730d3789f4e6aaf77226c951f63d25d064e9", "rev": "f5bb1bfd598b0124116ba9fe975d4858e1e4acfa",
"type": "gitlab" "type": "gitlab"
}, },
"original": { "original": {
@ -667,7 +651,6 @@
"root": { "root": {
"inputs": { "inputs": {
"betterfox-nix": "betterfox-nix", "betterfox-nix": "betterfox-nix",
"bt-tracker": "bt-tracker",
"dae": "dae", "dae": "dae",
"deploy-rs": "deploy-rs", "deploy-rs": "deploy-rs",
"disko": "disko", "disko": "disko",
@ -775,11 +758,11 @@
"tinted-zed": "tinted-zed" "tinted-zed": "tinted-zed"
}, },
"locked": { "locked": {
"lastModified": 1747655219, "lastModified": 1747675820,
"narHash": "sha256-83aDEfrE5doV4gmo85pduoQfTGYwUJ3Wy0dV8gXILmw=", "narHash": "sha256-Z8o3Tu/FN4GOtZl4WNY0Gcp/Uzuz06ILkRy0oPVteM0=",
"owner": "danth", "owner": "danth",
"repo": "stylix", "repo": "stylix",
"rev": "54aa02e6272811233d099ad2493adb2d1b19415e", "rev": "f8833c5e0c64287cd51a27e6061a88f4225b6b70",
"type": "github" "type": "github"
}, },
"original": { "original": {
@ -838,17 +821,16 @@
"tinted-kitty": { "tinted-kitty": {
"flake": false, "flake": false,
"locked": { "locked": {
"lastModified": 1716423189, "lastModified": 1735730497,
"narHash": "sha256-2xF3sH7UIwegn+2gKzMpFi3pk5DlIlM18+vj17Uf82U=", "narHash": "sha256-4KtB+FiUzIeK/4aHCKce3V9HwRvYaxX+F1edUrfgzb8=",
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-kitty", "repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8", "rev": "de6f888497f2c6b2279361bfc790f164bfd0f3fa",
"type": "github" "type": "github"
}, },
"original": { "original": {
"owner": "tinted-theming", "owner": "tinted-theming",
"repo": "tinted-kitty", "repo": "tinted-kitty",
"rev": "eb39e141db14baef052893285df9f266df041ff8",
"type": "github" "type": "github"
} }
}, },

7
flake.nix
View file

@ -124,13 +124,6 @@
}; };
}; };
bt-tracker = {
type = "github";
owner = "XIU2";
repo = "TrackersListCollection";
flake = false;
};
deploy-rs = { deploy-rs = {
type = "github"; type = "github";
owner = "serokell"; owner = "serokell";

3
nixos/modules/programs/transmission.nix
View file

@ -2,7 +2,6 @@
pkgs, pkgs,
config, config,
lib, lib,
inputs,
rootPath, rootPath,
... ...
}: let }: let
@ -27,7 +26,7 @@ in {
settings = { settings = {
utp-enabled = true; utp-enabled = true;
watch-dir-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"; rpc-bind-address = "0.0.0.0";
speed-limit-up-enabled = true; speed-limit-up-enabled = true;
speed-limit-up = 1000; speed-limit-up = 1000;

5
overlays/additions/TrackersListCollection.nix Normal file
View file

@ -0,0 +1,5 @@
{outputs, ...}: final: prev: let
inherit (prev.stdenv.hostPlatform) system;
in {
inherit (outputs.packages."${system}") TrackersListCollection;
}

1
overlays/additions/default.nix
View file

@ -3,6 +3,7 @@
in in
[ [
./rime-ice.nix ./rime-ice.nix
./TrackersListCollection.nix
] ]
|> map (file: import file args) |> map (file: import file args)
|> (overlays: (lib.composeManyExtensions overlays) final prev) |> (overlays: (lib.composeManyExtensions overlays) final prev)

4
pkgs/TrackersListCollection.nix Normal file
View file

@ -0,0 +1,4 @@
{srcs}: let
inherit (srcs) TrackersListCollection;
in
TrackersListCollection.src

39
pkgs/_sources/generated.json
View file

@ -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": { "dioxionary": {
"cargoLocks": { "cargoLocks": {
"./Cargo.lock": [ "./Cargo.lock": [
@ -92,7 +115,7 @@
}, },
"rime-ice": { "rime-ice": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-05-08", "date": "2025-05-19",
"extract": null, "extract": null,
"name": "rime-ice", "name": "rime-ice",
"passthru": null, "passthru": null,
@ -104,16 +127,16 @@
"name": null, "name": null,
"owner": "iDvel", "owner": "iDvel",
"repo": "rime-ice", "repo": "rime-ice",
"rev": "60cd1631f9f5023cf00e86adc535571d1b86f1b2", "rev": "7fab37280f1a90055007f561518c7daf59da9a09",
"sha256": "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y=", "sha256": "sha256-vWjAJ7UEnuGpYVfqwLt0Cq1jzz+S+DjivQpR9QKyad8=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "60cd1631f9f5023cf00e86adc535571d1b86f1b2" "version": "7fab37280f1a90055007f561518c7daf59da9a09"
}, },
"spotx": { "spotx": {
"cargoLocks": null, "cargoLocks": null,
"date": "2025-05-03", "date": "2025-05-12",
"extract": null, "extract": null,
"name": "spotx", "name": "spotx",
"passthru": null, "passthru": null,
@ -125,12 +148,12 @@
"name": null, "name": null,
"owner": "SpotX-Official", "owner": "SpotX-Official",
"repo": "SpotX-Bash", "repo": "SpotX-Bash",
"rev": "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c", "rev": "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a",
"sha256": "sha256-kSFyKLD8qb4CsbUZuHXA0GgrAsFYdIPF0gxpKwtxTX4=", "sha256": "sha256-QKfSQby0hw2X9mHxLSO4I6Z9nXPNWIHqJkdP23BC+48=",
"sparseCheckout": [], "sparseCheckout": [],
"type": "github" "type": "github"
}, },
"version": "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c" "version": "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a"
}, },
"tree-sitter-idris": { "tree-sitter-idris": {
"cargoLocks": null, "cargoLocks": null,

31
pkgs/_sources/generated.nix
View file

@ -1,6 +1,21 @@
# This file was generated by nvfetcher, please do not modify it manually. # This file was generated by nvfetcher, please do not modify it manually.
{ fetchgit, fetchurl, fetchFromGitHub, dockerTools }: { 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 = { dioxionary = {
pname = "dioxionary"; pname = "dioxionary";
version = "4db80d458ff7494967c94ebb1db596abba0775b2"; version = "4db80d458ff7494967c94ebb1db596abba0775b2";
@ -65,27 +80,27 @@
}; };
rime-ice = { rime-ice = {
pname = "rime-ice"; pname = "rime-ice";
version = "60cd1631f9f5023cf00e86adc535571d1b86f1b2"; version = "7fab37280f1a90055007f561518c7daf59da9a09";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "iDvel"; owner = "iDvel";
repo = "rime-ice"; repo = "rime-ice";
rev = "60cd1631f9f5023cf00e86adc535571d1b86f1b2"; rev = "7fab37280f1a90055007f561518c7daf59da9a09";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-3K25oc4q/5pmZL7WYoSR6RyjgV+7o7W6MzBcIKeRD0Y="; sha256 = "sha256-vWjAJ7UEnuGpYVfqwLt0Cq1jzz+S+DjivQpR9QKyad8=";
}; };
date = "2025-05-08"; date = "2025-05-19";
}; };
spotx = { spotx = {
pname = "spotx"; pname = "spotx";
version = "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c"; version = "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a";
src = fetchFromGitHub { src = fetchFromGitHub {
owner = "SpotX-Official"; owner = "SpotX-Official";
repo = "SpotX-Bash"; repo = "SpotX-Bash";
rev = "1d16abcbb6cdd0a2882084d91dedc4e1f0e3844c"; rev = "d756a3f23ddd8bbbeb644f6070a147aaa239ba4a";
fetchSubmodules = false; fetchSubmodules = false;
sha256 = "sha256-kSFyKLD8qb4CsbUZuHXA0GgrAsFYdIPF0gxpKwtxTX4="; sha256 = "sha256-QKfSQby0hw2X9mHxLSO4I6Z9nXPNWIHqJkdP23BC+48=";
}; };
date = "2025-05-03"; date = "2025-05-12";
}; };
tree-sitter-idris = { tree-sitter-idris = {
pname = "tree-sitter-idris"; pname = "tree-sitter-idris";

1
pkgs/default.nix
View file

@ -14,6 +14,7 @@ in
dioxionary = callPackage ./dioxionary.nix {}; dioxionary = callPackage ./dioxionary.nix {};
spotifyx = callPackage ./spotifyx.nix {}; spotifyx = callPackage ./spotifyx.nix {};
radicle-explorer = callPackage ./radicle-explorer {}; radicle-explorer = callPackage ./radicle-explorer {};
TrackersListCollection = callPackage ./TrackersListCollection.nix {};
noto-serif-cjk = callPackage ./noto-serif-cjk.nix {}; noto-serif-cjk = callPackage ./noto-serif-cjk.nix {};
noto-sans-cjk = callPackage ./noto-sans-cjk.nix {}; noto-sans-cjk = callPackage ./noto-sans-cjk.nix {};

1
pkgs/dioxionary.nix
View file

@ -5,7 +5,6 @@
openssl, openssl,
installShellFiles, installShellFiles,
lib, lib,
...
}: let }: let
src = srcs.dioxionary; src = srcs.dioxionary;
in in

1
pkgs/helix/default.nix
View file

@ -3,7 +3,6 @@
pkgs, pkgs,
inputs, inputs,
callPackage, callPackage,
...
}: let }: let
inherit (inputs.helix.packages."${pkgs.system}") helix; inherit (inputs.helix.packages."${pkgs.system}") helix;
runtime = callPackage ./runtime.nix {}; runtime = callPackage ./runtime.nix {};

1
pkgs/helix/runtime.nix
View file

@ -3,7 +3,6 @@
srcs, srcs,
stdenv, stdenv,
runCommandNoCCLocal, runCommandNoCCLocal,
...
}: let }: let
buildGrammar = grammar: buildGrammar = grammar:
stdenv.mkDerivation { stdenv.mkDerivation {

1
pkgs/juicity.nix
View file

@ -1,7 +1,6 @@
{ {
buildGoModule, buildGoModule,
srcs, srcs,
...
}: }:
buildGoModule rec { buildGoModule rec {
name = "juicity"; name = "juicity";

1
pkgs/noto-sans-cjk.nix
View file

@ -2,7 +2,6 @@
nixosTests, nixosTests,
srcs, srcs,
stdenvNoCC, stdenvNoCC,
...
}: let }: let
source = srcs.noto-sans-cjk; source = srcs.noto-sans-cjk;
in in

1
pkgs/noto-serif-cjk.nix
View file

@ -2,7 +2,6 @@
nixosTests, nixosTests,
srcs, srcs,
stdenvNoCC, stdenvNoCC,
...
}: let }: let
source = srcs.noto-serif-cjk; source = srcs.noto-serif-cjk;
in in

5
pkgs/nvfetcher.toml
View file

@ -29,3 +29,8 @@ git.sparseCheckout = ["Sans/OTC"]
[spotx] [spotx]
src.git = "https://github.com/SpotX-Official/SpotX-Bash.git" src.git = "https://github.com/SpotX-Official/SpotX-Bash.git"
fetch.github = "SpotX-Official/SpotX-Bash" fetch.github = "SpotX-Official/SpotX-Bash"
[TrackersListCollection]
src.git = "https://github.com/XIU2/TrackersListCollection.git"
fetch.github = "XIU2/TrackersListCollection"
git.sparseCheckout = ["all.txt"]

2
pkgs/radicle-explorer/default.nix
View file

@ -1,4 +1,4 @@
{pkgs, ...}: {pkgs}:
(pkgs.radicle-explorer.withConfig { (pkgs.radicle-explorer.withConfig {
preferredSeeds = [ preferredSeeds = [
{ {

1
pkgs/rime-ice.nix
View file

@ -1,7 +1,6 @@
{ {
srcs, srcs,
stdenvNoCC, stdenvNoCC,
...
}: let }: let
source = srcs.rime-ice; source = srcs.rime-ice;
in in

1
pkgs/spotifyx.nix
View file

@ -1,7 +1,6 @@
{ {
pkgs, pkgs,
srcs, srcs,
...
}: let }: let
inherit (srcs) spotx; inherit (srcs) spotx;
in in