diff --git a/desktop.nix b/desktop.nix
index ad4c02f..f043aab 100644
--- a/desktop.nix
+++ b/desktop.nix
@@ -209,7 +209,7 @@ in {
       "spotify"
       "spotify-unwrapped"
 
-      "steam" "steam-original" "steam-runtime"
+      "steam" "steam-original" "steam-runtime" "steam-run"
     ];
 
     services.packagekit.enable = mkDefault (!generalCfg.minimal);
diff --git a/desktop/developer.nix b/desktop/developer.nix
index dc9633b..878ca0f 100644
--- a/desktop/developer.nix
+++ b/desktop/developer.nix
@@ -34,15 +34,18 @@ in {
       qemu = {
         package = pkgs.qemu_full;
         ovmf.enable = true;
-        ovmf.package = pkgs.OVMFFull;
+        ovmf.packages = [ pkgs.OVMFFull ];
         swtpm.enable = true;
       };
     };
     virtualisation.spiceUSBRedirection.enable = true; # Quality of life
     security.virtualisation.flushL1DataCache = "never"; # We do not care, we are on a dev platform
 
-    virtualisation.virtualbox.host.enable = true;
-    virtualisation.virtualbox.host.enableExtensionPack = true;
+    virtualisation.virtualbox = {
+      host.enable = true;
+      host.enableExtensionPack = true;
+      host.enableHardening = false; # Causes kernel build failures
+    };
 
     environment.extraOutputsToInstall = [
       "doc" "info" "devdoc"
diff --git a/general.nix b/general.nix
index 860518e..816afc0 100644
--- a/general.nix
+++ b/general.nix
@@ -138,18 +138,18 @@ in
 
     environment.noXlibs = mkIf (cfg.minimal && (!desktopCfg.enable)) true;
 
-    nix.buildMachines = [
-      (mkBuildMachine {
+    nix.buildMachines = []
+      ++ optional false (mkBuildMachine {
         hostName = "luke-skywalker-nixos.local";
         cores = 8;
         threads = 16;
       })
-      (mkBuildMachine {
+      ++ optional false (mkBuildMachine {
         hostName = "cachan.lesviallon.fr";
         cores = 6;
         threads = 6;
       })
-    ];
+    ;
 
     programs.ssh.extraConfig = ''
       Host cachan.lesviallon.fr
@@ -166,7 +166,7 @@ in
       shell = pkgs.bashInteractive;
     };
     users.groups.builder = {};
-    nix.trustedUsers = [ "builder" ];
+    nix.settings.trusted-users = [ "builder" ];
     nix.distributedBuilds = mkDefault true;
   };
 
diff --git a/nix.nix b/nix.nix
index 4969b1e..981a3d8 100644
--- a/nix.nix
+++ b/nix.nix
@@ -21,7 +21,7 @@ in
     nix.gc.automatic = mkDefault true;
     nix.gc.dates = mkDefault "Monday,Wednesday,Friday,Sunday 03:00:00";
     nix.gc.randomizedDelaySec = "3h";
-    nix.optimise.automatic = mkDefault (!config.nix.autoOptimiseStore);
+    nix.optimise.automatic = mkDefault (!config.nix.settings.auto-optimise-store);
     nix.optimise.dates = mkDefault [ "Tuesday,Thursday,Saturday 03:00:00" ];
     nix.settings.auto-optimise-store  = mkDefault true;
 
diff --git a/optimizations.nix b/optimizations.nix
index 952362a..e3ac0ce 100644
--- a/optimizations.nix
+++ b/optimizations.nix
@@ -117,7 +117,7 @@ in
     };
     trace = mkEnableOption "trace attributes in overriden derivations";
     blacklist = mkOption {
-      default = [ "cmocka" "libkrb5" "libidn2" "tpm2-tss" ];
+      default = [ "cmocka" "libkrb5" "libidn2" "tpm2-tss" "libxcrypt" ];
       example = [ "bash" ];
       description = "Blacklist specific packages from optimizations";
       type = types.listOf types.str;
@@ -156,11 +156,6 @@ in
           } super.htop;
         nano = optimizePkg {level = "unsafe"; recursive = 99; } super.nano;
         virtmanager = optimizePkg {} super.virtmanager;
-        libsForQt5 = super.libsForQt5.overrideScope' (mself: msuper: {
-          plasma5 = msuper.plasma5.overrideScope' (mself: msuper: {
-            kwin = optimizePkg {level = "unsafe"; lto = true; } msuper.kwin;
-          });
-        });
         #wayland = optimizePkg super.wayland;
       })
     ];
diff --git a/overlays.nix b/overlays.nix
index df998b9..380c88a 100644
--- a/overlays.nix
+++ b/overlays.nix
@@ -81,47 +81,6 @@ in
 
         opensshOptimized = super.opensshOptimized or super.openssh;
 
-        scribus = super.scribus.overrideAttrs (old: rec {
-          version = "1.5.8";
-          sha256 = "sha256-R4Fuj89tBXiP8WqkSZ+X/yJDHHd6d4kUmwqItFHha3Q=";
-          src = super.fetchurl {
-            url = "mirror://sourceforge/${old.pname}/${old.pname}-devel/${old.pname}-${version}.tar.xz";
-            inherit sha256;
-          };
-          patches = with super; [
-            # For Poppler 22.02
-            (fetchpatch {
-              url = "https://github.com/scribusproject/scribus/commit/85c0dff3422fa3c26fbc2e8d8561f597ec24bd92.patch";
-              sha256 = "YR0ii09EVU8Qazz6b8KAIWsUMTwPIwO8JuQPymAWKdw=";
-            })
-            (fetchpatch {
-              url = "https://github.com/scribusproject/scribus/commit/f19410ac3b27e33dd62105746784e61e85b90a1d.patch";
-              sha256 = "JHdgntYcioYatPeqpmym3c9dORahj0CinGOzbGtA4ds=";
-            })
-            (fetchpatch {
-              url = "https://github.com/scribusproject/scribus/commit/e013e8126d2100e8e56dea5b836ad43275429389.patch";
-              sha256 = "+siPNtJq9Is9V2PgADeQJB+b4lkl5g8uk6zKBu10Jqw=";
-            })
-            (fetchpatch {
-              url = "https://github.com/scribusproject/scribus/commit/48263954a7dee0be815b00f417ae365ab26cdd85.patch";
-              sha256 = "1WE9kALFw79bQH88NUafXaZ1Y/vJEKTIWxlk5c+opsQ=";
-            })
-            (fetchpatch {
-              url = "https://github.com/scribusproject/scribus/commit/f2237b8f0b5cf7690e864a22ef7a63a6d769fa36.patch";
-              sha256 = "FXpLoX/a2Jy3GcfzrUUyVUfEAp5wAy2UfzfVA5lhwJw=";
-            })
-          ];
-        });
-        # chromium = self.ungoogled-chromium;
-
-        gccgo11 = super.wrapCC (super.gcc11.cc.override {
-          name = "gccgo11";
-          langCC = true;
-          langC = true;
-          langGo = true;
-          profiledCompiler = false;
-        });
-        gccgo = self.gccgo11;
 
         xwayland = super.xwayland.overrideAttrs (old: {
           buildInputs = old.buildInputs or [] ++ [ super.makeWrapper ];
diff --git a/packages/firefox.nix b/packages/firefox.nix
index 66f4723..7f4ae83 100644
--- a/packages/firefox.nix
+++ b/packages/firefox.nix
@@ -13,7 +13,6 @@ let
         prefs
       );
 in pkgs.wrapFirefox pkgs.firefox-esr-unwrapped {
-    forceWayland = true;
     cfg = {
       smartcardSupport = true;
       pipewireSupport = true;
diff --git a/services.nix b/services.nix
index 920acbd..e4973c2 100644
--- a/services.nix
+++ b/services.nix
@@ -139,7 +139,7 @@ in {
       Storage = "volatile";
     };
 
-    services.ananicy.enable = true;
+    services.ananicy.enable = false;
     services.ananicy.package = pkgs.ananicy-cpp;
     services.ananicy.settings = {
       loglevel = "info";