diff --git a/.vscode/settings.json b/.vscode/settings.json
index 196707f3..43129653 100644
--- a/.vscode/settings.json
+++ b/.vscode/settings.json
@@ -2,5 +2,6 @@
     "files.eol": "\n",
     "[nix]": {
         "editor.tabSize": 2
-    }
+    },
+    "cSpell.enabled": false
 }
\ No newline at end of file
diff --git a/profiles/applications/games/emulators.nix b/profiles/applications/games/emulators.nix
index b5e1548e..226e3228 100644
--- a/profiles/applications/games/emulators.nix
+++ b/profiles/applications/games/emulators.nix
@@ -2,7 +2,7 @@
   boot.kernel.sysctl."vm.max_map_count" = lib.mkForce 524288;
   home-manager.users.${config.mainuser} = {
     home.packages = with pkgs; [
-      (retroarch.override { cores = with libretro; [ genesis-plus-gx dosbox ]; })
+      # (retroarch.override { cores = with libretro; [ genesis-plus-gx dosbox ]; })
       ryujinx
       # citra-canary
       # pcsx2
diff --git a/profiles/applications/vscode/default.nix b/profiles/applications/vscode/default.nix
index a7a1288b..7ea8d847 100644
--- a/profiles/applications/vscode/default.nix
+++ b/profiles/applications/vscode/default.nix
@@ -65,6 +65,7 @@ in
           ext-nixpkgs.ms-python.python
           ext-vscode.ms-python.isort
           ext-vscode.ms-python.vscode-pylance
+          ext-nixpkgs.ms-vscode.cpptools
           ext-vscode.ms-vscode.hexeditor
           ext-nixpkgs.ms-vscode-remote.remote-containers
           ext-nixpkgs.ms-vscode-remote.remote-ssh #FIX later
diff --git a/profiles/overlay.nix b/profiles/overlay.nix
index e92b22b6..41a3856a 100644
--- a/profiles/overlay.nix
+++ b/profiles/overlay.nix
@@ -39,17 +39,6 @@ with lib; {
         wine = prev.wineWow64Packages.stagingFull;
         intel-vaapi-driver = prev.intel-vaapi-driver.override { enableHybridCodec = true; };
 
-        haskellPackages = prev.haskellPackages.override {
-          overrides = _hFinal: hPrev: {
-            # TODO: remove after cachix starts to use nix > v2.21
-            cachix = let
-              nix-fixed = prev.nixVersions.nix_2_19.overrideAttrs (oldAttrs: {
-                patches = oldAttrs.patches ++ [ ../patches/fix-nix-2.19.patch ];
-              });
-            in hPrev.cachix.override { nix = nix-fixed; };
-          };
-        };
-
         modprobed-db = prev.modprobed-db.overrideAttrs (oa: {
           postPatch = (oa.postPatch or "") + ''
             substituteInPlace ./common/modprobed-db.in \