remove nur

This commit is contained in:
jopejoe1 2024-01-02 21:36:38 +01:00
parent 4050b8d212
commit 658507c387
6 changed files with 36 additions and 24 deletions

42
flake.lock generated
View file

@ -1,5 +1,30 @@
{ {
"nodes": { "nodes": {
"firefox-addons": {
"inputs": {
"flake-utils": [
"flake-utils"
],
"nixpkgs": [
"nixpkgs"
]
},
"locked": {
"dir": "pkgs/firefox-addons",
"lastModified": 1704099878,
"narHash": "sha256-j+UPcv2d3DMkO3Jb3PBqEQ/oJwJzvY6em0azAP1VJg4=",
"owner": "rycee",
"repo": "nur-expressions",
"rev": "8275e917db7b7cd3f6a29b4b455b29e16eb2eef5",
"type": "gitlab"
},
"original": {
"dir": "pkgs/firefox-addons",
"owner": "rycee",
"repo": "nur-expressions",
"type": "gitlab"
}
},
"flake-compat": { "flake-compat": {
"flake": false, "flake": false,
"locked": { "locked": {
@ -342,21 +367,6 @@
"type": "github" "type": "github"
} }
}, },
"nur": {
"locked": {
"lastModified": 1704224443,
"narHash": "sha256-BhoQWg+1Rf6Ie6CnnPwX4rn2bBnQHWsZEKVEnNnkTp8=",
"owner": "nix-community",
"repo": "NUR",
"rev": "c4f5f8beacb9819f19dbae1d1e09c2dfd404d542",
"type": "github"
},
"original": {
"owner": "nix-community",
"repo": "NUR",
"type": "github"
}
},
"pre-commit-hooks": { "pre-commit-hooks": {
"inputs": { "inputs": {
"flake-compat": "flake-compat_2", "flake-compat": "flake-compat_2",
@ -466,6 +476,7 @@
}, },
"root": { "root": {
"inputs": { "inputs": {
"firefox-addons": "firefox-addons",
"flake-compat": "flake-compat", "flake-compat": "flake-compat",
"flake-parts": "flake-parts", "flake-parts": "flake-parts",
"flake-utils": "flake-utils", "flake-utils": "flake-utils",
@ -479,7 +490,6 @@
"nixos-hardware": "nixos-hardware", "nixos-hardware": "nixos-hardware",
"nixpkgs": "nixpkgs_2", "nixpkgs": "nixpkgs_2",
"nixpkgs-lib": "nixpkgs-lib", "nixpkgs-lib": "nixpkgs-lib",
"nur": "nur",
"pre-commit-hooks": "pre-commit-hooks_2", "pre-commit-hooks": "pre-commit-hooks_2",
"prism-game-options-patch": "prism-game-options-patch", "prism-game-options-patch": "prism-game-options-patch",
"prismlauncher": "prismlauncher", "prismlauncher": "prismlauncher",

View file

@ -4,7 +4,11 @@
inputs = rec { inputs = rec {
nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable"; nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
kde2nix.url = "github:nix-community/kde2nix"; kde2nix.url = "github:nix-community/kde2nix";
nur.url = "github:nix-community/NUR"; firefox-addons = {
url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
inputs.nixpkgs.follows = "nixpkgs";
inputs.flake-utils.follows = "flake-utils";
};
jovian = { jovian = {
url = "github:Jovian-Experiments/Jovian-NixOS"; url = "github:Jovian-Experiments/Jovian-NixOS";
inputs.nixpkgs.follows = "nixpkgs"; inputs.nixpkgs.follows = "nixpkgs";

View file

@ -144,7 +144,7 @@ in {
}; };
profiles = { profiles = {
default = { default = {
extensions = with pkgs.nur.repos.rycee.firefox-addons; [ extensions = with pkgs.firefox-addons; [
ublock-origin ublock-origin
privacy-badger privacy-badger
bitwarden bitwarden
@ -154,8 +154,7 @@ in {
ghostery ghostery
libredirect libredirect
privacy-badger privacy-badger
languagetool #languagetool
#fastforward
return-youtube-dislikes return-youtube-dislikes
sponsorblock sponsorblock
augmented-steam augmented-steam
@ -168,7 +167,7 @@ in {
skip-redirect skip-redirect
terms-of-service-didnt-read terms-of-service-didnt-read
unpaywall unpaywall
wappalyzer #wappalyzer
wayback-machine wayback-machine
modrinthify modrinthify
]; ];

View file

@ -22,6 +22,5 @@
./users ./users
self.inputs.home-manager.nixosModules.home-manager self.inputs.home-manager.nixosModules.home-manager
self.inputs.kde2nix.nixosModules.plasma6 self.inputs.kde2nix.nixosModules.plasma6
self.inputs.nur.nixosModules.nur
]; ];
} }

View file

@ -27,7 +27,6 @@ in {
registry = { registry = {
home-manager.flake = self.inputs.home-manager; home-manager.flake = self.inputs.home-manager;
nixos-hardware.flake = self.inputs.nixos-hardware; nixos-hardware.flake = self.inputs.nixos-hardware;
nur.flake = self.inputs.nur;
system.flake = self; system.flake = self;
nixpkgs.to = { nixpkgs.to = {
type = "path"; type = "path";

View file

@ -11,10 +11,11 @@ in {
overlays = [ overlays = [
self.inputs.prismlauncher.overlays.default self.inputs.prismlauncher.overlays.default
self.inputs.nur.overlay
(_self: super: rec { (_self: super: rec {
firefox-addons = self.inputs.firefox-addons.packages."${config.nixpkgs.hostPlatform.system}";
tela-icon-theme = super.tela-icon-theme.overrideAttrs tela-icon-theme = super.tela-icon-theme.overrideAttrs
(_old: { src = self.inputs.tela-icon-theme; }); (_old: { src = self.inputs.tela-icon-theme; });