From 4107805044146de159edb4eb1988bef011c3d9a2 Mon Sep 17 00:00:00 2001
From: Oliver Davies <oliver@oliverdavies.dev>
Date: Thu, 24 Apr 2025 01:47:15 +0100
Subject: [PATCH] Extract a makemkv module, add it to lemp11

---
 home/opdavies/lemp11.nix                      |  9 +++++++-
 home/opdavies/t480.nix                        |  6 +++++-
 hosts/lemp11/configuration.nix                |  2 ++
 hosts/t480/configuration.nix                  |  1 +
 hosts/t480/modules/default.nix                |  1 -
 hosts/t480/modules/desktop/default.nix        |  5 -----
 hosts/t480/modules/desktop/media/makemkv.nix  | 12 -----------
 .../home-manager/desktop/media/default.nix    |  1 +
 .../home-manager/desktop/media/makemkv.nix    | 21 +++++++++++++++++++
 modules/nixos/desktop/default.nix             |  1 +
 .../nixos}/desktop/media/default.nix          |  0
 modules/nixos/desktop/media/makemkv.nix       | 17 +++++++++++++++
 12 files changed, 56 insertions(+), 20 deletions(-)
 delete mode 100644 hosts/t480/modules/desktop/default.nix
 delete mode 100644 hosts/t480/modules/desktop/media/makemkv.nix
 create mode 100644 modules/home-manager/desktop/media/makemkv.nix
 rename {hosts/t480/modules => modules/nixos}/desktop/media/default.nix (100%)
 create mode 100644 modules/nixos/desktop/media/makemkv.nix

diff --git a/home/opdavies/lemp11.nix b/home/opdavies/lemp11.nix
index 617b1ab6..b268540c 100644
--- a/home/opdavies/lemp11.nix
+++ b/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;
+    };
+  };
 }
diff --git a/home/opdavies/t480.nix b/home/opdavies/t480.nix
index 73100bf6..ecc1bba6 100644
--- a/home/opdavies/t480.nix
+++ b/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;
+      };
     };
   };
 
diff --git a/hosts/lemp11/configuration.nix b/hosts/lemp11/configuration.nix
index 527dfb2f..9346e79d 100644
--- a/hosts/lemp11/configuration.nix
+++ b/hosts/lemp11/configuration.nix
@@ -16,6 +16,8 @@
       bluetooth.enable = true;
       zram.enable = true;
     };
+
+    desktop.media.makemkv.enable = true;
   };
 
   # Bootloader.
diff --git a/hosts/t480/configuration.nix b/hosts/t480/configuration.nix
index 9f26b1f7..c9b346b3 100644
--- a/hosts/t480/configuration.nix
+++ b/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;
     };
diff --git a/hosts/t480/modules/default.nix b/hosts/t480/modules/default.nix
index df830b8c..4d7442c0 100644
--- a/hosts/t480/modules/default.nix
+++ b/hosts/t480/modules/default.nix
@@ -1,7 +1,6 @@
 {
   imports = [
     ./cron.nix
-    ./desktop
     ./neomutt.nix
     ./newsboat
     ./ollama.nix
diff --git a/hosts/t480/modules/desktop/default.nix b/hosts/t480/modules/desktop/default.nix
deleted file mode 100644
index 7c256895..00000000
--- a/hosts/t480/modules/desktop/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{
-  imports = [
-    ./media
-  ];
-}
diff --git a/hosts/t480/modules/desktop/media/makemkv.nix b/hosts/t480/modules/desktop/media/makemkv.nix
deleted file mode 100644
index aa394d2a..00000000
--- a/hosts/t480/modules/desktop/media/makemkv.nix
+++ /dev/null
@@ -1,12 +0,0 @@
-{ pkgs, ... }:
-
-{
-  environment.systemPackages = with pkgs; [
-    makemkv
-  ];
-
-  boot.kernelModules = [ "sg" ];
-
-  # TODO: is this needed?
-  users.users.opdavies.extraGroups = [ "cdrom" ];
-}
diff --git a/modules/home-manager/desktop/media/default.nix b/modules/home-manager/desktop/media/default.nix
index 565dd368..e735f430 100644
--- a/modules/home-manager/desktop/media/default.nix
+++ b/modules/home-manager/desktop/media/default.nix
@@ -1,5 +1,6 @@
 {
   imports = [
+    ./makemkv.nix
     ./mpv.nix
   ];
 }
diff --git a/modules/home-manager/desktop/media/makemkv.nix b/modules/home-manager/desktop/media/makemkv.nix
new file mode 100644
index 00000000..1bb55102
--- /dev/null
+++ b/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
+    ];
+  };
+}
diff --git a/modules/nixos/desktop/default.nix b/modules/nixos/desktop/default.nix
index 50c6ed82..d031fbb2 100644
--- a/modules/nixos/desktop/default.nix
+++ b/modules/nixos/desktop/default.nix
@@ -3,6 +3,7 @@
     ./dconf.nix
     ./dwm
     ./fonts.nix
+    ./media
     ./st.nix
     ./thunar.nix
   ];
diff --git a/hosts/t480/modules/desktop/media/default.nix b/modules/nixos/desktop/media/default.nix
similarity index 100%
rename from hosts/t480/modules/desktop/media/default.nix
rename to modules/nixos/desktop/media/default.nix
diff --git a/modules/nixos/desktop/media/makemkv.nix b/modules/nixos/desktop/media/makemkv.nix
new file mode 100644
index 00000000..4a889934
--- /dev/null
+++ b/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" ];
+  };
+}