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

flake: Include NUR instead of call package functions separately

Browse source
This commit is contained in:
ulic-youthlic 2025-07-05 19:20:06 +08:00
parent 6267da609a
commit e9580543b4
Signed by: youthlic
GPG key ID: 63E86C3C14A0D721
7 changed files with 61 additions and 390 deletions
Download patch file Download diff file Expand all files Collapse all files

381
flake.lock generated
View file

@ -87,37 +87,6 @@
"type": "github" "type": "github"
} }
}, },
"cachix": {
"inputs": {
"devenv": [
"nur-ataraxiasjel",
"devenv"
],
"flake-compat": [
"nur-ataraxiasjel",
"devenv"
],
"git-hooks": [
"nur-ataraxiasjel",
"devenv"
],
"nixpkgs": "nixpkgs_4"
},
"locked": {
"lastModified": 1744206633,
"narHash": "sha256-pb5aYkE8FOoa4n123slgHiOf1UbNSnKe5pEZC+xXD5g=",
"owner": "cachix",
"repo": "cachix",
"rev": "8a60090640b96f9df95d1ab99e5763a586be1404",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "latest",
"repo": "cachix",
"type": "github"
}
},
"chaotic": { "chaotic": {
"inputs": { "inputs": {
"flake-schemas": "flake-schemas", "flake-schemas": "flake-schemas",
@ -187,40 +156,6 @@
"type": "github" "type": "github"
} }
}, },
"devenv": {
"inputs": {
"cachix": "cachix",
"flake-compat": "flake-compat_3",
"git-hooks": "git-hooks",
"nix": "nix",
"nixpkgs": "nixpkgs_6"
},
"locked": {
"lastModified": 1748273445,
"narHash": "sha256-5V0dzpNgQM0CHDsMzh+ludYeu1S+Y+IMjbaskSSdFh0=",
"owner": "cachix",
"repo": "devenv",
"rev": "668a50d8b7bdb19a0131f53c9f6c25c9071e1ffb",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "devenv",
"type": "github"
}
},
"devenv-root": {
"flake": false,
"locked": {
"narHash": "sha256-d6xi4mKdjkX2JFicDIv5niSzpyI0m/Hnm8GGAIU04kY=",
"type": "file",
"url": "file:///dev/null"
},
"original": {
"type": "file",
"url": "file:///dev/null"
}
},
"disko": { "disko": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -290,22 +225,6 @@
} }
}, },
"flake-compat_3": { "flake-compat_3": {
"flake": false,
"locked": {
"lastModified": 1733328505,
"narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
"owner": "edolstra",
"repo": "flake-compat",
"rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
"type": "github"
},
"original": {
"owner": "edolstra",
"repo": "flake-compat",
"type": "github"
}
},
"flake-compat_4": {
"locked": { "locked": {
"lastModified": 1747046372, "lastModified": 1747046372,
"narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=", "narHash": "sha256-CIVLLkVgvHYbgI2UpXvIIBJ12HWgX+fjA8Xf8PUmqCY=",
@ -338,47 +257,6 @@
"type": "github" "type": "github"
} }
}, },
"flake-parts_2": {
"inputs": {
"nixpkgs-lib": [
"nur-ataraxiasjel",
"devenv",
"nix",
"nixpkgs"
]
},
"locked": {
"lastModified": 1712014858,
"narHash": "sha256-sB4SWl2lX95bExY2gMFG5HIzvva5AVMJd4Igm+GpZNw=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "9126214d0a59633752a136528f5f3b9aa8565b7d",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-parts_3": {
"inputs": {
"nixpkgs-lib": "nixpkgs-lib_2"
},
"locked": {
"lastModified": 1743550720,
"narHash": "sha256-hIshGgKZCgWh6AYJpJmRgFdR3WUbkY04o82X05xqQiY=",
"owner": "hercules-ci",
"repo": "flake-parts",
"rev": "c621e8422220273271f52058f618c94e405bb0f5",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "flake-parts",
"type": "github"
}
},
"flake-schemas": { "flake-schemas": {
"locked": { "locked": {
"lastModified": 1721999734, "lastModified": 1721999734,
@ -443,39 +321,12 @@
} }
}, },
"git-hooks": { "git-hooks": {
"inputs": {
"flake-compat": [
"nur-ataraxiasjel",
"devenv"
],
"gitignore": "gitignore",
"nixpkgs": [
"nur-ataraxiasjel",
"devenv",
"nixpkgs"
]
},
"locked": {
"lastModified": 1746537231,
"narHash": "sha256-Wb2xeSyOsCoTCTj7LOoD6cdKLEROyFAArnYoS+noCWo=",
"owner": "cachix",
"repo": "git-hooks.nix",
"rev": "fa466640195d38ec97cf0493d6d6882bc4d14969",
"type": "github"
},
"original": {
"owner": "cachix",
"repo": "git-hooks.nix",
"type": "github"
}
},
"git-hooks_2": {
"inputs": { "inputs": {
"flake-compat": [ "flake-compat": [
"stylix", "stylix",
"flake-compat" "flake-compat"
], ],
"gitignore": "gitignore_2", "gitignore": "gitignore",
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
"nixpkgs" "nixpkgs"
@ -496,29 +347,6 @@
} }
}, },
"gitignore": { "gitignore": {
"inputs": {
"nixpkgs": [
"nur-ataraxiasjel",
"devenv",
"git-hooks",
"nixpkgs"
]
},
"locked": {
"lastModified": 1709087332,
"narHash": "sha256-HG2cCnktfHsKV0s4XW83gU3F57gaTljL9KNSuG6bnQs=",
"owner": "hercules-ci",
"repo": "gitignore.nix",
"rev": "637db329424fd7e46cf4185293b9cc8c88c95394",
"type": "github"
},
"original": {
"owner": "hercules-ci",
"repo": "gitignore.nix",
"type": "github"
}
},
"gitignore_2": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
"stylix", "stylix",
@ -642,22 +470,6 @@
"type": "github" "type": "github"
} }
}, },
"libgit2": {
"flake": false,
"locked": {
"lastModified": 1697646580,
"narHash": "sha256-oX4Z3S9WtJlwvj0uH9HlYcWv+x1hqp8mhXl7HsLu2f0=",
"owner": "libgit2",
"repo": "libgit2",
"rev": "45fd9ed7ae1a9b74b957ef4f337bc3c8b3df01b5",
"type": "github"
},
"original": {
"owner": "libgit2",
"repo": "libgit2",
"type": "github"
}
},
"lix": { "lix": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -756,43 +568,6 @@
"type": "github" "type": "github"
} }
}, },
"nix": {
"inputs": {
"flake-compat": [
"nur-ataraxiasjel",
"devenv"
],
"flake-parts": "flake-parts_2",
"libgit2": "libgit2",
"nixpkgs": "nixpkgs_5",
"nixpkgs-23-11": [
"nur-ataraxiasjel",
"devenv"
],
"nixpkgs-regression": [
"nur-ataraxiasjel",
"devenv"
],
"pre-commit-hooks": [
"nur-ataraxiasjel",
"devenv"
]
},
"locked": {
"lastModified": 1745930071,
"narHash": "sha256-bYyjarS3qSNqxfgc89IoVz8cAFDkF9yPE63EJr+h50s=",
"owner": "domenkozar",
"repo": "nix",
"rev": "b455edf3505f1bf0172b39a735caef94687d0d9c",
"type": "github"
},
"original": {
"owner": "domenkozar",
"ref": "devenv-2.24",
"repo": "nix",
"type": "github"
}
},
"nix-github-actions": { "nix-github-actions": {
"inputs": { "inputs": {
"nixpkgs": [ "nixpkgs": [
@ -884,21 +659,6 @@
"type": "github" "type": "github"
} }
}, },
"nixpkgs-lib_2": {
"locked": {
"lastModified": 1743296961,
"narHash": "sha256-b1EdN3cULCqtorQ4QeWgLMrd5ZGOjLSLemfa00heasc=",
"owner": "nix-community",
"repo": "nixpkgs.lib",
"rev": "e4822aea2a6d1cdd36653c134cacfd64c97ff4fa",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "nixpkgs.lib",
"type": "github"
}
},
"nixpkgs-stable": { "nixpkgs-stable": {
"locked": { "locked": {
"lastModified": 1751582995, "lastModified": 1751582995,
@ -964,70 +724,6 @@
} }
}, },
"nixpkgs_4": { "nixpkgs_4": {
"locked": {
"lastModified": 1733212471,
"narHash": "sha256-M1+uCoV5igihRfcUKrr1riygbe73/dzNnzPsmaLCmpo=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "55d15ad12a74eb7d4646254e13638ad0c4128776",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_5": {
"locked": {
"lastModified": 1717432640,
"narHash": "sha256-+f9c4/ZX5MWDOuB1rKoWj+lBNm0z0rs4CK47HBLxy1o=",
"owner": "NixOS",
"repo": "nixpkgs",
"rev": "88269ab3044128b7c2f4c7d68448b2fb50456870",
"type": "github"
},
"original": {
"owner": "NixOS",
"ref": "release-24.05",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_6": {
"locked": {
"lastModified": 1746807397,
"narHash": "sha256-zU2z0jlkJGWLhdNr/8AJSxqK8XD0IlQgHp3VZcP56Aw=",
"owner": "cachix",
"repo": "devenv-nixpkgs",
"rev": "c5208b594838ea8e6cca5997fbf784b7cca1ca90",
"type": "github"
},
"original": {
"owner": "cachix",
"ref": "rolling",
"repo": "devenv-nixpkgs",
"type": "github"
}
},
"nixpkgs_7": {
"locked": {
"lastModified": 1748190013,
"narHash": "sha256-R5HJFflOfsP5FBtk+zE8FpL8uqE7n62jqOsADvVshhE=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "62b852f6c6742134ade1abdd2a21685fd617a291",
"type": "github"
},
"original": {
"owner": "nixos",
"ref": "nixos-unstable",
"repo": "nixpkgs",
"type": "github"
}
},
"nixpkgs_8": {
"locked": { "locked": {
"lastModified": 1747958103, "lastModified": 1747958103,
"narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=", "narHash": "sha256-qmmFCrfBwSHoWw7cVK4Aj+fns+c54EBP8cGqp/yK410=",
@ -1044,6 +740,32 @@
} }
}, },
"nur": { "nur": {
"inputs": {
"flake-parts": [
"flake-parts"
],
"nixpkgs": [
"nixpkgs"
],
"treefmt-nix": [
"treefmt-nix"
]
},
"locked": {
"lastModified": 1751713912,
"narHash": "sha256-4ikKVj322GK2DCSw7K1InZGYjsTnTMI4S0/aNDrtW6U=",
"owner": "nix-community",
"repo": "NUR",
"rev": "1ad467ddb779f4cc7f9e2dc975d32689299c6b16",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"nur_2": {
"inputs": { "inputs": {
"flake-parts": [ "flake-parts": [
"stylix", "stylix",
@ -1069,44 +791,6 @@
"type": "github" "type": "github"
} }
}, },
"nur-ataraxiasjel": {
"inputs": {
"devenv": "devenv",
"devenv-root": "devenv-root",
"flake-parts": "flake-parts_3",
"nixpkgs": "nixpkgs_7"
},
"locked": {
"lastModified": 1750950662,
"narHash": "sha256-tEdGoLUTFgPC6WtLFHUAV9ZFZ7m1NUKTS5Zw1u2B/po=",
"owner": "ataraxiasjel",
"repo": "nur",
"rev": "81ea65199b63dcb2a9b588ac4387812996e3f092",
"type": "github"
},
"original": {
"owner": "ataraxiasjel",
"repo": "nur",
"type": "github"
}
},
"nur-rycee": {
"flake": false,
"locked": {
"lastModified": 1751618693,
"narHash": "sha256-bAKNekZcZd4QnBO/RUxjQAgaz67bYwFXWfQENA45Scg=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "0c5b037915083a27a260b063b127b31443827bae",
"type": "gitlab"
},
"original": {
"owner": "rycee",
"ref": "master",
"repo": "nur-expressions",
"type": "gitlab"
}
},
"root": { "root": {
"inputs": { "inputs": {
"betterfox-nix": "betterfox-nix", "betterfox-nix": "betterfox-nix",
@ -1123,8 +807,7 @@
"nixos-cosmic": "nixos-cosmic", "nixos-cosmic": "nixos-cosmic",
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_3", "nixpkgs": "nixpkgs_3",
"nur-ataraxiasjel": "nur-ataraxiasjel", "nur": "nur",
"nur-rycee": "nur-rycee",
"sops-nix": "sops-nix", "sops-nix": "sops-nix",
"stylix": "stylix", "stylix": "stylix",
"treefmt-nix": "treefmt-nix_2" "treefmt-nix": "treefmt-nix_2"
@ -1220,11 +903,11 @@
"base16-helix": "base16-helix", "base16-helix": "base16-helix",
"base16-vim": "base16-vim", "base16-vim": "base16-vim",
"firefox-gnome-theme": "firefox-gnome-theme", "firefox-gnome-theme": "firefox-gnome-theme",
"flake-compat": "flake-compat_4", "flake-compat": "flake-compat_3",
"flake-parts": [ "flake-parts": [
"flake-parts" "flake-parts"
], ],
"git-hooks": "git-hooks_2", "git-hooks": "git-hooks",
"gnome-shell": "gnome-shell", "gnome-shell": "gnome-shell",
"home-manager": [ "home-manager": [
"home-manager" "home-manager"
@ -1232,7 +915,7 @@
"nixpkgs": [ "nixpkgs": [
"nixpkgs" "nixpkgs"
], ],
"nur": "nur", "nur": "nur_2",
"systems": "systems_2", "systems": "systems_2",
"tinted-foot": "tinted-foot", "tinted-foot": "tinted-foot",
"tinted-kitty": "tinted-kitty", "tinted-kitty": "tinted-kitty",
@ -1389,7 +1072,7 @@
}, },
"treefmt-nix_2": { "treefmt-nix_2": {
"inputs": { "inputs": {
"nixpkgs": "nixpkgs_8" "nixpkgs": "nixpkgs_4"
}, },
"locked": { "locked": {
"lastModified": 1750931469, "lastModified": 1750931469,

19
flake.nix
View file

@ -118,14 +118,6 @@
repo = "flake-utils"; repo = "flake-utils";
}; };
nur-rycee = {
type = "gitlab";
owner = "rycee";
repo = "nur-expressions";
ref = "master";
flake = false;
};
sops-nix = { sops-nix = {
type = "github"; type = "github";
owner = "Mic92"; owner = "Mic92";
@ -177,10 +169,15 @@
repo = "nyx"; repo = "nyx";
}; };
nur-ataraxiasjel = { nur = {
type = "github"; type = "github";
owner = "ataraxiasjel"; owner = "nix-community";
repo = "nur"; repo = "NUR";
inputs = {
nixpkgs.follows = "nixpkgs";
treefmt-nix.follows = "treefmt-nix";
flake-parts.follows = "flake-parts";
};
}; };
}; };
} }

3
home/david/modules/programs/firefox.nix
View file

@ -1,6 +1,5 @@
{ {
pkgs, pkgs,
outputs,
system, system,
lib, lib,
config, config,
@ -59,7 +58,7 @@ in {
# }; # };
# }; # };
# }; # };
packages = with outputs.packages."${system}"; [ packages = with pkgs.nur.repos.rycee.firefox-addons; [
immersive-translate immersive-translate
tridactyl tridactyl
redirector redirector

2
nixos/modules/virtualisation/waydroid.nix
View file

@ -15,6 +15,6 @@ in {
virtualisation.waydroid = { virtualisation.waydroid = {
enable = true; enable = true;
}; };
environment.systemPackages = with pkgs; [waydroid-script]; environment.systemPackages = [pkgs.nur.repos.ataraxiasjel.waydroid-script];
}; };
} }

1
overlays/modifications/default.nix
View file

@ -11,6 +11,7 @@ in
# ./QQ.nix # ./QQ.nix
./helix.nix ./helix.nix
./cliphist.nix ./cliphist.nix
./nur.nix
] ]
|> map (file: import file args) |> map (file: import file args)
|> (overlays: (lib.composeManyExtensions overlays) final prev) |> (overlays: (lib.composeManyExtensions overlays) final prev)

1
overlays/modifications/nur.nix Normal file
View file

@ -0,0 +1 @@
{inputs, ...}: inputs.nur.overlays.default

14
pkgs/default.nix
View file

@ -8,8 +8,7 @@
}: let }: let
srcs = callPackages ./_sources/generated.nix {}; srcs = callPackages ./_sources/generated.nix {};
callPackage = lib.callPackageWith (pkgs // {inherit inputs srcs callPackage rootPath;}); callPackage = lib.callPackageWith (pkgs // {inherit inputs srcs callPackage rootPath;});
in in {
{
pinentry-selector = callPackage ./pinentry-selector.nix {}; pinentry-selector = callPackage ./pinentry-selector.nix {};
helix = callPackage ./helix {}; helix = callPackage ./helix {};
juicity = callPackage ./juicity.nix {}; juicity = callPackage ./juicity.nix {};
@ -26,13 +25,4 @@ in
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 {};
wallpapers = callPackage ./wallpapers.nix {}; wallpapers = callPackage ./wallpapers.nix {};
} }
// (
let
firefox-addons = callPackage "${inputs.nur-rycee}/pkgs/firefox-addons/default.nix" {};
in
lib.genAttrs ["immersive-translate" "tridactyl" "redirector"] (name: firefox-addons."${name}")
)
// {
inherit (inputs.nur-ataraxiasjel.outputs.packages.${pkgs.system}) waydroid-script;
}