diff --git a/flake.nix b/flake.nix
index 18844f9..e2ab79a 100644
--- a/flake.nix
+++ b/flake.nix
@@ -132,7 +132,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,29 +145,12 @@
           system = "x86_64-linux";
           pkgs = import nixpkgs { inherit system; };
         in
-        pkgs.haskellPackages.shellFor {
+        pkgs.mkShell {
           inherit (self.checks.${system}.pre-commit-check) shellHook;
 
-          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
+          packages = with pkgs; [
             nixfmt-rfc-style
             nil
-            hpack
-            hlint
           ];
         };
     };
diff --git a/home/alex/home.nix b/home/alex/home.nix
index 46c4160..59d08a6 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -10,6 +10,7 @@
     ./cli.nix
     ./programs/rofi
     ./programs/xmonad
+    #./programs/i3
     ./programs/jitsi-meet
     ./programs/simplex-chat
     ./programs/zathura
@@ -17,7 +18,7 @@
     ./services/polybar
     ./services/dunst
     ./services/udiskie
-    ./services/picom
+    # ./services/picom
     ./services/screen-locker
     ./services/blueman-applet
     ./services/network-manager
@@ -49,9 +50,10 @@
       uhk-agent # my keyboard
       mosh # ssh via udp
       rclone
+      parallel-disk-usage
+      gdu
 
       # gaming support
-      lutris
       stable.bottles
       wine64Packages.stagingFull
       scummvm
@@ -67,7 +69,6 @@
 
   programs = {
     alacritty.enable = true;
-    # autorandr.enable = true;
 
     browserpass = {
       enable = true;
@@ -111,7 +112,5 @@
     '';
   };
 
-  # 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 6724ac0..284c64f 100644
--- a/home/alex/programs/emacs/doom/config.el
+++ b/home/alex/programs/emacs/doom/config.el
@@ -74,6 +74,8 @@
 
 (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
new file mode 100644
index 0000000..e31b1cf
--- /dev/null
+++ b/home/alex/programs/i3/default.nix
@@ -0,0 +1,15 @@
+{
+  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 5f88146..144c11a 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 = true;
+    enable = false;
     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 551fa5e..6077d33 100644
--- a/hosts/dregil/default.nix
+++ b/hosts/dregil/default.nix
@@ -29,5 +29,6 @@
     ../../modules/hyprland
     ../../modules/podman
     ../../modules/tailscale
+    ../../modules/flatpak.nix
   ];
 }
diff --git a/modules/flatpak.nix b/modules/flatpak.nix
new file mode 100644
index 0000000..65daef2
--- /dev/null
+++ b/modules/flatpak.nix
@@ -0,0 +1,18 @@
+{
+  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/wm/greetd.nix b/modules/wm/greetd.nix
new file mode 100644
index 0000000..816601e
--- /dev/null
+++ b/modules/wm/greetd.nix
@@ -0,0 +1,18 @@
+{
+  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
new file mode 100644
index 0000000..58b9bbb
--- /dev/null
+++ b/modules/wm/sway.nix
@@ -0,0 +1,24 @@
+{
+  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;
+  };
+}