From 658507c3875a522a88fb089bd701d1c09dd78ff5 Mon Sep 17 00:00:00 2001
From: jopejoe1 <johannes@joens.email>
Date: Tue, 2 Jan 2024 21:36:38 +0100
Subject: [PATCH] remove nur

---
 flake.lock                       | 42 ++++++++++++++++++++------------
 flake.nix                        |  6 ++++-
 home-modules/firefox/default.nix |  7 +++---
 modules/default.nix              |  1 -
 modules/nix/default.nix          |  1 -
 modules/overlays/default.nix     |  3 ++-
 6 files changed, 36 insertions(+), 24 deletions(-)

diff --git a/flake.lock b/flake.lock
index da34a71..f220db5 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,30 @@
 {
   "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": false,
       "locked": {
@@ -342,21 +367,6 @@
         "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": {
       "inputs": {
         "flake-compat": "flake-compat_2",
@@ -466,6 +476,7 @@
     },
     "root": {
       "inputs": {
+        "firefox-addons": "firefox-addons",
         "flake-compat": "flake-compat",
         "flake-parts": "flake-parts",
         "flake-utils": "flake-utils",
@@ -479,7 +490,6 @@
         "nixos-hardware": "nixos-hardware",
         "nixpkgs": "nixpkgs_2",
         "nixpkgs-lib": "nixpkgs-lib",
-        "nur": "nur",
         "pre-commit-hooks": "pre-commit-hooks_2",
         "prism-game-options-patch": "prism-game-options-patch",
         "prismlauncher": "prismlauncher",
diff --git a/flake.nix b/flake.nix
index 99eb378..2dccc47 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,7 +4,11 @@
   inputs = rec {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     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 = {
       url = "github:Jovian-Experiments/Jovian-NixOS";
       inputs.nixpkgs.follows = "nixpkgs";
diff --git a/home-modules/firefox/default.nix b/home-modules/firefox/default.nix
index 2a84e30..ab0b0f1 100644
--- a/home-modules/firefox/default.nix
+++ b/home-modules/firefox/default.nix
@@ -144,7 +144,7 @@ in {
         };
         profiles = {
           default = {
-            extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+            extensions = with pkgs.firefox-addons; [
               ublock-origin
               privacy-badger
               bitwarden
@@ -154,8 +154,7 @@ in {
               ghostery
               libredirect
               privacy-badger
-              languagetool
-              #fastforward
+              #languagetool
               return-youtube-dislikes
               sponsorblock
               augmented-steam
@@ -168,7 +167,7 @@ in {
               skip-redirect
               terms-of-service-didnt-read
               unpaywall
-              wappalyzer
+              #wappalyzer
               wayback-machine
               modrinthify
             ];
diff --git a/modules/default.nix b/modules/default.nix
index b399889..3c0cfa6 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -22,6 +22,5 @@
     ./users
     self.inputs.home-manager.nixosModules.home-manager
     self.inputs.kde2nix.nixosModules.plasma6
-    self.inputs.nur.nixosModules.nur
   ];
 }
diff --git a/modules/nix/default.nix b/modules/nix/default.nix
index b0998b4..01fdbcc 100644
--- a/modules/nix/default.nix
+++ b/modules/nix/default.nix
@@ -27,7 +27,6 @@ in {
       registry = {
         home-manager.flake = self.inputs.home-manager;
         nixos-hardware.flake = self.inputs.nixos-hardware;
-        nur.flake = self.inputs.nur;
         system.flake = self;
         nixpkgs.to = {
           type = "path";
diff --git a/modules/overlays/default.nix b/modules/overlays/default.nix
index 4b8912b..06306b2 100644
--- a/modules/overlays/default.nix
+++ b/modules/overlays/default.nix
@@ -11,10 +11,11 @@ in {
 
       overlays = [
         self.inputs.prismlauncher.overlays.default
-        self.inputs.nur.overlay
 
         (_self: super: rec {
 
+          firefox-addons = self.inputs.firefox-addons.packages."${config.nixpkgs.hostPlatform.system}";
+
           tela-icon-theme = super.tela-icon-theme.overrideAttrs
             (_old: { src = self.inputs.tela-icon-theme; });