From 2e91ed63c874d6d3ae4a9a1924d6405f61416d2b Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Wed, 23 Apr 2025 23:05:45 +0100
Subject: [PATCH] Organise Home Manager modules

---
 home/opdavies/t480.nix                                   | 9 ++++++---
 modules/home-manager/desktop/browsers/default.nix        | 6 ++++++
 modules/home-manager/desktop/{ => browsers}/firefox.nix  | 4 ++--
 .../home-manager/desktop/{ => browsers}/qutebrowser.nix  | 5 +++--
 modules/home-manager/desktop/default.nix                 | 5 ++---
 modules/home-manager/desktop/media/default.nix           | 5 +++++
 modules/home-manager/desktop/{ => media}/mpv.nix         | 4 ++--
 7 files changed, 26 insertions(+), 12 deletions(-)
 create mode 100644 modules/home-manager/desktop/browsers/default.nix
 rename modules/home-manager/desktop/{ => browsers}/firefox.nix (95%)
 rename modules/home-manager/desktop/{ => browsers}/qutebrowser.nix (84%)
 create mode 100644 modules/home-manager/desktop/media/default.nix
 rename modules/home-manager/desktop/{ => media}/mpv.nix (67%)

diff --git a/home/opdavies/t480.nix b/home/opdavies/t480.nix
index 0b621579..73100bf6 100644
--- a/home/opdavies/t480.nix
+++ b/home/opdavies/t480.nix
@@ -47,11 +47,14 @@
     };
 
     desktop = {
-      firefox.enable = true;
+      browsers = {
+        firefox.enable = true;
+        qutebrowser.enable = true;
+      };
+
       flameshot.enable = true;
       gtk.enable = true;
-      mpv.enable = true;
-      qutebrowser.enable = true;
+      media.mpv.enable = true;
     };
   };
 
diff --git a/modules/home-manager/desktop/browsers/default.nix b/modules/home-manager/desktop/browsers/default.nix
new file mode 100644
index 00000000..4a57a609
--- /dev/null
+++ b/modules/home-manager/desktop/browsers/default.nix
@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./firefox.nix
+    ./qutebrowser.nix
+  ];
+}
diff --git a/modules/home-manager/desktop/firefox.nix b/modules/home-manager/desktop/browsers/firefox.nix
similarity index 95%
rename from modules/home-manager/desktop/firefox.nix
rename to modules/home-manager/desktop/browsers/firefox.nix
index 53a8d6c3..2e8e92c9 100644
--- a/modules/home-manager/desktop/firefox.nix
+++ b/modules/home-manager/desktop/browsers/firefox.nix
@@ -8,10 +8,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.firefox;
+  cfg = config.homeManagerModules.desktop.browsers.firefox;
 in
 {
-  options.homeManagerModules.desktop.firefox.enable = mkEnableOption "Enable firefox";
+  options.homeManagerModules.desktop.browsers.firefox.enable = mkEnableOption "Enable firefox";
 
   config = mkIf cfg.enable {
     programs.firefox.enable = false;
diff --git a/modules/home-manager/desktop/qutebrowser.nix b/modules/home-manager/desktop/browsers/qutebrowser.nix
similarity index 84%
rename from modules/home-manager/desktop/qutebrowser.nix
rename to modules/home-manager/desktop/browsers/qutebrowser.nix
index f8102b33..9ca0631d 100644
--- a/modules/home-manager/desktop/qutebrowser.nix
+++ b/modules/home-manager/desktop/browsers/qutebrowser.nix
@@ -3,10 +3,11 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.qutebrowser;
+  cfg = config.homeManagerModules.desktop.browsers.qutebrowser;
 in
 {
-  options.homeManagerModules.desktop.qutebrowser.enable = mkEnableOption "Enable qutebrowser";
+  options.homeManagerModules.desktop.browsers.qutebrowser.enable =
+    mkEnableOption "Enable qutebrowser";
 
   config = mkIf cfg.enable {
     programs.qutebrowser = {
diff --git a/modules/home-manager/desktop/default.nix b/modules/home-manager/desktop/default.nix
index eb2d7749..6cabdeb9 100644
--- a/modules/home-manager/desktop/default.nix
+++ b/modules/home-manager/desktop/default.nix
@@ -1,10 +1,9 @@
 {
   imports = [
-    ./firefox.nix
+    ./browsers
     ./flameshot.nix
     ./gtk.nix
-    ./qutebrowser.nix
-    ./mpv.nix
+    ./media
     ./screenkey.nix
   ];
 }
diff --git a/modules/home-manager/desktop/media/default.nix b/modules/home-manager/desktop/media/default.nix
new file mode 100644
index 00000000..565dd368
--- /dev/null
+++ b/modules/home-manager/desktop/media/default.nix
@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./mpv.nix
+  ];
+}
diff --git a/modules/home-manager/desktop/mpv.nix b/modules/home-manager/desktop/media/mpv.nix
similarity index 67%
rename from modules/home-manager/desktop/mpv.nix
rename to modules/home-manager/desktop/media/mpv.nix
index 05ceba15..25efa494 100644
--- a/modules/home-manager/desktop/mpv.nix
+++ b/modules/home-manager/desktop/media/mpv.nix
@@ -3,10 +3,10 @@
 with lib;
 
 let
-  cfg = config.homeManagerModules.desktop.mpv;
+  cfg = config.homeManagerModules.desktop.media.mpv;
 in
 {
-  options.homeManagerModules.desktop.mpv.enable = mkEnableOption "Enable mpv";
+  options.homeManagerModules.desktop.media.mpv.enable = mkEnableOption "Enable mpv";
 
   config = mkIf cfg.enable {
     programs.mpv = {