diff --git a/modules/home/default.nix b/modules/home/default.nix
index c83977e..781873d 100644
--- a/modules/home/default.nix
+++ b/modules/home/default.nix
@@ -6,6 +6,8 @@
     ./alacritty.nix
     ./firefox.nix
     ./git.nix
+    ./hyprland.nix
+    ./mango.nix
     ./nvf.nix
     ./packages.nix
     # ./plasma.nix
diff --git a/modules/home/hyprland.nix b/modules/home/hyprland.nix
new file mode 100644
index 0000000..2d3bc79
--- /dev/null
+++ b/modules/home/hyprland.nix
@@ -0,0 +1,10 @@
+{
+  ...
+}:
+{
+  wayland.windowManager.hyprland = {
+    enable = true;
+    package = null;
+    portalPackage = null;
+  };
+}
diff --git a/modules/home/mango.nix b/modules/home/mango.nix
new file mode 100644
index 0000000..a566197
--- /dev/null
+++ b/modules/home/mango.nix
@@ -0,0 +1,37 @@
+{
+  inputs,
+  ...
+}:
+{
+  imports = [
+    inputs.mango.hmModules.mango
+  ];
+
+  wayland.windowManager.mango = {
+    enable = true;
+    settings = ''
+      bind=SUPER,Return,spawn,alacritty
+      bind=SUPER,s,spawn,rofi -show drun
+
+      bind=SUPER,q,killclient
+      bind=SUPER+SHIFT,r,reload_config
+
+      bind=SUPER,t,setlayout,tile
+      bind=SUPER,v,setlayout,vertical_grid
+      bind=SUPER,c,setlayout,spiral
+      bind=SUPER,x,setlayout,scroller
+      bind=SUPER,n,switch_layout
+      bind=SUPER,a,togglegaps
+
+      bind=SUPER,Up,focusdir,up
+      bind=SUPER,Down,focusdir,down
+      bind=SUPER,Left,focusdir,left
+      bind=SUPER,Right,focusdir,right
+
+      bind=SUPER+SHIFT,Up,exchange_client,up 
+      bind=SUPER+SHIFT,Down,exchange_client,down
+      bind=SUPER+SHIFT,Left,exchange_client,left
+      bind=SUPER+SHIFT,Right,exchange_client,right
+    '';
+  };
+}
diff --git a/modules/system/default.nix b/modules/system/default.nix
index 80a39bb..4ee3418 100644
--- a/modules/system/default.nix
+++ b/modules/system/default.nix
@@ -5,6 +5,7 @@
   imports = [
     ./agenix.nix
     ./boot.nix
+    ./desktop.nix
     ./fileSystems.nix
     ./fonts.nix
     ./network.nix
diff --git a/modules/system/desktop.nix b/modules/system/desktop.nix
new file mode 100644
index 0000000..c2eea3a
--- /dev/null
+++ b/modules/system/desktop.nix
@@ -0,0 +1,62 @@
+{
+  inputs,
+  pkgs,
+  ...
+}:
+let
+  sddm-theme = inputs.silentSDDM.packages.${pkgs.system}.default;
+in
+{
+  imports = [
+    inputs.mango.nixosModules.mango
+  ];
+
+  programs = {
+    hyprland = {
+      enable = true;
+      withUWSM = true;
+    };
+    mango.enable = true;
+    # uwsm = {
+    #   enable = true;
+    #   waylandCompositors = {
+    #     mango = {
+    #       prettyName = "Mango";
+    #       comment = "Lightweight compositor based on dwl";
+    #       binPath = "/run/current-system/sw/bin/mango";
+    #     };
+    #   };
+    # };
+  };
+
+  environment.systemPackages = [
+    sddm-theme
+    sddm-theme.test
+  ];
+  services.displayManager = {
+    defaultSession = "mango";
+    sddm = {
+      enable = true;
+      package = pkgs.kdePackages.sddm;
+      theme = sddm-theme.pname;
+      extraPackages = sddm-theme.propagatedBuildInputs;
+      settings = {
+        General = {
+          GreeterEnvironment = "QML2_IMPORT_PATH=${sddm-theme}/share/sddm/themes/${sddm-theme.pname}/components/,QT_IM_MODULE=qtvirtualkeyboard";
+          InputMethod = "qtvirtualkeyboard";
+        };
+      };
+    };
+  };
+
+  # Enable the KDE Plasma Desktop Environment.
+  # displayManager.sddm.enable = true;
+  # desktopManager.plasma5.enable = true;
+
+  # Enable the System75 Cosmic Desktop Environment
+  # displayManager.cosmic-greeter.enable = true;
+  # desktopManager.cosmic = {
+  #   enable = true;
+  #   xwayland.enable = true;
+  # };
+}
diff --git a/modules/system/services.nix b/modules/system/services.nix
index 28afe93..1f9b4a0 100644
--- a/modules/system/services.nix
+++ b/modules/system/services.nix
@@ -19,16 +19,6 @@
       # libinput.enable = true;
     };
 
-    # Enable the KDE Plasma Desktop Environment.
-    # displayManager.sddm.enable = true;
-    # desktopManager.plasma6.enable = true;
-
-    displayManager.cosmic-greeter.enable = true;
-    desktopManager.cosmic = {
-      enable = true;
-      xwayland.enable = true;
-    };
-
     # Enable CUPS to print documents.
     printing = {
       enable = true;