diff --git a/system/kaladin/configuration.nix b/system/kaladin/configuration.nix
index 5b77f78..3ca60cc 100644
--- a/system/kaladin/configuration.nix
+++ b/system/kaladin/configuration.nix
@@ -7,6 +7,7 @@
       ../../pkgs/base-packages.nix
       ../../pkgs/desktop-packages.nix
       ../../modules/emacs.nix
+      ../../modules/desktop.nix
     ];
 
   nix = {
@@ -94,75 +95,6 @@
     trusted-public-keys = ["hyprland.cachix.org-1:a7pgxzMz7+chwVL3/pzj6jIBMioiJM7ypFP8PwtkuGc="];
   };
   
-  boot.supportedFilesystems = [ "ntfs" ];
-  services.xserver = {
-    enable = true;
-    autorun = false;
-    # windowManager.awesome = {
-    #   enable = true;
-    #   package = pkgs.awesome;
-    # };
-    displayManager = {
-      startx.enable = true;
-      sddm = {
-        enable = false;
-      };
-      session = [
-        {
-          manage = "desktop";
-          name = "Hyprland";
-          start = ''
-            /home/chris/bin/hyprland &
-            waitPID=$!
-          '';
-        }
-      ];
-    };
-    desktopManager.plasma5 = {
-      enable = true;
-      runUsingSystemd = true;
-    };
-    # desktopManager.gnome.enable = true;
-  };
-  
-  services.greetd = {
-    enable = true;
-    settings = rec {
-      initial_session = {
-        command = "dbus-run-session startplasma-wayland";
-        user = "chris";
-      };
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time -r --window-padding 2 --cmd 'dbus-run-session startplasma-wayland'";
-        user = "greeter";
-      };
-      plasma_session = {
-        command = "dbus-run-session startplasma-wayland";
-        user = "chris";
-      };
-      hyprland_session = {
-        command = "/home/chris/bin/hyprland";
-        user = "chris";
-      };
-    };
-  };
-  
-  environment.etc."greetd/environments".text = ''
-      /home/chris/bin/hyprland
-      fish
-      bash
-      dbus-run-session startplasma-wayland
-  '';
-  
-  programs.hyprland = {
-    enable = true;
-  };
-  
-  services.avahi = {
-    enable = true;
-    nssmdns = true;
-  };
-  
   # Configure keymap in X11
   services.xserver.layout = "us";
   # services.xserver.xkbOptions = "eurosign:e";