diff --git a/home/features/cli/pass.nix b/home/features/cli/pass.nix
index f9a153f..2b73b94 100644
--- a/home/features/cli/pass.nix
+++ b/home/features/cli/pass.nix
@@ -5,7 +5,6 @@ in
   programs.password-store = {
     enable = true;
     settings.PASSWORD_STORE_DIR = storePath;
-    package = pkgs.pass;
   };
 
   services.pass-secret-service = {
@@ -17,5 +16,6 @@ in
     pkgs.wofi-pass
   ];
 
+  programs.browserpass.enable = config.programs.firefox.enable;
   satellite.persistence.at.data.apps.pass.directories = [ storePath ];
 }
diff --git a/home/features/desktop/firefox/default.nix b/home/features/desktop/firefox/default.nix
index 806b1dc..9192d03 100644
--- a/home/features/desktop/firefox/default.nix
+++ b/home/features/desktop/firefox/default.nix
@@ -17,6 +17,7 @@ let
     ublock-origin
     unpaywall
     user-agent-string-switcher
+    browserpass # Password store support
   ];
   # }}}
 in
diff --git a/home/tethys.nix b/home/tethys.nix
index 291a19b..6907ac6 100644
--- a/home/tethys.nix
+++ b/home/tethys.nix
@@ -10,7 +10,7 @@
     ./features/cli/pass.nix
     ./features/neovim
 
-    ./features/xorg/xmonad.nix
+    # ./features/xorg/xmonad.nix
     ./features/wayland/hyprland
   ];
 
diff --git a/hosts/nixos/common/global/wireless/default.nix b/hosts/nixos/common/global/wireless/default.nix
index 16e28c5..39e59a8 100644
--- a/hosts/nixos/common/global/wireless/default.nix
+++ b/hosts/nixos/common/global/wireless/default.nix
@@ -19,6 +19,7 @@
       "R15-5365".psk = "@TG_WIFI_HOME_PASS@";
 
       "Sailhorse".psk = "@NL_PLACE_0_PASS@";
+      "InfoEdu12".psk = "@INFOEDU_PASS@";
 
       # [Working solution](https://bbs.archlinux.org/viewtopic.php?id=271336)
       # [Other interesting link](https://help.itc.rwth-aachen.de/en/service/b3d9a2c8ae5345b8b8f5128143ef4e3c/article/eaf6d69389a74a5a839c1f383c508df7/)
diff --git a/hosts/nixos/common/global/wireless/wifi_passwords.age b/hosts/nixos/common/global/wireless/wifi_passwords.age
index 2078ed6..3f988d5 100644
Binary files a/hosts/nixos/common/global/wireless/wifi_passwords.age and b/hosts/nixos/common/global/wireless/wifi_passwords.age differ
diff --git a/hosts/nixos/common/optional/lightdm.nix b/hosts/nixos/common/optional/lightdm.nix
index 1dd7977..6a6eebe 100644
--- a/hosts/nixos/common/optional/lightdm.nix
+++ b/hosts/nixos/common/optional/lightdm.nix
@@ -19,7 +19,8 @@ in
   };
 
   # Set default display manager
-  services.xserver.displayManager.defaultSession = lib.mkDefault "hyprland";
+  # services.xserver.displayManager.defaultSession = lib.mkDefault "hyprland";
+  services.xserver.displayManager.defaultSession = lib.mkDefault "none+xmonad";
 
   stylix.targets.lightdm.enable = true;
 }
diff --git a/hosts/nixos/common/optional/xmonad/default.nix b/hosts/nixos/common/optional/xmonad/default.nix
index b1791b6..d09b471 100644
--- a/hosts/nixos/common/optional/xmonad/default.nix
+++ b/hosts/nixos/common/optional/xmonad/default.nix
@@ -1,5 +1,6 @@
 { config, ... }:
 {
+  import = [ ../touchpad.nix ];
   services.xserver = {
     enable = true;
 
diff --git a/hosts/nixos/tethys/default.nix b/hosts/nixos/tethys/default.nix
index 88295d5..1184611 100644
--- a/hosts/nixos/tethys/default.nix
+++ b/hosts/nixos/tethys/default.nix
@@ -5,6 +5,8 @@
 
     ../common/optional/pipewire.nix
     ../common/optional/greetd.nix
+    # ../common/optional/xmonad
+    # ../common/optional/lightdm.nix
     ../common/optional/steam.nix
     ../common/optional/slambda.nix
     ../common/optional/xdg-portal.nix
@@ -35,4 +37,10 @@
   # TODO: is this useful outside of home-manager?
   stylix.targets.gtk.enable = true;
   # }}}
+  # {{{ Some ad-hoc site blocking
+  networking.extraHosts = ''
+    127.0.0.1 twitter.com
+    127.0.0.1 www.reddit.com
+  '';
+  # }}}
 }