diff --git a/pkgsets/emacs/flycheck.nix b/pkgsets/emacs/flycheck.nix
index e4b581a..e2588b2 100644
--- a/pkgsets/emacs/flycheck.nix
+++ b/pkgsets/emacs/flycheck.nix
@@ -19,10 +19,6 @@ with lib;
       enable = elem "emacs::haskell" config.machine.pkgs;
     };
 
-    programs.emacs.init.usePackage.flycheck-irony = {
-      enable = elem "emacs::irony" config.machine.pkgs;
-    };
-
     programs.emacs.init.usePackage.flycheck-mypy = {
       enable = elem "emacs::elpy" config.machine.pkgs;
     };
diff --git a/pkgsets/emacs/mu4e.nix b/pkgsets/emacs/mu4e.nix
index 3a24ee1..b93869c 100644
--- a/pkgsets/emacs/mu4e.nix
+++ b/pkgsets/emacs/mu4e.nix
@@ -102,7 +102,7 @@ in
               '("ViewInBrowser" . mu4e-action-view-in-browser) t)
       '';
       extraConfig = ''
-        :load-path "${pkgs.mu}/share/emacs/site-lisp/mu4e"
+        :load-path "${pkgs.mu.mu4e}/share/emacs/site-lisp/mu4e"
       '';
     };
 
diff --git a/pkgsets/emacs/yuck-mode.nix b/pkgsets/emacs/yuck-mode.nix
new file mode 100644
index 0000000..3d02392
--- /dev/null
+++ b/pkgsets/emacs/yuck-mode.nix
@@ -0,0 +1,12 @@
+{
+  config,
+  lib,
+  ...
+}:
+with lib;
+  mkIf (elem "emacs::yuck-mode" config.machine.pkgs) {
+    programs.emacs.init.usePackage.yuck-mode = {
+      enable = true;
+      mode = [''"\\.yuck\\'"''];
+    };
+  }