diff --git a/common/opengl.nix b/common/opengl.nix
index 8733efd..186d90e 100644
--- a/common/opengl.nix
+++ b/common/opengl.nix
@@ -39,6 +39,7 @@ in
       extraPackages = with pkgs; [ ];
     };
 
+    chaotic.mesa-git.enable = true;
     boot.kernelParams = [ "nouveau.config=NvGspRm=1" ];
 
     environment.sessionVariables = {
diff --git a/common/qt.nix b/common/qt.nix
new file mode 100644
index 0000000..712a01b
--- /dev/null
+++ b/common/qt.nix
@@ -0,0 +1,37 @@
+{ pkgs, lib, config, ... }:
+let
+  cfg = config.grimmShared;
+in
+{
+  config = with cfg; lib.mkIf (enable && graphical) {
+    qt = {
+      enable = true;
+      style = "kvantum";
+      platformTheme = "qt5ct";
+    };
+
+    environment.systemPackages = with pkgs; [
+      libsForQt5.qtstyleplugin-kvantum
+      catppuccin-kvantum
+      catppuccin-sddm-corners
+      libsForQt5.qtgraphicaleffects
+      catppuccin-kvantum
+      kdePackages.audiocd-kio
+      xcb-util-cursor
+      qt6ct
+      libsForQt5.dolphin
+    ];
+
+    #  environment.etc."kvantum".source = "${pkgs.catppuccin-kvantum}/share/Kvantum";
+
+    services.displayManager = {
+      sddm = {
+        enable = true;
+        theme = "catppuccin-sddm-corners";
+        wayland.enable = true;
+        wayland.compositor = "weston";
+      };
+      defaultSession = lib.optionalString cfg.sway.enable "sway";
+    };
+  };
+}
diff --git a/common/sway.nix b/common/sway.nix
index a4bde00..c31e9d1 100644
--- a/common/sway.nix
+++ b/common/sway.nix
@@ -40,8 +40,8 @@ in
     let
       waybar_full = pkgs.writeShellScriptBin "waybar-full" (
         (lib.getExe config.programs.waybar.package)
-        + (if isNull cfg.sway.bar.config then "" else " -c ${cfg.sway.bar.config}")
-        + (if isNull cfg.sway.bar.style then "" else " -s ${cfg.sway.bar.style}")
+        + (lib.optionalString (!isNull cfg.sway.bar.config) " -c ${cfg.sway.bar.config}")
+        + (lib.optionalString (!isNull cfg.sway.bar.style) " -s ${cfg.sway.bar.style}")
       );
 
       bar_config = ''
diff --git a/configuration.nix b/configuration.nix
index 46dca3c..b25f76c 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -24,7 +24,7 @@
   # Enable flatpaks
 
   services.flatpak.enable = true;
-  chaotic.mesa-git.enable = true;
+
   services.ddccontrol.enable = true;
   powerManagement.scsiLinkPolicy = "min_power";
   hardware.i2c.enable = true;
@@ -65,23 +65,6 @@
     mode = "777";
   };
 
-  qt = {
-    enable = true;
-    style = "kvantum";
-    platformTheme = "qt5ct";
-  };
-
-  environment.systemPackages = with pkgs; [
-    libsForQt5.qtstyleplugin-kvantum
-    catppuccin-kvantum
-    catppuccin-sddm-corners
-    libsForQt5.qtgraphicaleffects
-    catppuccin-kvantum
-    qt6ct
-  ];
-
-  #  environment.etc."kvantum".source = "${pkgs.catppuccin-kvantum}/share/Kvantum";
-
   environment.sessionVariables = {
     NIXPKGS_ALLOW_UNFREE = "1";
     MOZ_ENABLE_WAYLAND = "1";
diff --git a/flake.nix b/flake.nix
index a53de31..190aa7a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -42,7 +42,6 @@
             ./configuration.nix
             ./modules/users.nix
             ./modules/spotify-tui.nix
-            ./modules/xserver.nix
             ./modules/system-packages.nix
             ./modules/kvm.nix
             { environment.systemPackages = [ agenix.packages.${system}.default ]; }
diff --git a/load_common.nix b/load_common.nix
index 34229e7..7e74c58 100644
--- a/load_common.nix
+++ b/load_common.nix
@@ -18,5 +18,6 @@ with lib;
     ./common/sway.nix
     ./common/cloudsync.nix
     ./common/security.nix
+    ./common/qt.nix
   ];
 }
diff --git a/modules/system-packages.nix b/modules/system-packages.nix
index 2c7618a..acbe016 100644
--- a/modules/system-packages.nix
+++ b/modules/system-packages.nix
@@ -1,9 +1,6 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
     oci-cli
-    xcb-util-cursor
-    krfb
-    kdePackages.audiocd-kio
     (writeShellScriptBin "rebuild" "nixos-rebuild switch --flake .")
   ];
 }
diff --git a/modules/xserver.nix b/modules/xserver.nix
deleted file mode 100644
index 01c4cea..0000000
--- a/modules/xserver.nix
+++ /dev/null
@@ -1,16 +0,0 @@
-{
-  services.displayManager = {
-    #      lightdm.enable = true;
-    sddm = {
-      enable = true;
-      theme = "catppuccin-sddm-corners";
-      wayland.enable = true;
-      wayland.compositor = "weston";
-    };
-    defaultSession = "sway";
-  };
-
-  services.desktopManager = {
-    # plasma6.enable = true;
-  };
-}