Extract a makemkv module, add it to lemp11

home/opdavies/lemp11.nix

@@ -1,5 +1,12 @@
 {
   imports = [ ../common ];
 
-  homeManagerModules.cli.zsh.enable = true;
+  homeManagerModules = {
+    cli.zsh.enable = true;
+
+    desktop.media = {
+      makemkv.enable = true;
+      mpv.enable = true;
+    };
+  };
 }

home/opdavies/t480.nix

@@ -54,7 +54,11 @@
 
       flameshot.enable = true;
       gtk.enable = true;
-      media.mpv.enable = true;
+
+      media = {
+        makemkv.enable = true;
+        mpv.enable = true;
+      };
     };
   };
 

hosts/lemp11/configuration.nix

@@ -16,6 +16,8 @@
       bluetooth.enable = true;
       zram.enable = true;
     };
+
+    desktop.media.makemkv.enable = true;
   };
 
   # Bootloader.

hosts/t480/configuration.nix

@@ -35,6 +35,7 @@
       dconf.enable = true;
       dwm.enable = true;
       fonts.enable = true;
+      media.makemkv.enable = true;
       st.enable = true;
       thunar.enable = true;
     };

hosts/t480/modules/default.nix

@@ -1,7 +1,6 @@
 {
   imports = [
     ./cron.nix
-    ./desktop
     ./neomutt.nix
     ./newsboat
     ./ollama.nix

hosts/t480/modules/desktop/default.nix

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

hosts/t480/modules/desktop/media/makemkv.nix

@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    makemkv
-  ];
-
-  boot.kernelModules = [ "sg" ];
-
-  # TODO: is this needed?
-  users.users.opdavies.extraGroups = [ "cdrom" ];
-}

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

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

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

@@ -0,0 +1,21 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+with lib;
+
+let
+  cfg = config.homeManagerModules.desktop.media.makemkv;
+in
+{
+  options.homeManagerModules.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
+
+  config = mkIf cfg.enable {
+    home.packages = with pkgs; [
+      makemkv
+    ];
+  };
+}

modules/nixos/desktop/default.nix

@@ -3,6 +3,7 @@
     ./dconf.nix
     ./dwm
     ./fonts.nix
+    ./media
     ./st.nix
     ./thunar.nix
   ];

modules/nixos/desktop/media/makemkv.nix

@@ -0,0 +1,17 @@
+{ config, lib, ... }:
+
+with lib;
+
+let
+  cfg = config.nixosModules.desktop.media.makemkv;
+in
+{
+  options.nixosModules.desktop.media.makemkv.enable = mkEnableOption "Enable makemkv";
+
+  config = mkIf cfg.enable {
+    boot.kernelModules = [ "sg" ];
+
+    # TODO: is this needed?
+    # users.users.opdavies.extraGroups = [ "cdrom" ];
+  };
+}