diff --git a/flake.lock b/flake.lock
index 9b51e5e..5099713 100644
--- a/flake.lock
+++ b/flake.lock
@@ -81,27 +81,6 @@
         "type": "github"
       }
     },
-    "distro-grub-themes": {
-      "inputs": {
-        "flake-utils": "flake-utils",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
-      },
-      "locked": {
-        "lastModified": 1734806114,
-        "narHash": "sha256-FWkDtoLMTTk2Lz4d4LkFjtV/xYyIlpwZlX5Np1QhXls=",
-        "owner": "AdisonCavani",
-        "repo": "distro-grub-themes",
-        "rev": "ebbd17419890059e371a6f2dbf2a7e76190327d4",
-        "type": "github"
-      },
-      "original": {
-        "owner": "AdisonCavani",
-        "repo": "distro-grub-themes",
-        "type": "github"
-      }
-    },
     "emacs": {
       "inputs": {
         "nixpkgs": [
@@ -155,24 +134,6 @@
         "type": "github"
       }
     },
-    "flake-utils": {
-      "inputs": {
-        "systems": "systems_2"
-      },
-      "locked": {
-        "lastModified": 1731533236,
-        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
-        "type": "github"
-      },
-      "original": {
-        "owner": "numtide",
-        "repo": "flake-utils",
-        "type": "github"
-      }
-    },
     "gitignore": {
       "inputs": {
         "nixpkgs": [
@@ -496,7 +457,6 @@
       "inputs": {
         "agenix": "agenix",
         "disko": "disko",
-        "distro-grub-themes": "distro-grub-themes",
         "emacs": "emacs",
         "home-manager": "home-manager_2",
         "nix-on-droid": "nix-on-droid",
@@ -576,21 +536,6 @@
         "type": "github"
       }
     },
-    "systems_2": {
-      "locked": {
-        "lastModified": 1681028828,
-        "narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
-        "owner": "nix-systems",
-        "repo": "default",
-        "rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
-        "type": "github"
-      },
-      "original": {
-        "owner": "nix-systems",
-        "repo": "default",
-        "type": "github"
-      }
-    },
     "utils": {
       "locked": {
         "lastModified": 1659877975,
diff --git a/flake.nix b/flake.nix
index e2ab79a..ab35182 100644
--- a/flake.nix
+++ b/flake.nix
@@ -4,11 +4,6 @@
     stable.url = "github:NixOS/nixpkgs/nixos-24.11";
     nixpkgs-droid.url = "github:NixOS/nixpkgs/nixos-24.05";
 
-    distro-grub-themes = {
-      url = "github:AdisonCavani/distro-grub-themes";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
-
     pre-commit-hooks.url = "github:cachix/pre-commit-hooks.nix";
     pre-commit-hooks.inputs.nixpkgs.follows = "nixpkgs";
 
@@ -80,11 +75,10 @@
           };
         };
 
-      nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem rec {
+      nixosConfigurations."thrall" = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
-          inherit system;
         };
         modules = [
           (
@@ -111,11 +105,10 @@
         ];
       };
 
-      nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem rec {
+      nixosConfigurations."dregil" = nixpkgs.lib.nixosSystem {
         system = "x86_64-linux";
         specialArgs = {
           inherit inputs;
-          inherit system;
           stable = import inputs.stable { system = "x86_64-linux"; };
         };
         modules = [ ./hosts/dregil ];
@@ -132,7 +125,7 @@
       nixOnDroidConfigurations.default =
         with inputs;
         nix-on-droid.lib.nixOnDroidConfiguration {
-          pkgs = import nixpkgs-droid { };
+          pkgs = import nixpkgs-droid {};
           modules = [
             ./hosts/redmi
             { nix.registry.nixpkgs.flake = nixpkgs-droid; }
@@ -145,12 +138,29 @@
           system = "x86_64-linux";
           pkgs = import nixpkgs { inherit system; };
         in
-        pkgs.mkShell {
+        pkgs.haskellPackages.shellFor {
           inherit (self.checks.${system}.pre-commit-check) shellHook;
 
-          packages = with pkgs; [
+          packages = p: [
+            p.xmonad
+            p.xmonad-contrib
+          ];
+
+          withHoogle = true;
+
+          buildInputs = with pkgs; [
+            haskellPackages.haskell-language-server
+            haskellPackages.fourmolu
+            haskellPackages.hspec-discover
+            haskellPackages.doctest
+            haskellPackages.xmonad
+            haskellPackages.xmonad-contrib
+            cabal-install
+            ghcid
             nixfmt-rfc-style
             nil
+            hpack
+            hlint
           ];
         };
     };
diff --git a/home/alex/home.nix b/home/alex/home.nix
index 59d08a6..46c4160 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -10,7 +10,6 @@
     ./cli.nix
     ./programs/rofi
     ./programs/xmonad
-    #./programs/i3
     ./programs/jitsi-meet
     ./programs/simplex-chat
     ./programs/zathura
@@ -18,7 +17,7 @@
     ./services/polybar
     ./services/dunst
     ./services/udiskie
-    # ./services/picom
+    ./services/picom
     ./services/screen-locker
     ./services/blueman-applet
     ./services/network-manager
@@ -50,10 +49,9 @@
       uhk-agent # my keyboard
       mosh # ssh via udp
       rclone
-      parallel-disk-usage
-      gdu
 
       # gaming support
+      lutris
       stable.bottles
       wine64Packages.stagingFull
       scummvm
@@ -69,6 +67,7 @@
 
   programs = {
     alacritty.enable = true;
+    # autorandr.enable = true;
 
     browserpass = {
       enable = true;
@@ -112,5 +111,7 @@
     '';
   };
 
+  # services.autorandr = { enable = true; };
+
   xsession.enable = true;
 }
diff --git a/home/alex/programs/emacs/doom/config.el b/home/alex/programs/emacs/doom/config.el
index 284c64f..6724ac0 100644
--- a/home/alex/programs/emacs/doom/config.el
+++ b/home/alex/programs/emacs/doom/config.el
@@ -74,8 +74,6 @@
 
 (setq! undo-limit 80000000                         ; Raise undo-limit to 80Mb
        auto-save-default t                         ; Nobody likes to loose work, I certainly don't
-       switch-to-buffer-in-dedicated-window 'pop
-       switch-to-buffer-obey-display-actions t
        )
 
 ;; tweak some VI defaults
diff --git a/home/alex/programs/i3/default.nix b/home/alex/programs/i3/default.nix
deleted file mode 100644
index e31b1cf..0000000
--- a/home/alex/programs/i3/default.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  config.xsession.windowManager.i3 = {
-    enable = true;
-    config = {
-      modifier = "Mod4";
-    };
-  };
-}
diff --git a/home/alex/services/screen-locker/default.nix b/home/alex/services/screen-locker/default.nix
index 144c11a..5f88146 100644
--- a/home/alex/services/screen-locker/default.nix
+++ b/home/alex/services/screen-locker/default.nix
@@ -7,7 +7,7 @@
 
 {
   config.services.screen-locker = {
-    enable = false;
+    enable = true;
     inactiveInterval = 30;
     lockCmd = "${pkgs.i3lock}/bin/i3lock -n -c 000000";
     xautolock.extraOptions = [ "-detectsleep" ];
diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix
index 6077d33..2880cb7 100644
--- a/hosts/dregil/default.nix
+++ b/hosts/dregil/default.nix
@@ -1,7 +1,9 @@
 {
+  lib,
+  config,
+  pkgs,
   inputs,
   stable,
-  system,
   ...
 }:
 {
@@ -22,13 +24,9 @@
     ../../modules/common-system.nix
     ./configuration.nix
     inputs.home-manager.nixosModules.home-manager
-    inputs.distro-grub-themes.nixosModules.${system}.default
     ../../home/anne/default.nix
     ../../home/alex/default.nix
-    ../../modules/grub-themes
-    ../../modules/hyprland
     ../../modules/podman
     ../../modules/tailscale
-    ../../modules/flatpak.nix
   ];
 }
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
deleted file mode 100644
index 65daef2..0000000
--- a/modules/flatpak.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  services.flatpak.enable = true;
-
-  systemd.services.flatpak-repo = {
-    wantedBy = [ "multi-user.target" ];
-    path = [ pkgs.flatpak ];
-    script = ''
-      flatpak remote-add --if-not-exists flathub https://flathub.org/repo/flathub.flatpakrepo
-    '';
-  };
-}
diff --git a/modules/grub-themes/default.nix b/modules/grub-themes/default.nix
deleted file mode 100644
index 100b81a..0000000
--- a/modules/grub-themes/default.nix
+++ /dev/null
@@ -1,7 +0,0 @@
-{ ... }:
-{
-  config.distro-grub-themes = {
-    enable = true;
-    theme = "nixos";
-  };
-}
diff --git a/modules/hyprland/default.nix b/modules/hyprland/default.nix
deleted file mode 100644
index 300af18..0000000
--- a/modules/hyprland/default.nix
+++ /dev/null
@@ -1,10 +0,0 @@
-{
-  pkgs,
-  ...
-}:
-
-{
-  config.programs.hyprland.enable = true;
-  config.environment.systemPackages = [ pkgs.kitty ];
-  config.environment.sessionVariables.NIXOS_OZONE_WL = "1";
-}
diff --git a/modules/wm/greetd.nix b/modules/wm/greetd.nix
deleted file mode 100644
index 816601e..0000000
--- a/modules/wm/greetd.nix
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-{
-  services.greetd = {
-    enable = true;
-    settings = {
-      default_session = {
-        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --cmd sway";
-        user = "greeter";
-      };
-    };
-  };
-}
diff --git a/modules/wm/sway.nix b/modules/wm/sway.nix
deleted file mode 100644
index 58b9bbb..0000000
--- a/modules/wm/sway.nix
+++ /dev/null
@@ -1,24 +0,0 @@
-{
-  config,
-  pkgs,
-  lib,
-  ...
-}:
-{
-  environment.systemPackages = with pkgs; [
-    grim # screenshot functionality
-    slurp # screenshot functionality
-    wl-clipboard # wl-copy and wl-paste for copy/paste from stdin / stdout
-    mako # notification system developed by swaywm maintainer
-  ];
-
-  # Enable the gnome-keyring secrets vault.
-  # Will be exposed through DBus to programs willing to store secrets.
-  services.gnome.gnome-keyring.enable = true;
-
-  # enable Sway window manager
-  programs.sway = {
-    enable = true;
-    wrapperFeatures.gtk = true;
-  };
-}