diff --git a/pkgs/nixpkgs.nix b/pkgs/nixpkgs.nix
index fce47e0..7011fc1 100644
--- a/pkgs/nixpkgs.nix
+++ b/pkgs/nixpkgs.nix
@@ -3,16 +3,17 @@
 {
   nixpkgs.config = {
     allowUnfree = true;
-    mpv.vaapiSupport = true;
+    mpv.vaapiSupport = (lib.elem "xserver" config.machine.services);
 
-    packageOverrides = pkgs: rec {
-      mu-git = pkgs.callPackage ./mu-git/default.nix {};
-      theme_flat-remix = pkgs.callPackage ./flat-remix/default.nix {};
-      theme_sddm_midnight = pkgs.callPackage ./sddm_midnight/default.nix {};
-      firmware_surface = pkgs.callPackage ./firmware_surface/default.nix {};
-      linux_surface = pkgs.callPackage ./linux_surface/default.nix {};
-      linuxPackages_surface = pkgs.recurseIntoAttrs (pkgs.linuxPackagesFor linux_surface);
-      xdiskusage = pkgs.callPackage ./xdiskusage/default.nix {};
+    packageOverrides = pkgs: with pkgs; rec {
+      firmware_surface = callPackage ./firmware_surface { };
+      jekyll = callPackage ./jekyll { };
+      linuxPackages_surface = recurseIntoAttrs (linuxPackagesFor linux_surface);
+      linux_surface = callPackage ./linux_surface { };
+      mu-git = callPackage ./mu-git { };
+      theme_flat-remix = callPackage ./flat-remix { };
+      theme_sddm_midnight = callPackage ./sddm_midnight { };
+      xdiskusage = callPackage ./xdiskusage { };
     };
   };
 }
diff --git a/pkgs/pkgsets.nix b/pkgs/pkgsets.nix
index 0760e42..5d595db 100644
--- a/pkgs/pkgsets.nix
+++ b/pkgs/pkgsets.nix
@@ -90,6 +90,7 @@ let
     wsd-mode
     plantuml-mode
     /* Other Stuff, not yet sorted */
+    mu4e-alert
     google-translate
     transmission
     org-plus-contrib orgit ox-gfm ox-rst