diff --git a/flake.nix b/flake.nix
index c1eb2e6..8adabfb 100644
--- a/flake.nix
+++ b/flake.nix
@@ -149,6 +149,7 @@
             cabal-install
             ghcid
             nixfmt-rfc-style
+            nil
             hpack
             hlint
           ];
diff --git a/home/alex/home.nix b/home/alex/home.nix
index 70cf434..2611ef1 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
   imports = [
@@ -17,6 +22,7 @@
     ./services/network-manager
     ./services/syncthing
     ./services/git-sync
+    ./modules/email.nix
   ];
 
   home = {
@@ -27,8 +33,11 @@
 
     keyboard.layout = "us";
     keyboard.variant = "dvorak";
-    keyboard.options =
-      [ "terminate:ctrl_alt_bksp" "caps:escape" "compose:ralt" ];
+    keyboard.options = [
+      "terminate:ctrl_alt_bksp"
+      "caps:escape"
+      "compose:ralt"
+    ];
 
     packages = with pkgs; [
       # social
@@ -41,7 +50,8 @@
 
       # gaming support
       lutris
-      winePackages.stagingFull
+      bottles
+      wine64Packages.stagingFull
 
       # reading
       calibre
@@ -66,23 +76,27 @@
       enable = true;
       package = pkgs.firefox.override {
         cfg = {
-          nativeMessagingHosts.packages =
-            [ pkgs.browserpass pkgs.tridactyl-native ];
+          nativeMessagingHosts.packages = [
+            pkgs.browserpass
+            pkgs.tridactyl-native
+          ];
           enableGnomeExtensions = true;
         };
       };
     };
     mpv.enable = true;
 
-    zsh = let
-      auth-socket-env = ''
-        export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)"
-      '';
-    in {
-      enable = true;
-      loginExtra = auth-socket-env;
-      initExtra = auth-socket-env;
-    };
+    zsh =
+      let
+        auth-socket-env = ''
+          export SSH_AUTH_SOCK="$(${pkgs.gnupg}/bin/gpgconf -L agent-ssh-socket)"
+        '';
+      in
+      {
+        enable = true;
+        loginExtra = auth-socket-env;
+        initExtra = auth-socket-env;
+      };
   };
 
   services.gpg-agent = {
diff --git a/home/alex/modules/email.nix b/home/alex/modules/email.nix
new file mode 100644
index 0000000..4fd4d65
--- /dev/null
+++ b/home/alex/modules/email.nix
@@ -0,0 +1,39 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+{
+  programs.mbsync.enable = true;
+  programs.msmtp.enable = true;
+  programs.notmuch = {
+    enable = true;
+    hooks.preNew = "mbsync --all";
+  };
+
+  accounts.email = {
+    accounts.failco = {
+      address = "me@failco.de";
+      gpg = {
+        key = "F2132F0C63730C6BC42BCC2A41A6D13FECA21280";
+        signByDefault = true;
+      };
+      imap.host = "thrall.failco.de";
+      mbsync = {
+        enable = true;
+        create = "maildir";
+      };
+      msmtp.enable = true;
+      notmuch.enable = true;
+      primary = true;
+      realName = "Alexander Kobjolke";
+      passwordCommand = "gopass --nosync show -o eMail/failco.de/me@failco.de";
+      smtp = {
+        host = "thrall.failco.de";
+      };
+      userName = "me@failco.de";
+    };
+  };
+}
diff --git a/home/alex/programs/emacs/doom/init.el b/home/alex/programs/emacs/doom/init.el
index 7e79c76..6163748 100644
--- a/home/alex/programs/emacs/doom/init.el
+++ b/home/alex/programs/emacs/doom/init.el
@@ -177,8 +177,8 @@
        ;;zig               ; C, but simpler
 
        :email
-       (mu4e +org +gmail)
-       ;;notmuch
+       ;; (mu4e +org +gmail)
+       (notmuch +org +afew)
        ;;(wanderlust +gmail)
 
        :app
diff --git a/home/alex/programs/jq/default.nix b/home/alex/programs/jq/default.nix
index 22b3462..2504774 100644
--- a/home/alex/programs/jq/default.nix
+++ b/home/alex/programs/jq/default.nix
@@ -1,5 +1,12 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 {
-  programs.jq = { enable = true; };
+  programs.jq = {
+    enable = true;
+  };
 }
diff --git a/home/alex/programs/xmonad/config.hs b/home/alex/programs/xmonad/config.hs
index 6a572b8..a4a806a 100644
--- a/home/alex/programs/xmonad/config.hs
+++ b/home/alex/programs/xmonad/config.hs
@@ -100,6 +100,7 @@ myConfig =
                     [ namedScratchpadManageHook scratchpads
                     , isDialog --> doFloat
                     , isFullscreen --> doFullFloat
+                    , className =? "steam_proton" --> doFloat
                     , manageHook def
                     ]
             }