From 451f5821e6297028421bf9d237cb6eeec286aecf Mon Sep 17 00:00:00 2001
From: uttarayan21 <email@uttarayan.me>
Date: Thu, 4 Apr 2024 21:59:37 +0530
Subject: [PATCH] feat(firefox): Move csshacks to subflake

---
 common/firefox.nix | 16 ++++------------
 flake.lock         | 38 +++++++++++++++++++-------------------
 flakes/flake.nix   | 14 +++-----------
 3 files changed, 26 insertions(+), 42 deletions(-)

diff --git a/common/firefox.nix b/common/firefox.nix
index 3ae9d8e0..cb428af7 100644
--- a/common/firefox.nix
+++ b/common/firefox.nix
@@ -6,22 +6,14 @@
   programs.firefox = {
     enable = device.hasGui;
     profiles.default = {
-      userChrome = let
-      # TODO: Move to subflake
-        csshacks = pkgs.fetchFromGitHub {
-          owner = "MrOtherGuy";
-          repo = "firefox-csshacks";
-          rev = "master";
-          sha256 = "sha256-XJ+MTEADzOsCIh0I8EAxbtIpDHfMJsN68sKBy7/1l60=";
-        };
-      in
+      userChrome =
         /*
         css
         */
         ''
-          /* @import url(${csshacks}/chrome/toolbars_below_content.css); */
-          /* @import url(${csshacks}/chrome/scrollable_menupopups.css); */
-          /* @import url(${csshacks}/chrome/linux_gtk_window_control_patch.css); */
+          /* @import url(${pkgs.csshacks}/chrome/toolbars_below_content.css); */
+          /* @import url(${pkgs.csshacks}/chrome/scrollable_menupopups.css); */
+          /* @import url(${pkgs.csshacks}/chrome/linux_gtk_window_control_patch.css); */
         '';
       extensions = with pkgs.nur.repos.rycee.firefox-addons; [
         privacy-badger
diff --git a/flake.lock b/flake.lock
index 011a1dd3..0aab263c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -197,6 +197,22 @@
         "type": "github"
       }
     },
+    "csshacks": {
+      "flake": false,
+      "locked": {
+        "lastModified": 1712075115,
+        "narHash": "sha256-asxjHWOHWK9Hrf7qF4D+KfFlxQOpPK8oYgdbR1b4gxc=",
+        "owner": "MrOtherGuy",
+        "repo": "firefox-csshacks",
+        "rev": "daf2d17b3607085d51e30a0da01bf9b713672827",
+        "type": "github"
+      },
+      "original": {
+        "owner": "MrOtherGuy",
+        "repo": "firefox-csshacks",
+        "type": "github"
+      }
+    },
     "devshell": {
       "inputs": {
         "flake-utils": "flake-utils_8",
@@ -1587,22 +1603,6 @@
         "type": "github"
       }
     },
-    "nvim-devdocs_2": {
-      "flake": false,
-      "locked": {
-        "lastModified": 1703234230,
-        "narHash": "sha256-qqtBNfBBGyxMsHL3UXu+MF/UyfVAubG+6fnwLK9kY9Q=",
-        "owner": "luckasRanarison",
-        "repo": "nvim-devdocs",
-        "rev": "521d24661ffe6d1ba025debea2675c765a9c1ee1",
-        "type": "github"
-      },
-      "original": {
-        "owner": "luckasRanarison",
-        "repo": "nvim-devdocs",
-        "type": "github"
-      }
-    },
     "pre-commit-hooks": {
       "inputs": {
         "flake-compat": "flake-compat_4",
@@ -1877,15 +1877,15 @@
     },
     "subflakes": {
       "inputs": {
+        "csshacks": "csshacks",
         "flake-utils": "flake-utils_15",
         "nixpkgs": [
           "nixpkgs"
-        ],
-        "nvim-devdocs": "nvim-devdocs_2"
+        ]
       },
       "locked": {
         "lastModified": 1,
-        "narHash": "sha256-PaTXAe/aVsZln/cKtHPXfiWIL+VwFxRiSQU0CRmglLI=",
+        "narHash": "sha256-FXBBslH2CHFNTtc3NQmcoJAcjGz/c9/+k6oJegUaYig=",
         "path": "./flakes",
         "type": "path"
       },
diff --git a/flakes/flake.nix b/flakes/flake.nix
index ca77db5d..aba757b3 100644
--- a/flakes/flake.nix
+++ b/flakes/flake.nix
@@ -3,8 +3,8 @@
   inputs = {
     nixpkgs.url = "github:nixos/nixpkgs/nixos-unstable";
     flake-utils.url = "github:numtide/flake-utils";
-    nvim-devdocs.url = "github:luckasRanarison/nvim-devdocs";
-    nvim-devdocs.flake = false;
+    csshacks.url = "github:MrOtherGuy/firefox-csshacks";
+    csshacks.flake = false;
   };
   outputs = {
     nixpkgs,
@@ -12,15 +12,7 @@
     ...
   } @ inputs: let
     overlay = final: prev: {
-      vimPlugins =
-        prev.vimPlugins
-        // {
-          nvim-devdocs = final.pkgs.vimUtils.buildVimPlugin {
-            pname = "nvim-devdocs";
-            version = "0.4.1";
-            src = inputs.nvim-devdocs;
-          };
-        };
+      csshacks = inputs.csshacks;
     };
   in {overlays.default = overlay;};
 }