diff --git a/hosts/muop/configuration.nix b/hosts/muop/configuration.nix
index fc797c5..e310988 100644
--- a/hosts/muop/configuration.nix
+++ b/hosts/muop/configuration.nix
@@ -38,7 +38,6 @@ in {
   mods.unfree.steam.enable = true;
   mods.unfree.nvidia.enable = true;
   mods.unfree.minecraft.enable = false;
-  services.flatpak.enable = true;
 
   # Hardware preferences
 
@@ -65,9 +64,9 @@ in {
   };
 
   hardware = {
-    opengl = {
+    graphics = {
       enable = true;
-      driSupport32Bit = true;
+      enable32Bit = true;
       extraPackages = with pkgs; [ vaapiVdpau libvdpau-va-gl ];
     };
 
@@ -92,12 +91,6 @@ in {
     pulseaudio.support32Bit = true;
   };
 
-  xdg.portal = {
-    enable = true;
-    wlr.enable = false;
-    extraPortals = [ pkgs.xdg-desktop-portal-gtk ];
-  };
-
   ## Mouse
   services.libinput.mouse.accelProfile = "flat";
 
diff --git a/modules/home/terminal/development.nix b/modules/home/terminal/development.nix
index 160563b..e0fa682 100644
--- a/modules/home/terminal/development.nix
+++ b/modules/home/terminal/development.nix
@@ -1,26 +1,5 @@
 { pkgs, lib, config, ... }:
 let
-  # wgsl_analyzer = pkgs.rustPlatform.buildRustPackage rec {
-  #   pname = "wgsl_analyzer";
-  #   version = "main";
-
-  #   src = pkgs.fetchFromGitHub {
-  #     owner = "wgsl-analyzer";
-  #     repo = "wgsl-analyzer";
-  #     rev = version;
-  #     sha256 = "bhosTihbW89vkqp1ua0C1HGLJJdCNfRde98z4+IjkOc=";
-  #   };
-
-  #   cargoLock.lockFile = ./WGSL.lock;
-  #   cargoLock.outputHashes = {
-  #     "naga-0.14.0" = "Wo5WJzi1xdmqx23W1nuIUXkfKEzXVwL+dZu5hBOhHW8=";
-  #     "la-arena-0.3.1" = "7/bfvV5kS13zLSR8VCsmsgoWa7PHidFZTWE06zzVK5s=";
-  #     "paths-0.0.0" = "7/bfvV5kS13zLSR8VCsmsgoWa7PHidFZTWE06zzVK5s=";
-  #     "stdx-0.0.0" = "7/bfvV5kS13zLSR8VCsmsgoWa7PHidFZTWE06zzVK5s=";
-  #     "text-edit-0.0.0" = "7/bfvV5kS13zLSR8VCsmsgoWa7PHidFZTWE06zzVK5s=";
-  #     "vfs-0.0.0" = "7/bfvV5kS13zLSR8VCsmsgoWa7PHidFZTWE06zzVK5s=";
-  #   };
-  # };
   wgsl_analyzer = with pkgs;
     stdenv.mkDerivation rec {
       pname = "wgsl_analyzer";
@@ -43,11 +22,6 @@ let
         cp $src $out/bin/${pname}
         chmod +x $out/bin/${pname}
       '';
-      # installPhase = ''
-      #   runHook preInstall
-      #   install -m755 -D wgsl-analyzer-linux-x64 $out/bin/${pname}
-      #   runHook postInstall
-      # '';
     };
 in {
   options.mods.terminal.development.enable =
@@ -108,7 +82,7 @@ in {
         {
           name = "nix";
           auto-format = true;
-          formatter.command = "${pkgs.nixfmt}/bin/nixfmt";
+          formatter.command = "${pkgs.nixfmt-classic}/bin/nixfmt";
         }
         {
           name = "rust";
diff --git a/modules/home/xdg.nix b/modules/home/xdg.nix
index 9296122..f0395cb 100644
--- a/modules/home/xdg.nix
+++ b/modules/home/xdg.nix
@@ -2,8 +2,6 @@
   options.mods.xdg.enable = lib.mkEnableOption "enables xdg settings";
 
   config = lib.mkIf config.mods.xdg.enable {
-    nix.settings.use-xdg-base-directories = true;
-
     xdg = let
       browser = [ "librewolf.desktop" ];
       associations = {