diff --git a/nix/configuration/hosts/odo/default.nix b/nix/configuration/hosts/odo/default.nix
index 4e276b7..f4b9c4b 100644
--- a/nix/configuration/hosts/odo/default.nix
+++ b/nix/configuration/hosts/odo/default.nix
@@ -46,4 +46,5 @@
   me.launch_keyboard.enable = true;
   me.sway.enable = true;
   me.lvfs.enable = true;
+  me.media.enable = true;
 }
diff --git a/nix/configuration/roles/emacs/default.nix b/nix/configuration/roles/emacs/default.nix
index ce89404..ee3b0c5 100644
--- a/nix/configuration/roles/emacs/default.nix
+++ b/nix/configuration/roles/emacs/default.nix
@@ -84,7 +84,7 @@ in
           };
         };
 
-        environment.variables.EDITOR = "${pkgs.my_emacs}/bin/plainmacs";
+        environment.variables.EDITOR = "plainmacs";
       }
       (lib.mkIf (config.me.graphical) {
         nixpkgs.overlays = [
diff --git a/nix/configuration/roles/media/default.nix b/nix/configuration/roles/media/default.nix
index 2fc3696..165ba40 100644
--- a/nix/configuration/roles/media/default.nix
+++ b/nix/configuration/roles/media/default.nix
@@ -21,20 +21,21 @@ in
 {
   imports = [ ];
 
-  config = (
+  options.me = {
+    media.enable = lib.mkOption {
+      type = lib.types.bool;
+      default = false;
+      example = true;
+      description = "Whether we want to install media.";
+    };
+  };
+
+  config = lib.mkIf config.me.media.enable (
     lib.mkMerge [
       {
         environment.systemPackages = with pkgs; [
           ffmpeg
         ];
-
-        home-manager.users.talexander =
-          { pkgs, ... }:
-          {
-            home.file.".config/mpv/mpv.conf" = {
-              source = ./files/mpv.conf;
-            };
-          };
       }
       (lib.mkIf config.me.graphical {
         environment.systemPackages = with pkgs; [
@@ -44,6 +45,14 @@ in
           # So far I prefer imv over swayimg because imv supports the 'p' hotkey to print the currently-viewed file to stdout (useful for pipelines) and afaik doesn't support the exec:// protocol which seems like a massive risk.
           imv
         ];
+
+        home-manager.users.talexander =
+          { pkgs, ... }:
+          {
+            home.file.".config/mpv/mpv.conf" = {
+              source = ./files/mpv.conf;
+            };
+          };
       })
       (lib.mkIf (config.me.graphics_card_type == "amd" || config.me.graphics_card_type == "intel") {
         environment.systemPackages = with pkgs; [