From 979e7929044a209e5579b868d9fe77bc3a1bac98 Mon Sep 17 00:00:00 2001
From: randomuser <randomuser@tilde.club>
Date: Thu, 21 Dec 2023 17:22:54 -0600
Subject: [PATCH] changes

---
 flake.lock               | 71 ++++++++++++++++++++++++++++++----------
 flake.nix                | 10 +++---
 home/firefox/default.nix |  4 +--
 home/terminal.nix        |  2 +-
 4 files changed, 62 insertions(+), 25 deletions(-)

diff --git a/flake.lock b/flake.lock
index f2411cc..73f648f 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,41 @@
 {
   "nodes": {
+    "firefox-addons": {
+      "inputs": {
+        "flake-utils": "flake-utils",
+        "nixpkgs": "nixpkgs"
+      },
+      "locked": {
+        "dir": "pkgs/firefox-addons",
+        "lastModified": 1703186936,
+        "narHash": "sha256-+kBiJ++R59cLnCX0XTaYJ94KO6xdgLX724+o7PUP4dI=",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "rev": "c7e25b8a8abc8175d1caa33f7eda32bdb48aec66",
+        "type": "gitlab"
+      },
+      "original": {
+        "dir": "pkgs/firefox-addons",
+        "owner": "rycee",
+        "repo": "nur-expressions",
+        "type": "gitlab"
+      }
+    },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1629284811,
+        "narHash": "sha256-JHgasjPR0/J1J3DRm4KxM4zTyAj4IOJY8vIl75v/kPI=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "c5d161cc0af116a2e17f54316f0bf43f0819785c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -22,6 +58,22 @@
       }
     },
     "nixpkgs": {
+      "locked": {
+        "lastModified": 1627814220,
+        "narHash": "sha256-P+MDgdZw2CBk9X1ZZaUgHgN+32pTfLFf3XVIBOXirI4=",
+        "owner": "nixos",
+        "repo": "nixpkgs",
+        "rev": "ab5b6828af26215bf2646c31961da5d3749591ef",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nixos",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_2": {
       "locked": {
         "lastModified": 1702921762,
         "narHash": "sha256-O/rP7gulApQAB47u6szEd8Pn8Biw0d84j5iuP2tcxzY=",
@@ -37,26 +89,11 @@
         "type": "github"
       }
     },
-    "nur": {
-      "locked": {
-        "lastModified": 1703187919,
-        "narHash": "sha256-r28tTx9xuc2h3tCA1zmotrLnJDffaFHMMSy5hDpkegU=",
-        "owner": "nix-community",
-        "repo": "NUR",
-        "rev": "aa77c3b4f6b8dba86c5e75269b1f6a123168d4df",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-community",
-        "repo": "NUR",
-        "type": "github"
-      }
-    },
     "root": {
       "inputs": {
+        "firefox-addons": "firefox-addons",
         "home-manager": "home-manager",
-        "nixpkgs": "nixpkgs",
-        "nur": "nur"
+        "nixpkgs": "nixpkgs_2"
       }
     }
   },
diff --git a/flake.nix b/flake.nix
index 50e6b3c..fe57a86 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,16 +7,17 @@
       url = "github:nix-community/home-manager/release-23.11";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    nur = {
-      url = "github:nix-community/NUR";
+    firefox-addons = {
+      url = "gitlab:rycee/nur-expressions?dir=pkgs/firefox-addons";
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, nur, ... }@inputs: {
+  outputs = { self, nixpkgs, home-manager, firefox-addons, ... }@inputs: {
     nixosConfigurations = {
       virtbox = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
-        specialArgs = inputs;
+        specialArgs = { inherit inputs; };
+        extraSpecialArgs = { inherit inputs; };
         modules = [
           ./bootstrap.nix
           ./boxes/virtbox.nix
@@ -28,7 +29,6 @@
 
             home-manager.users.usr = import ./home/terminal.nix;
           }
-          nur.nixosModules.nur
         ];
       };
     };
diff --git a/home/firefox/default.nix b/home/firefox/default.nix
index a6548be..fb7e1c8 100644
--- a/home/firefox/default.nix
+++ b/home/firefox/default.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, home, ... }:
+{ lib, inputs, config, pkgs, home, ... }:
 
 {
   programs.firefox = {
@@ -6,7 +6,7 @@
 
     profiles = {
       "main" = {
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+        extensions = with inputs.firefox-addons; [
           bitwarden
         ];
       };
diff --git a/home/terminal.nix b/home/terminal.nix
index b39ac32..dd74e0a 100644
--- a/home/terminal.nix
+++ b/home/terminal.nix
@@ -1,4 +1,4 @@
-{ lib, config, pkgs, home, ... }:
+{ lib, inputs, config, pkgs, home, ... }:
 
 {
   imports = [