Fix(home-manager): Improve Firefox configuration

2 files changed, 132 insertions, 57 deletions

diff --git a/flake.lock b/flake.lock
index e68df48b..aa5caffa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -1,5 +1,29 @@
 {
   "nodes": {
+    "crane": {
+      "inputs": {
+        "flake-compat": "flake-compat",
+        "flake-utils": "flake-utils",
+        "nixpkgs": [
+          "strip_js_comments",
+          "nixpkgs"
+        ],
+        "rust-overlay": "rust-overlay"
+      },
+      "locked": {
+        "lastModified": 1675902425,
+        "narHash": "sha256-ASv/7bZIoP/2FON+RNFYYUlmpleZAjKKb4XF1Pmhu4g=",
+        "owner": "ipetkov",
+        "repo": "crane",
+        "rev": "8c34e5ecadc691dd64b31b9317eb35d7cdaa636b",
+        "type": "github"
+      },
+      "original": {
+        "owner": "ipetkov",
+        "repo": "crane",
+        "type": "github"
+      }
+    },
     "flake-compat": {
       "flake": false,
       "locked": {
@@ -16,6 +40,36 @@
         "type": "github"
       }
     },
+    "flake-utils": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
+    "flake-utils_2": {
+      "locked": {
+        "lastModified": 1667395993,
+        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "flake-utils",
+        "type": "github"
+      }
+    },
     "home-manager": {
       "inputs": {
         "nixpkgs": [
@@ -24,11 +78,11 @@
         "utils": "utils"
       },
       "locked": {
-        "lastModified": 1675462931,
-        "narHash": "sha256-JiOUSERBtA1lN/s9YTKGZoZ3XUicHDwr+C8swaPSh3M=",
+        "lastModified": 1675935446,
+        "narHash": "sha256-WajulTn7QdwC7QuXRBavrANuIXE5z+08EdxdRw1qsNs=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "e2c1756e3ae001ca8696912016dd31cb1503ccf3",
+        "rev": "2dce7f1a55e785a22d61668516df62899278c9e4",
         "type": "github"
       },
       "original": {
@@ -38,32 +92,29 @@
         "type": "github"
       }
     },
-    "naersk": {
-      "inputs": {
-        "nixpkgs": "nixpkgs_2"
-      },
+    "neovim_config": {
+      "flake": false,
       "locked": {
-        "lastModified": 1671096816,
-        "narHash": "sha256-ezQCsNgmpUHdZANDCILm3RvtO1xH8uujk/+EqNvzIOg=",
-        "owner": "nmattia",
-        "repo": "naersk",
-        "rev": "d998160d6a076cfe8f9741e56aeec7e267e3e114",
-        "type": "github"
+        "lastModified": 1676218383,
+        "narHash": "sha256-D0n+l4YdhbgTYXFMJzpx+ictrSaJazkXllnyucudRRg=",
+        "ref": "refs/heads/prime",
+        "rev": "2a0ea36911faa82d4a546fd64fa62b994d7fb7ca",
+        "revCount": 1,
+        "type": "git",
+        "url": "https://codeberg.org/ene/neovim-config.git"
       },
       "original": {
-        "owner": "nmattia",
-        "ref": "master",
-        "repo": "naersk",
-        "type": "github"
+        "type": "git",
+        "url": "https://codeberg.org/ene/neovim-config.git"
       }
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1675362331,
-        "narHash": "sha256-VmcnKPj5gJLxWK7Bxlhg2LoQvhKRss7Ax+uoFjd3qKY=",
+        "lastModified": 1676110339,
+        "narHash": "sha256-kOS/L8OOL2odpCOM11IevfHxcUeE0vnZUQ74EOiwXcs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "a100acd7bbf105915b0004427802286c37738fef",
+        "rev": "e5530aba13caff5a4f41713f1265b754dc2abfd8",
         "type": "github"
       },
       "original": {
@@ -73,43 +124,57 @@
         "type": "github"
       }
     },
-    "nixpkgs_2": {
-      "locked": {
-        "lastModified": 1675879502,
-        "narHash": "sha256-pbgIW5VrIk00rKrhBvuMEcKP8XUuB39GYf9lHmrrOGc=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "54ee2f301fa534cf0b0a20e0ce44152755e2f8a5",
-        "type": "github"
-      },
-      "original": {
-        "id": "nixpkgs",
-        "type": "indirect"
-      }
-    },
     "root": {
       "inputs": {
         "home-manager": "home-manager",
+        "neovim_config": "neovim_config",
         "nixpkgs": "nixpkgs",
         "strip_js_comments": "strip_js_comments",
         "user_js": "user_js"
       }
     },
+    "rust-overlay": {
+      "inputs": {
+        "flake-utils": [
+          "strip_js_comments",
+          "crane",
+          "flake-utils"
+        ],
+        "nixpkgs": [
+          "strip_js_comments",
+          "crane",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1675391458,
+        "narHash": "sha256-ukDKZw922BnK5ohL9LhwtaDAdCsJL7L6ScNEyF1lO9w=",
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "rev": "383a4acfd11d778d5c2efcf28376cbd845eeaedf",
+        "type": "github"
+      },
+      "original": {
+        "owner": "oxalica",
+        "repo": "rust-overlay",
+        "type": "github"
+      }
+    },
     "strip_js_comments": {
       "inputs": {
-        "flake-compat": "flake-compat",
-        "naersk": "naersk",
+        "crane": "crane",
+        "flake-utils": "flake-utils_2",
         "nixpkgs": [
           "nixpkgs"
         ],
-        "utils": "utils_2"
+        "tree_sitter_js": "tree_sitter_js"
       },
       "locked": {
-        "lastModified": 1676105952,
-        "narHash": "sha256-yCeS5nxOH1TZNbUOo2sd06Emy0Ori2ZJO5XdnxtDfGY=",
+        "lastModified": 1676149199,
+        "narHash": "sha256-Yitp7KDJfL1xPUeJwoBLNbUJlt03yvC3SsyA8FE1PMA=",
         "ref": "refs/heads/prime",
-        "rev": "6e0b1effc6ad82629e09de3938e905a47056ef47",
-        "revCount": 3,
+        "rev": "1be9cbf4b1a58dbc5164dfb4ddaa862488f7b42d",
+        "revCount": 9,
         "type": "git",
         "url": "https://codeberg.org/ene/strip_js_comments.git"
       },
@@ -118,6 +183,22 @@
         "url": "https://codeberg.org/ene/strip_js_comments.git"
       }
     },
+    "tree_sitter_js": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1674585307,
+        "narHash": "sha256-2SAJBnY8pmynGqB8OVqHeeAKovskO+C/XiJbLTKSlcM=",
+        "owner": "tree-sitter",
+        "repo": "tree-sitter-javascript",
+        "rev": "15e85e80b851983fab6b12dce5a535f5a0df0f9c",
+        "type": "github"
+      },
+      "original": {
+        "owner": "tree-sitter",
+        "repo": "tree-sitter-javascript",
+        "type": "github"
+      }
+    },
     "user_js": {
       "flake": false,
       "locked": {
@@ -148,21 +229,6 @@
         "repo": "flake-utils",
         "type": "github"
       }
-    },
-    "utils_2": {
-      "locked": {
-        "lastModified": 1667395993,
-        "narHash": "sha256-nuEHfE/LcWyuSWnS8t12N1wc105Qtau+/OdUAjtQ0rA=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "5aed5285a952e0b949eb3ba02c12fa4fcfef535f",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
     }
   },
   "root": "root",
diff --git a/flake.nix b/flake.nix
index 0ff5d4b4..dd44e2f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -3,10 +3,16 @@
   description = "Nixos system config";
 
   inputs = {
+    neovim_config = {
+      url = "git+https://codeberg.org/ene/neovim-config.git";
+      flake = false;
+    };
+
     strip_js_comments = {
       url = "git+https://codeberg.org/ene/strip_js_comments.git";
       inputs.nixpkgs.follows = "nixpkgs";
     };
+
     nixpkgs.url = "github:NixOS/nixpkgs/nixos-unstable";
     home-manager = {
       url = "github:nix-community/home-manager/master";
@@ -23,11 +29,12 @@
     self,
     nixpkgs,
     home-manager,
+    neovim_config,
     strip_js_comments,
     user_js,
     ...
   } @ inputs: {
-    nixosConfigurations.Tiamat = nixpkgs.lib.nixosSystem {
+    nixosConfigurations.Tiamat = nixpkgs.lib.nixosSystem rec {
       system = "x86_64-linux";
       specialArgs = inputs;
       modules = [
@@ -41,6 +48,8 @@
             extraSpecialArgs = {
               inherit strip_js_comments;
               inherit user_js;
+              inherit system;
+              inherit neovim_config;
             };
           };