From f494c3cba7928a1d4c2a7503a2cfc6f24065560d Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Sun, 3 Oct 2021 15:53:04 +0200
Subject: [PATCH] home: firefox: re-organise module

---
 home/firefox/default.nix         | 64 +++++++++++++++++++++++++++++---
 home/firefox/firefox/default.nix | 57 ----------------------------
 2 files changed, 59 insertions(+), 62 deletions(-)
 delete mode 100644 home/firefox/firefox/default.nix

diff --git a/home/firefox/default.nix b/home/firefox/default.nix
index 3d310dc..cbcc233 100644
--- a/home/firefox/default.nix
+++ b/home/firefox/default.nix
@@ -1,5 +1,12 @@
-{ config, lib, ... }:
+{ config, lib, pkgs, ... }:
+let
+  cfg = config.my.home.firefox;
+in
 {
+  imports = [
+    ./tridactyl
+  ];
+
   options.my.home.firefox = with lib; {
     enable = mkEnableOption "firefox configuration";
 
@@ -22,8 +29,55 @@
     };
   };
 
-  imports = [
-    ./firefox
-    ./tridactyl
-  ];
+  config.programs.firefox = lib.mkIf cfg.enable {
+    enable = true;
+
+    package = pkgs.firefox.override {
+      cfg = {
+        enableTridactylNative = cfg.tridactyl.enable;
+      };
+
+      extraNativeMessagingHosts = with pkgs; ([ ]
+        # Watch videos using mpv
+        ++ lib.optional cfg.ff2mpv.enable ambroisie.ff2mpv-go
+      );
+    };
+
+    profiles = {
+      default = {
+        id = 0;
+
+        settings = {
+          "browser.bookmarks.showMobileBookmarks" = true; # Mobile bookmarks
+          "browser.download.useDownloadDir" = false; # Ask for download location
+          "browser.in-content.dark-mode" = true; # Dark mode
+          "browser.newtabpage.activity-stream.feeds.section.topstories" = false; # Disable top stories
+          "browser.newtabpage.activity-stream.feeds.sections" = false;
+          "browser.newtabpage.activity-stream.feeds.system.topstories" = false; # Disable top stories
+          "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; # Disable pocket
+          "extensions.pocket.enabled" = false; # Disable pocket
+          "media.eme.enabled" = true; # Enable DRM
+          "media.gmp-widevinecdm.visible" = true; # Enable DRM
+          "media.gmp-widevinecdm.enabled" = true; # Enable DRM
+          "signon.autofillForms" = false; # Disable built-in form-filling
+          "signon.rememberSignons" = false; # Disable built-in password manager
+          "ui.systemUsesDarkTheme" = true; # Dark mode
+        };
+      };
+    };
+
+    extensions = with pkgs.nur.repos.rycee.firefox-addons; ([
+      bitwarden
+      form-history-control
+      https-everywhere
+      i-dont-care-about-cookies
+      reddit-enhancement-suite
+      refined-github
+      sponsorblock
+      ublock-origin
+    ]
+    ++ lib.optional (cfg.tridactyl.enable) tridactyl
+    ++ lib.optional (cfg.ff2mpv.enable) ff2mpv
+    );
+  };
 }
diff --git a/home/firefox/firefox/default.nix b/home/firefox/firefox/default.nix
deleted file mode 100644
index 5d4b05e..0000000
--- a/home/firefox/firefox/default.nix
+++ /dev/null
@@ -1,57 +0,0 @@
-{ config, lib, pkgs, ... }:
-let
-  cfg = config.my.home.firefox;
-in
-{
-  config.programs.firefox = lib.mkIf cfg.enable {
-    enable = true;
-
-    package = pkgs.firefox.override {
-      cfg = {
-        enableTridactylNative = cfg.tridactyl.enable;
-      };
-
-      extraNativeMessagingHosts = with pkgs; ([ ]
-        # Watch videos using mpv
-        ++ lib.optional cfg.ff2mpv.enable ambroisie.ff2mpv-go
-      );
-    };
-
-    profiles = {
-      default = {
-        id = 0;
-
-        settings = {
-          "browser.bookmarks.showMobileBookmarks" = true; # Mobile bookmarks
-          "browser.download.useDownloadDir" = false; # Ask for download location
-          "browser.in-content.dark-mode" = true; # Dark mode
-          "browser.newtabpage.activity-stream.feeds.section.topstories" = false; # Disable top stories
-          "browser.newtabpage.activity-stream.feeds.sections" = false;
-          "browser.newtabpage.activity-stream.feeds.system.topstories" = false; # Disable top stories
-          "browser.newtabpage.activity-stream.section.highlights.includePocket" = false; # Disable pocket
-          "extensions.pocket.enabled" = false; # Disable pocket
-          "media.eme.enabled" = true; # Enable DRM
-          "media.gmp-widevinecdm.visible" = true; # Enable DRM
-          "media.gmp-widevinecdm.enabled" = true; # Enable DRM
-          "signon.autofillForms" = false; # Disable built-in form-filling
-          "signon.rememberSignons" = false; # Disable built-in password manager
-          "ui.systemUsesDarkTheme" = true; # Dark mode
-        };
-      };
-    };
-
-    extensions = with pkgs.nur.repos.rycee.firefox-addons; ([
-      bitwarden
-      form-history-control
-      https-everywhere
-      i-dont-care-about-cookies
-      reddit-enhancement-suite
-      refined-github
-      sponsorblock
-      ublock-origin
-    ]
-    ++ lib.optional (cfg.tridactyl.enable) tridactyl
-    ++ lib.optional (cfg.ff2mpv.enable) ff2mpv
-    );
-  };
-}