move firefox to new browser module

12 files changed, 26 insertions, 6 deletions

diff --git a/hosts/kaworu/default.nix b/hosts/kaworu/default.nix
index a8f54c5..7d09423 100644
--- a/hosts/kaworu/default.nix
+++ b/hosts/kaworu/default.nix
@@ -28,10 +28,12 @@ inputs.nixpkgs.lib.nixosSystem rec {
       ];
 
       # modules
+      browser = {
+        firefox = true;
+      };
       desktop = {
         enable = true;
         astal = true;
-        firefox = true;
         hyprland = true;
         hyprlock = true;
         hypridle = true;
diff --git a/hosts/shinji/default.nix b/hosts/shinji/default.nix
index 9f86069..776b87b 100644
--- a/hosts/shinji/default.nix
+++ b/hosts/shinji/default.nix
@@ -51,10 +51,12 @@ inputs.nixpkgs.lib.nixosSystem rec {
       ];
 
       # modules
+      browser = {
+        firefox = true;
+      };
       desktop = {
         enable = true;
         astal = true;
-        firefox = true;
         hyprland = true;
         hyprlock = true;
         hypridle = true;
diff --git a/hosts/thinkpad/default.nix b/hosts/thinkpad/default.nix
index 6810930..5167074 100644
--- a/hosts/thinkpad/default.nix
+++ b/hosts/thinkpad/default.nix
@@ -28,10 +28,12 @@ inputs.nixpkgs.lib.nixosSystem rec {
       ];
 
       # modules
+      browser = {
+        firefox = true;
+      };
       desktop = {
         enable = true;
         astal = true;
-        firefox = true;
         hyprland = true;
         hyprlock = true;
         hypridle = true;
diff --git a/modules/browser/default.nix b/modules/browser/default.nix
new file mode 100644
index 0000000..0621d62
--- /dev/null
+++ b/modules/browser/default.nix
@@ -0,0 +1,15 @@
+{
+  lib,
+  config,
+  ...
+}: let
+  inherit (lib) mkEnableOption;
+in {
+  imports = [
+    ./firefox
+  ];
+
+  options.browser = {
+    firefox = mkEnableOption "Enable the firefox browser.";
+  };
+}
diff --git a/modules/desktop/firefox/default.nix b/modules/browser/firefox/default.nix
index e7720b2..7655c62 100644
--- a/modules/desktop/firefox/default.nix
+++ b/modules/browser/firefox/default.nix
@@ -11,7 +11,7 @@
   };
 
   inherit (lib) mkIf;
-  cfg = config.desktop;
+  cfg = config.browser;
 in {
   config = mkIf cfg.firefox {
     default.browser = lib.mkDefault "firefox";
diff --git a/modules/desktop/firefox/extraPrefs.nix b/modules/browser/firefox/extraPrefs.nix
index 74db984..74db984 100644
--- a/modules/desktop/firefox/extraPrefs.nix
+++ b/modules/browser/firefox/extraPrefs.nix
diff --git a/modules/desktop/firefox/policy.nix b/modules/browser/firefox/policy.nix
index e222553..e222553 100644
--- a/modules/desktop/firefox/policy.nix
+++ b/modules/browser/firefox/policy.nix
diff --git a/modules/desktop/firefox/policyExtensions.nix b/modules/browser/firefox/policyExtensions.nix
index 51d7e9d..51d7e9d 100644
--- a/modules/desktop/firefox/policyExtensions.nix
+++ b/modules/browser/firefox/policyExtensions.nix
diff --git a/modules/desktop/firefox/policyPrefs.nix b/modules/browser/firefox/policyPrefs.nix
index 73d2781..73d2781 100644
--- a/modules/desktop/firefox/policyPrefs.nix
+++ b/modules/browser/firefox/policyPrefs.nix
diff --git a/modules/desktop/firefox/userChrome.nix b/modules/browser/firefox/userChrome.nix
index ab93747..ab93747 100644
--- a/modules/desktop/firefox/userChrome.nix
+++ b/modules/browser/firefox/userChrome.nix
diff --git a/modules/default.nix b/modules/default.nix
index 534bd9f..fe039de 100644
--- a/modules/default.nix
+++ b/modules/default.nix
@@ -1,5 +1,6 @@
 {...}: {
   imports = [
+    ./browser
     ./desktop
     ./development
     ./gaming
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index 7b6146d..e3d42cf 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -9,7 +9,6 @@
   cfg = config.desktop;
 in {
   imports = [
-    ./firefox
     ./waybar
     ./wofi
     ./astal.nix
@@ -23,7 +22,6 @@ in {
   options.desktop = {
     enable = mkEnableOption "Enable baseline desktop utils and programs.";
     astal = mkEnableOption "Enable the astal gtk shell.";
-    firefox = mkEnableOption "Enable the firefox browser.";
     hypridle = mkEnableOption "Enable the hypridle daemon.";
     hyprland = mkEnableOption "Install the Hyprland desktop.";
     hyprlock = mkEnableOption "Enable the hyprlock lockscreen.";