Organise Home Manager modules

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;
+      media.mpv.enable = true;
-      qutebrowser.enable = true;
     };
   };
 

modules/home-manager/desktop/browsers/default.nix

@@ -0,0 +1,6 @@
+{
+  imports = [
+    ./firefox.nix
+    ./qutebrowser.nix
+  ];
+}

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;

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 = {

modules/home-manager/desktop/default.nix

@@ -1,10 +1,9 @@
 {
   imports = [
-    ./firefox.nix
+    ./browsers
     ./flameshot.nix
     ./gtk.nix
-    ./qutebrowser.nix
+    ./media
-    ./mpv.nix
     ./screenkey.nix
   ];
 }

modules/home-manager/desktop/media/default.nix

@@ -0,0 +1,5 @@
+{
+  imports = [
+    ./mpv.nix
+  ];
+}

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 = {