diff --git a/configuration.nix b/configuration.nix
index 68ffc7b..25bc800 100644
--- a/configuration.nix
+++ b/configuration.nix
@@ -78,29 +78,29 @@ in
   services.xserver = {
     enable = true;
 
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
 
     videoDrivers = ["nvidia"];
 
     desktopManager = {
-      plasma6.enable = conf.wm == "plasma";
       xterm.enable = false;
-      xfce = if conf.wm == "i3" then {
-        enable = true;
-        noDesktop = true;
-        enableXfwm = false;
-      } else {};
-    };
-    displayManager = {
-      sddm.enable = conf.wm == "plasma" || conf.wm == "xmonad";
-      defaultSession = if conf.wm == "i3" then "xfce+i3" else null;
     };
+
     windowManager = {
       i3.enable = conf.wm == "i3";
     };
   };
 
+  services.desktopManager = {
+    plasma6.enable = conf.wm == "plasma";
+  };
+
+  services.displayManager = {
+    sddm.enable = conf.wm == "plasma" || conf.wm == "xmonad";
+    defaultSession = if conf.wm == "i3" then "xfce+i3" else null;
+  };
+
   # services.xwayland = {
   #   enable = conf.is-wayland;
   # };
@@ -137,6 +137,14 @@ in
     pulse.enable = true;
     # If you want to use JACK applications, uncomment this
     jack.enable = true;
+    extraConfig.pipewire."92-low-latency" = {
+      context.properties = {
+        default.clock.rate = 48000;
+        default.clock.quantum = 32;
+        default.clock.min-quantum = 32;
+        default.clock.max-quantum = 32;
+      };
+    };
 
     # use the example session manager (no others are packaged yet so this is enabled by default,
     # no need to redefine it in your config for now)
diff --git a/home.nix b/home.nix
index 2d55ba9..e4bf85c 100644
--- a/home.nix
+++ b/home.nix
@@ -18,8 +18,6 @@ in
     fortune
     cowsay
     ponysay
-    lispPackages.trivia
-    lispPackages.quicklisp
     # lutris
     # mono5
     nethack
@@ -62,6 +60,7 @@ in
     clojure
     ruby_3_3
     julia
+    lua
     gcc
 
     cargo
@@ -178,7 +177,7 @@ in
 
       vim-bufkill
 
-      suda-vim
+      vim-suda
 
       # navigation
       nerdtree