diff --git a/modules/profiles/desktop.nix b/modules/profiles/desktop.nix
index a7b0bb0..e857456 100644
--- a/modules/profiles/desktop.nix
+++ b/modules/profiles/desktop.nix
@@ -43,6 +43,10 @@ with lib;
           ms-azuretools.vscode-docker
           ms-python.python
           shardulm94.trailing-spaces
+        ] ++
+        optionals config.sconfig.xmonad.enable [
+          vscode-extensions.haskell.haskell
+          vscode-extensions.justusadam.language-haskell
         ];
       })
 
@@ -70,6 +74,9 @@ with lib;
         };
       })
 
+    ] ++
+    optionals config.sconfig.xmonad.enable [
+      haskell-language-server
     ];
 
     sconfig.user-settings = ''
diff --git a/modules/xmonad/default.nix b/modules/xmonad/default.nix
new file mode 100644
index 0000000..956fe5c
--- /dev/null
+++ b/modules/xmonad/default.nix
@@ -0,0 +1,79 @@
+{ config, pkgs, lib, ... }:
+let
+  cfg = config.sconfig.xmonad;
+in
+{
+  options.sconfig.xmonad.enable = lib.mkEnableOption "xmonad";
+
+  # extraSessionCommands = ''
+  #   echo 'Xft.dpi: 96' | xrdb -merge
+  #   echo 'Xcursor.size: 24' | xrdb -merge
+  #   xsetroot -solid '#333333'
+  # '';
+
+  config = lib.mkIf cfg.enable {
+    services.xserver.windowManager.xmonad = {
+      enable = true;
+      extraPackages = haskellPackages: [
+        haskellPackages.dbus
+        haskellPackages.List
+        haskellPackages.monad-logger
+        haskellPackages.xmobar
+        haskellPackages.xmonad
+        haskellPackages.xmonad-contrib
+        haskellPackages.xmonad-extras
+      ];
+    };
+
+    hardware.pulseaudio.enable = true;
+
+    environment.etc."xdg/gtk-3.0/settings.ini".text = ''
+      [Settings]
+      gtk-theme-name=Yaru-dark
+    '';
+
+    services.gvfs.enable = true;
+    networking.networkmanager.enable = true;
+
+    services.xserver = {
+      enable = true;
+      libinput.enable = true;
+      libinput.touchpad.naturalScrolling = true;
+      displayManager.sddm.enable = true;
+    };
+
+    environment.systemPackages = with pkgs; [
+      brightnessctl
+      dmenu
+      yaru-theme
+      networkmanagerapplet
+      gnome3.file-roller
+      gnome3.adwaita-icon-theme
+      mate.mate-terminal
+      xfce.thunar
+      xfce.thunar-archive-plugin
+      caffeine-ng
+      xmobar
+
+      (haskellPackages.ghcWithPackages (p: [
+        p.dbus
+        p.List
+        p.monad-logger
+        p.xmobar
+        p.xmonad
+        p.xmonad-contrib
+        p.xmonad-extras
+      ]))
+
+      (runCommand "default_cursor" { } ''
+        mkdir -p $out/share/icons/default
+        ln -sf /run/current-system/sw/share/icons/Yaru/cursor.theme $out/share/icons/default/index.theme
+      '')
+
+      (runCommand "x-terminal-emulator" { } ''
+        mkdir -p $out/bin
+        ln -s ${alacritty}/bin/alacritty $out/bin/x-terminal-emulator
+      '')
+    ];
+  };
+}