refactor(modules/legacy/firefox): Move to by-name

This also improves the arkanfox-integration and the profile id
generation.

5 files changed, 42 insertions, 34 deletions

diff --git a/flake.lock b/flake.lock
index 3a177791..ac446ada 100644
--- a/flake.lock
+++ b/flake.lock
@@ -29,6 +29,32 @@
         "type": "github"
       }
     },
+    "arkenfox-nixos": {
+      "inputs": {
+        "flake-compat": [
+          "flake-compat"
+        ],
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "pre-commit": [
+          "pre-commit-hooks"
+        ]
+      },
+      "locked": {
+        "lastModified": 1739094253,
+        "narHash": "sha256-yDTgmfSuL5Ax7LRuxhdoMJrBi4X9Q3fyyI7TerTXVBA=",
+        "owner": "dwarfmaster",
+        "repo": "arkenfox-nixos",
+        "rev": "27e0c3094e778bd73f93bea799f627ef317e7f22",
+        "type": "github"
+      },
+      "original": {
+        "owner": "dwarfmaster",
+        "repo": "arkenfox-nixos",
+        "type": "github"
+      }
+    },
     "beautysh": {
       "inputs": {
         "nixpkgs": [
@@ -690,6 +716,7 @@
     "root": {
       "inputs": {
         "agenix": "agenix",
+        "arkenfox-nixos": "arkenfox-nixos",
         "beautysh": "beautysh",
         "crane": "crane",
         "devshell": "devshell",
@@ -723,8 +750,7 @@
         "shell_library": "shell_library",
         "systems": "systems",
         "templates": "templates",
-        "treefmt-nix": "treefmt-nix",
-        "user_js": "user_js"
+        "treefmt-nix": "treefmt-nix"
       }
     },
     "rust-overlay": {
@@ -874,22 +900,6 @@
         "repo": "treefmt-nix",
         "type": "github"
       }
-    },
-    "user_js": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1741229528,
-        "narHash": "sha256-21DoV4SMueMFRHMsvfsPfQIOtsvRWNY06rE4gB7xFnc=",
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "rev": "3d76c74c80485931425464fec0e59d6cb461677a",
-        "type": "github"
-      },
-      "original": {
-        "owner": "arkenfox",
-        "repo": "user.js",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index f8d6020d..8d8ce03a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -203,6 +203,14 @@
         nixpkgs.follows = "nixpkgs";
       };
     };
+    arkenfox-nixos = {
+      url = "github:dwarfmaster/arkenfox-nixos";
+      inputs = {
+        nixpkgs.follows = "nixpkgs";
+        pre-commit.follows = "pre-commit-hooks";
+        flake-compat.follows = "flake-compat";
+      };
+    };
 
     # my configs
     templates = {
@@ -236,10 +244,6 @@
     };
 
     # external resources
-    user_js = {
-      url = "github:arkenfox/user.js";
-      flake = false;
-    };
     treefmt-nix = {
       url = "github:numtide/treefmt-nix";
       inputs = {
@@ -266,8 +270,8 @@
     lanzaboote,
     nixVim,
     nix-index-database,
+    arkenfox-nixos,
     # external dependencies
-    user_js,
     treefmt-nix,
     templates,
     # my binaries
@@ -319,9 +323,9 @@
         disko
         lanzaboote
         nix-index-database
+        arkenfox-nixos
         # external dependencies
         treefmt-nix
-        user_js
         templates
         # my binaries
         shell_library
diff --git a/flake/default.nix b/flake/default.nix
index 05433865..54db815f 100644
--- a/flake/default.nix
+++ b/flake/default.nix
@@ -21,8 +21,8 @@
   disko,
   lanzaboote,
   nix-index-database,
+  arkenfox-nixos,
   # external dependencies
-  user_js,
   treefmt-nix,
   templates,
   # my binaries
@@ -56,10 +56,9 @@
       disko
       lanzaboote
       nix-index-database
+      arkenfox-nixos
       # bins
       qmk_firmware
-      # external
-      user_js
       ;
   };
 
diff --git a/flake/nixosConfigurations/default.nix b/flake/nixosConfigurations/default.nix
index f2374e05..0a65018b 100644
--- a/flake/nixosConfigurations/default.nix
+++ b/flake/nixosConfigurations/default.nix
@@ -22,10 +22,9 @@
   disko,
   lanzaboote,
   nix-index-database,
+  arkenfox-nixos,
   # bins
   qmk_firmware,
-  # external
-  user_js,
 }: let
   modules = [
     agenix.nixosModules.default
@@ -55,6 +54,7 @@
       impermanence
       nix-index-database
       nixVim
+      arkenfox-nixos
       # nix registry
       nixpkgs_as_input
       self
@@ -63,8 +63,6 @@
       # TODO: Integrate these into `pkgs/by-name` <2024-05-22>
       qmk_firmware
       serverphone
-      # external deps
-      user_js
       ;
   };
 
diff --git a/flake/packages/default.nix b/flake/packages/default.nix
index 82924a25..04051853 100644
--- a/flake/packages/default.nix
+++ b/flake/packages/default.nix
@@ -67,8 +67,6 @@
             value)
         myPkgs
       )));
-
-  firefox = (import ../../modules/home.legacy/conf/firefox/scripts) {inherit pkgs sysLib;};
 in
   {
     # install-iso = nixos-generators.nixosGenerate {
@@ -97,5 +95,4 @@ in
   }
   // output
   // output_neovim
-  // firefox
   // myPkgsFlat