From d87a135b6dd9ef9a338ab35d43e4dda493e36dd2 Mon Sep 17 00:00:00 2001
From: Nick <nickjhiebert@proton.me>
Date: Tue, 21 Oct 2025 20:08:28 -0500
Subject: [PATCH] feat: added untrap-for-youtube and social-focus

---
 .../floorp/config/extensions/default.nix      | 22 ++++++++++++-
 .../settings/socialfocus.txt                  |  0
 .../settings/untrapforyoutube.txt             |  0
 .../floorp/config/extensions_1/default.nix    | 32 -------------------
 4 files changed, 21 insertions(+), 33 deletions(-)
 rename modules/home/gui/apps/browsers/floorp/config/{extensions_1 => extensions}/settings/socialfocus.txt (100%)
 rename modules/home/gui/apps/browsers/floorp/config/{extensions_1 => extensions}/settings/untrapforyoutube.txt (100%)
 delete mode 100755 modules/home/gui/apps/browsers/floorp/config/extensions_1/default.nix

diff --git a/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix b/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix
index eaefeee..c91df7b 100755
--- a/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix
+++ b/modules/home/gui/apps/browsers/floorp/config/extensions/default.nix
@@ -1,12 +1,32 @@
 { pkgs, ... }:
+let
+  social-focus = pkgs.nur.repos.rycee.firefox-addons.buildFirefoxXpiAddon {
+    pname = "social-focus";
+    version = "7.2";
+    addonId = "{26b4f076-089c-4c69-8497-44b7e5c9faef}";
+    url = "https://addons.mozilla.org/firefox/downloads/file/4567333/socialfocus-7.2.xpi";
+    sha256 = "0mz1y88c8n2lnrzmhdc5dd94sisdyabx155kpk79a3k1axphmxmh";
+    meta = with pkgs.lib; {
+      homepage = "https://socialfocus.app/";
+      description = "Hide distracting content on social media";
+      license = licenses.mit;
+      platforms = platforms.all;
+    };
+  };
+in
 {
   extensions.packages = builtins.attrValues {
     inherit (pkgs.nur.repos.rycee.firefox-addons)
       bitwarden
-      # enhancer-for-youtube
       sponsorblock
       ublock-origin
       unpaywall
+      uninternet
+      youtube-recommended-videos
+      youtube-cards
+      ;
+    inherit
+      social-focus
       ;
   };
 }
diff --git a/modules/home/gui/apps/browsers/floorp/config/extensions_1/settings/socialfocus.txt b/modules/home/gui/apps/browsers/floorp/config/extensions/settings/socialfocus.txt
similarity index 100%
rename from modules/home/gui/apps/browsers/floorp/config/extensions_1/settings/socialfocus.txt
rename to modules/home/gui/apps/browsers/floorp/config/extensions/settings/socialfocus.txt
diff --git a/modules/home/gui/apps/browsers/floorp/config/extensions_1/settings/untrapforyoutube.txt b/modules/home/gui/apps/browsers/floorp/config/extensions/settings/untrapforyoutube.txt
similarity index 100%
rename from modules/home/gui/apps/browsers/floorp/config/extensions_1/settings/untrapforyoutube.txt
rename to modules/home/gui/apps/browsers/floorp/config/extensions/settings/untrapforyoutube.txt
diff --git a/modules/home/gui/apps/browsers/floorp/config/extensions_1/default.nix b/modules/home/gui/apps/browsers/floorp/config/extensions_1/default.nix
deleted file mode 100755
index c91df7b..0000000
--- a/modules/home/gui/apps/browsers/floorp/config/extensions_1/default.nix
+++ /dev/null
@@ -1,32 +0,0 @@
-{ pkgs, ... }:
-let
-  social-focus = pkgs.nur.repos.rycee.firefox-addons.buildFirefoxXpiAddon {
-    pname = "social-focus";
-    version = "7.2";
-    addonId = "{26b4f076-089c-4c69-8497-44b7e5c9faef}";
-    url = "https://addons.mozilla.org/firefox/downloads/file/4567333/socialfocus-7.2.xpi";
-    sha256 = "0mz1y88c8n2lnrzmhdc5dd94sisdyabx155kpk79a3k1axphmxmh";
-    meta = with pkgs.lib; {
-      homepage = "https://socialfocus.app/";
-      description = "Hide distracting content on social media";
-      license = licenses.mit;
-      platforms = platforms.all;
-    };
-  };
-in
-{
-  extensions.packages = builtins.attrValues {
-    inherit (pkgs.nur.repos.rycee.firefox-addons)
-      bitwarden
-      sponsorblock
-      ublock-origin
-      unpaywall
-      uninternet
-      youtube-recommended-videos
-      youtube-cards
-      ;
-    inherit
-      social-focus
-      ;
-  };
-}