remove import-from-derivation
Some checks failed
Hydra nixosConfigurations.pc-installer Hydra build #25914 of nixos-config:pr618:nixosConfigurations.pc-installer
Hydra nixosConfigurations.thinkrac Hydra build #25916 of nixos-config:pr618:nixosConfigurations.thinkrac
Hydra nixosConfigurations.rainbow-resort Hydra build #25915 of nixos-config:pr618:nixosConfigurations.rainbow-resort
Hydra packages.aarch64-linux.kodi-joyn Hydra build #25894 of nixos-config:pr618:packages.aarch64-linux.kodi-joyn
Hydra packages.aarch64-linux.art-lotte-bgs-sfw Hydra build #25893 of nixos-config:pr618:packages.aarch64-linux.art-lotte-bgs-sfw
Hydra packages.x86_64-linux.art-lotte-bgs-sfw Hydra build #25899 of nixos-config:pr618:packages.x86_64-linux.art-lotte-bgs-sfw
Hydra packages.x86_64-linux.kodi-joyn Hydra build #25900 of nixos-config:pr618:packages.x86_64-linux.kodi-joyn
Hydra devShells.x86_64-linux.default Hydra build #25879 of nixos-config:pr618:devShells.x86_64-linux.default
Hydra packages.x86_64-linux.art-lotte Hydra build #25897 of nixos-config:pr618:packages.x86_64-linux.art-lotte
Hydra packages.x86_64-linux.package-updater Hydra build #25901 of nixos-config:pr618:packages.x86_64-linux.package-updater
Hydra packages.x86_64-linux.art-lotte-bgs-nsfw Hydra build #25898 of nixos-config:pr618:packages.x86_64-linux.art-lotte-bgs-nsfw
Hydra packages.aarch64-linux.art-lotte Hydra build #25891 of nixos-config:pr618:packages.aarch64-linux.art-lotte
Hydra packages.aarch64-linux.art-lotte-bgs-nsfw Hydra build #25892 of nixos-config:pr618:packages.aarch64-linux.art-lotte-bgs-nsfw
Hydra nixosConfigurations.not522 Hydra build #25912 of nixos-config:pr618:nixosConfigurations.not522
Hydra nixosConfigurations.not522-installer Hydra build #25913 of nixos-config:pr618:nixosConfigurations.not522-installer
Hydra packages.riscv64-linux.art-lotte Hydra build #25752 of nixos-config:pr618:packages.riscv64-linux.art-lotte
Hydra packages.aarch64-linux.package-updater Hydra build #25895 of nixos-config:pr618:packages.aarch64-linux.package-updater
Hydra packages.riscv64-linux.art-lotte-bgs-sfw Hydra build #25754 of nixos-config:pr618:packages.riscv64-linux.art-lotte-bgs-sfw
Hydra packages.riscv64-linux.art-lotte-bgs-nsfw Hydra build #25753 of nixos-config:pr618:packages.riscv64-linux.art-lotte-bgs-nsfw
Hydra packages.riscv64-linux.package-updater Hydra build #25896 of nixos-config:pr618:packages.riscv64-linux.package-updater
Some checks failed
Hydra nixosConfigurations.pc-installer Hydra build #25914 of nixos-config:pr618:nixosConfigurations.pc-installer
Hydra nixosConfigurations.thinkrac Hydra build #25916 of nixos-config:pr618:nixosConfigurations.thinkrac
Hydra nixosConfigurations.rainbow-resort Hydra build #25915 of nixos-config:pr618:nixosConfigurations.rainbow-resort
Hydra packages.aarch64-linux.kodi-joyn Hydra build #25894 of nixos-config:pr618:packages.aarch64-linux.kodi-joyn
Hydra packages.aarch64-linux.art-lotte-bgs-sfw Hydra build #25893 of nixos-config:pr618:packages.aarch64-linux.art-lotte-bgs-sfw
Hydra packages.x86_64-linux.art-lotte-bgs-sfw Hydra build #25899 of nixos-config:pr618:packages.x86_64-linux.art-lotte-bgs-sfw
Hydra packages.x86_64-linux.kodi-joyn Hydra build #25900 of nixos-config:pr618:packages.x86_64-linux.kodi-joyn
Hydra devShells.x86_64-linux.default Hydra build #25879 of nixos-config:pr618:devShells.x86_64-linux.default
Hydra packages.x86_64-linux.art-lotte Hydra build #25897 of nixos-config:pr618:packages.x86_64-linux.art-lotte
Hydra packages.x86_64-linux.package-updater Hydra build #25901 of nixos-config:pr618:packages.x86_64-linux.package-updater
Hydra packages.x86_64-linux.art-lotte-bgs-nsfw Hydra build #25898 of nixos-config:pr618:packages.x86_64-linux.art-lotte-bgs-nsfw
Hydra packages.aarch64-linux.art-lotte Hydra build #25891 of nixos-config:pr618:packages.aarch64-linux.art-lotte
Hydra packages.aarch64-linux.art-lotte-bgs-nsfw Hydra build #25892 of nixos-config:pr618:packages.aarch64-linux.art-lotte-bgs-nsfw
Hydra nixosConfigurations.not522 Hydra build #25912 of nixos-config:pr618:nixosConfigurations.not522
Hydra nixosConfigurations.not522-installer Hydra build #25913 of nixos-config:pr618:nixosConfigurations.not522-installer
Hydra packages.riscv64-linux.art-lotte Hydra build #25752 of nixos-config:pr618:packages.riscv64-linux.art-lotte
Hydra packages.aarch64-linux.package-updater Hydra build #25895 of nixos-config:pr618:packages.aarch64-linux.package-updater
Hydra packages.riscv64-linux.art-lotte-bgs-sfw Hydra build #25754 of nixos-config:pr618:packages.riscv64-linux.art-lotte-bgs-sfw
Hydra packages.riscv64-linux.art-lotte-bgs-nsfw Hydra build #25753 of nixos-config:pr618:packages.riscv64-linux.art-lotte-bgs-nsfw
Hydra packages.riscv64-linux.package-updater Hydra build #25896 of nixos-config:pr618:packages.riscv64-linux.package-updater
This commit is contained in:
parent
21cbdc4651
commit
a3a8951f00
4 changed files with 32 additions and 31 deletions
33
flake.lock
33
flake.lock
|
@ -301,21 +301,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nur": {
|
||||
"locked": {
|
||||
"lastModified": 1731730181,
|
||||
"narHash": "sha256-uCyImsva4NYsRywcT+U6cr+MZrXx/e4Gu8SqTujrCBY=",
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"rev": "295cc9ee333bda9e7d58daae4d1c25fcdef3e5a6",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "NUR",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"plasma-manager": {
|
||||
"inputs": {
|
||||
"home-manager": "home-manager_2",
|
||||
|
@ -401,11 +386,11 @@
|
|||
"nix2container": "nix2container",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixpkgs": "nixpkgs",
|
||||
"nur": "nur",
|
||||
"plasma-manager": "plasma-manager",
|
||||
"pre-commit-hooks": "pre-commit-hooks",
|
||||
"riscv-overlay": "riscv-overlay",
|
||||
"rust-overlay": "rust-overlay",
|
||||
"rycee-nur-expressions": "rycee-nur-expressions",
|
||||
"sops-nix": "sops-nix",
|
||||
"systems": "systems",
|
||||
"vscode-server": "vscode-server"
|
||||
|
@ -431,6 +416,22 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"rycee-nur-expressions": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
"lastModified": 1731729795,
|
||||
"narHash": "sha256-trv2jL/Xo/vddO0C6FvBdxMKEq+jn0Vw/0kIhPe9FHc=",
|
||||
"ref": "refs/heads/master",
|
||||
"rev": "c1ca3a49435407dddef89c07961c5ce40f66ff99",
|
||||
"revCount": 3908,
|
||||
"type": "git",
|
||||
"url": "https://gitlab.com/rycee/nur-expressions"
|
||||
},
|
||||
"original": {
|
||||
"type": "git",
|
||||
"url": "https://gitlab.com/rycee/nur-expressions"
|
||||
}
|
||||
},
|
||||
"sops-nix": {
|
||||
"inputs": {
|
||||
"nixpkgs": [
|
||||
|
|
|
@ -55,7 +55,6 @@
|
|||
};
|
||||
nixos-hardware.url = "github:NixOS/nixos-hardware";
|
||||
nixpkgs.url = "github:nixos/nixpkgs";
|
||||
nur.url = "github:nix-community/NUR";
|
||||
plasma-manager = {
|
||||
url = "github:nix-community/plasma-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -75,6 +74,10 @@
|
|||
url = "github:oxalica/rust-overlay";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
rycee-nur-expressions = {
|
||||
url = "git+https://gitlab.com/rycee/nur-expressions";
|
||||
flake = false;
|
||||
};
|
||||
sops-nix = {
|
||||
url = "github:Mic92/sops-nix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
@ -187,7 +190,7 @@
|
|||
in
|
||||
systems;
|
||||
hydraJobs = {
|
||||
inherit (self) checks devShells packages;
|
||||
inherit (self) devShells packages;
|
||||
nixosConfigurations = nixpkgs.lib.mapAttrs (
|
||||
_: v: v.config.system.build.toplevel
|
||||
) self.nixosConfigurations;
|
||||
|
|
|
@ -1,7 +1,7 @@
|
|||
self: super: {
|
||||
art-lotte = self.callPackage ./art/lotte { };
|
||||
art-lotte-bgs-nsfw = self.callPackage ./art/lotte/bgs-nsfw.nix { };
|
||||
art-lotte-bgs-sfw = self.callPackage ./art/lotte/bgs-sfw.nix { };
|
||||
kodi-joyn = self.kodiPackages.callPackage ./kodi/joyn { };
|
||||
package-updater = self.callPackage ./updater.nix { };
|
||||
final: prev: {
|
||||
art-lotte = final.callPackage ./art/lotte { };
|
||||
art-lotte-bgs-nsfw = final.callPackage ./art/lotte/bgs-nsfw.nix { };
|
||||
art-lotte-bgs-sfw = final.callPackage ./art/lotte/bgs-sfw.nix { };
|
||||
kodi-joyn = final.kodiPackages.callPackage ./kodi/joyn { };
|
||||
package-updater = final.callPackage ./updater.nix { };
|
||||
}
|
||||
|
|
|
@ -1,10 +1,11 @@
|
|||
{
|
||||
pkgs,
|
||||
lib,
|
||||
nur,
|
||||
rycee-nur-expressions,
|
||||
...
|
||||
}:
|
||||
let
|
||||
rycee = import rycee-nur-expressions { inherit pkgs; };
|
||||
extensions = {
|
||||
"ublock-origin" = [
|
||||
"alarms"
|
||||
|
@ -98,10 +99,6 @@ let
|
|||
"scripting"
|
||||
];
|
||||
};
|
||||
nur' = import nur {
|
||||
nurpkgs = pkgs;
|
||||
inherit pkgs;
|
||||
};
|
||||
in
|
||||
{
|
||||
programs.firefox = {
|
||||
|
@ -112,7 +109,7 @@ in
|
|||
];
|
||||
profiles.default = {
|
||||
containersForce = true;
|
||||
extensions = map (v: nur'.repos.rycee.firefox-addons.${v}) (lib.attrNames extensions);
|
||||
extensions = map (v: rycee.firefox-addons.${v}) (lib.attrNames extensions);
|
||||
settings = {
|
||||
"extensions.autoDisableScopes" = 0;
|
||||
"toolkit.legacyUserProfileCustomizations.stylesheets" = true;
|
||||
|
@ -147,7 +144,7 @@ in
|
|||
assertions = lib.mapAttrsToList (
|
||||
k: v:
|
||||
let
|
||||
unaccepted = lib.subtractLists v nur'.repos.rycee.firefox-addons.${k}.meta.mozPermissions;
|
||||
unaccepted = lib.subtractLists v rycee.firefox-addons.${k}.meta.mozPermissions;
|
||||
in
|
||||
{
|
||||
assertion = unaccepted == [ ];
|
||||
|
|
Loading…
Reference in a new issue