From 26c3c43aeebc191e8877f7f4c2be89867fff823c Mon Sep 17 00:00:00 2001
From: Mohammad Rafiq <rafiq@rrv.sh>
Date: Tue, 20 May 2025 12:11:45 +0800
Subject: [PATCH] refactor(homeModules/desktop): move browser config to module

---
 homes/x86_64-linux/rafiq/default.nix                |  8 ++++----
 homes/x86_64-linux/rafiq/desktop.nix                | 13 -------------
 .../home/desktop/browser/firefox/default.nix        |  6 +++++-
 modules/home/desktop/default.nix                    |  1 +
 4 files changed, 10 insertions(+), 18 deletions(-)
 delete mode 100644 homes/x86_64-linux/rafiq/desktop.nix
 rename homes/x86_64-linux/rafiq/desktop/firefox.nix => modules/home/desktop/browser/firefox/default.nix (57%)

diff --git a/homes/x86_64-linux/rafiq/default.nix b/homes/x86_64-linux/rafiq/default.nix
index cdb15da..abaccdf 100644
--- a/homes/x86_64-linux/rafiq/default.nix
+++ b/homes/x86_64-linux/rafiq/default.nix
@@ -1,10 +1,6 @@
 { config, pkgs, osConfig, ... }:
 
 {
-  imports = [
-    ./desktop.nix
-  ];
-
   cli.shell = "zsh";
   cli.editor = "nvf";
   cli.file-browser = "yazi";
@@ -12,6 +8,7 @@
   cli.git.email = "rafiq@rrv.sh";
   cli.git.defaultBranch = "prime";
  desktop.windowManager = "hyprland";
+ desktop.browser = "firefox";
 
   home.shellAliases.v = "nvim";
   home.shellAliases = {
@@ -27,8 +24,11 @@
     fzf
     devenv
     pantheon.rebuild
+    kitty
   ];
 
+  home.sessionVariables = { TERMINAL = "kitty"; };
+
     programs.direnv = {
       enable = true;
       nix-direnv.enable = true;
diff --git a/homes/x86_64-linux/rafiq/desktop.nix b/homes/x86_64-linux/rafiq/desktop.nix
deleted file mode 100644
index 55524c8..0000000
--- a/homes/x86_64-linux/rafiq/desktop.nix
+++ /dev/null
@@ -1,13 +0,0 @@
-{pkgs,...}:
-{
-imports = [
-    ./desktop/firefox.nix
-];
-  home.packages = with pkgs; [
-	  kitty
-  ];
-  home.sessionVariables = {
-    TERMINAL = "kitty";
-    BROWSER = "firefox";
-  };
-}
diff --git a/homes/x86_64-linux/rafiq/desktop/firefox.nix b/modules/home/desktop/browser/firefox/default.nix
similarity index 57%
rename from homes/x86_64-linux/rafiq/desktop/firefox.nix
rename to modules/home/desktop/browser/firefox/default.nix
index 26e5ed6..5ab8eb8 100644
--- a/homes/x86_64-linux/rafiq/desktop/firefox.nix
+++ b/modules/home/desktop/browser/firefox/default.nix
@@ -1,8 +1,12 @@
+{ config, lib, ... }:
 {
+  config = lib.mkIf (config.desktop.browser == "firefox") {
+  home.persistence."/persist/home/rafiq".directories = [ ".mozilla/firefox" ];
+    home.sessionVariables.BROWSER = "firefox";
   programs.firefox = {
     enable = true;
     profiles.rafiq.id = 0;
     profiles.test.id = 1;
   };
-  home.persistence."/persist/home/rafiq".directories = [ ".mozilla/firefox" ];
+  };
 }
diff --git a/modules/home/desktop/default.nix b/modules/home/desktop/default.nix
index d63653d..e350b31 100644
--- a/modules/home/desktop/default.nix
+++ b/modules/home/desktop/default.nix
@@ -2,6 +2,7 @@
 {
   options.desktop = {
     windowManager = lib.pantheon.mkStrOption;
+    browser = lib.pantheon.mkStrOption;
   };