diff --git a/machines/Lilim/options.nix b/machines/Lilim/options.nix
index 10950c2..5e13f22 100644
--- a/machines/Lilim/options.nix
+++ b/machines/Lilim/options.nix
@@ -40,6 +40,7 @@ with lib;
       "emacs::org"
       "emacs::transmission"
       "emacs::web-mode"
+      "emacs::yaml-mode"
       "emacs::yasnippet"
       "extra"
       "haskell"
diff --git a/pkgsets/emacs/yaml-mode.nix b/pkgsets/emacs/yaml-mode.nix
new file mode 100644
index 0000000..4fcac9d
--- /dev/null
+++ b/pkgsets/emacs/yaml-mode.nix
@@ -0,0 +1,11 @@
+{ config, lib, pkgs, ... }:
+
+with lib;
+
+mkIf (elem "emacs::yaml-mode" config.machine.pkgs) {
+  programs.emacs.init.usePackage = {
+    yaml-mode = {
+      enable = true;
+    };
+  };
+}