diff --git a/flake.lock b/flake.lock
index 621f502..8a02b4d 100644
--- a/flake.lock
+++ b/flake.lock
@@ -89,11 +89,11 @@
         "nixpkgs-stable": "nixpkgs-stable"
       },
       "locked": {
-        "lastModified": 1710176745,
-        "narHash": "sha256-3Av9cY2xw8Lbq56o23uKwYbbrjH4We0SqveKNejlHpU=",
+        "lastModified": 1702399955,
+        "narHash": "sha256-FnB5O1RVFzj3h7Ayf7UxFnOL1gsJuG6gn1LCTd9dKFs=",
         "owner": "nix-community",
         "repo": "emacs-overlay",
-        "rev": "30fdb303a64d5fcbbaf0609b75d3c9c783af7869",
+        "rev": "47798c4ab07d5f055bb2625010cf6d8e3f384923",
         "type": "github"
       },
       "original": {
@@ -139,11 +139,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1701680307,
+        "narHash": "sha256-kAuep2h5ajznlPMD9rnQyffWG8EM/C73lejGofXvdM8=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "4022d587cbbfd70fe950c1e2083a02621806a725",
         "type": "github"
       },
       "original": {
@@ -219,11 +219,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1710164657,
-        "narHash": "sha256-l64+ZjaQAVkHDVaK0VHwtXBdjcBD6nLBD+p7IfyBp/w=",
+        "lastModified": 1702538064,
+        "narHash": "sha256-At5GwJPu2tzvS9dllhBoZmqK6lkkh/sOp2YefWRlaL8=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "017b12de5b899ef9b64e2c035ce257bfe95b8ae2",
+        "rev": "0e2e443ff24f9d75925e91b89d1da44b863734af",
         "type": "github"
       },
       "original": {
@@ -403,16 +403,16 @@
     },
     "nixpkgs-stable": {
       "locked": {
-        "lastModified": 1710021367,
-        "narHash": "sha256-FuMVdWqXMT38u1lcySYyv93A7B8wU0EGzUr4t4jQu8g=",
+        "lastModified": 1702221085,
+        "narHash": "sha256-Br3GCSkkvkmw46cT6wCz6ro2H1WgDMWbKE0qctbdtL0=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "b94a96839afcc56de3551aa7472b8d9a3e77e05d",
+        "rev": "c2786e7084cbad90b4f9472d5b5e35ecb57958af",
         "type": "github"
       },
       "original": {
         "owner": "NixOS",
-        "ref": "nixos-23.11",
+        "ref": "nixos-23.05",
         "repo": "nixpkgs",
         "type": "github"
       }
@@ -435,11 +435,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1709961763,
-        "narHash": "sha256-6H95HGJHhEZtyYA3rIQpvamMKAGoa8Yh2rFV29QnuGw=",
+        "lastModified": 1705316053,
+        "narHash": "sha256-J2Ey5mPFT8gdfL2XC0JTZvKaBw/b2pnyudEXFvl+dQM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3030f185ba6a4bf4f18b87f345f104e6a6961f34",
+        "rev": "c3e128f3c0ecc1fb04aef9f72b3dcc2f6cecf370",
         "type": "github"
       },
       "original": {
diff --git a/home/alex/home.nix b/home/alex/home.nix
index a1a3a3b..e88d65b 100644
--- a/home/alex/home.nix
+++ b/home/alex/home.nix
@@ -5,7 +5,6 @@
     ./cli.nix
     ./programs/rofi
     ./programs/xmonad
-    ./programs/jitsi-meet
     ./services/polybar
     ./services/dunst
     ./services/udiskie
@@ -27,7 +26,15 @@
 
     packages = with pkgs; [
       # social
-      jitsi-meet-electron
+      (jitsi-meet-electron.overrideAttrs (prev: rec {
+        version = "2023.10.0";
+        src = fetchurl {
+          url =
+            "https://github.com/jitsi/jitsi-meet-electron/releases/download/v${version}/jitsi-meet-x86_64.AppImage";
+          sha256 = "sha256-zhOx/gdsiQMuOCCE5sn+JNu0WJrH36XfvqqNvE24St8=";
+          name = "jitsi-meet-electron-${version}.AppImage";
+        };
+      })) # jitsi as a stand-alone app
       discord # talk to other people
 
       # system tools
@@ -83,9 +90,6 @@
     enable = true;
     enableSshSupport = true;
     sshKeys = [ "9027AB16B9A7C20BD29F30F55CBA054430BF014C" ];
-    extraConfig = ''
-      pinentry-program ${pkgs.pinentry.qt}/bin/pinentry
-    '';
   };
 
   # services.autorandr = { enable = true; };
diff --git a/home/alex/programs/emacs/doom/packages.el b/home/alex/programs/emacs/doom/packages.el
index 153917b..d9480ae 100644
--- a/home/alex/programs/emacs/doom/packages.el
+++ b/home/alex/programs/emacs/doom/packages.el
@@ -69,6 +69,5 @@
 (package! org-super-agenda)
 (package! org-ql)
 (package! org-bookmark-heading)
-(package! activities
-  :recipe (:host github :repo "alphapapa/activities.el" :branch "master"))
+(package! activities)
 (package! elfeed-web)
diff --git a/home/alex/programs/jitsi-meet/default.nix b/home/alex/programs/jitsi-meet/default.nix
deleted file mode 100644
index 1037a92..0000000
--- a/home/alex/programs/jitsi-meet/default.nix
+++ /dev/null
@@ -1,5 +0,0 @@
-{ config, lib, pkgs, ... }:
-
-{
-  config.home.packages = [ pkgs.jitsi-meet-electron ];
-}
diff --git a/home/alex/programs/xmonad/config.hs b/home/alex/programs/xmonad/config.hs
index c0d1cef..7e262e6 100644
--- a/home/alex/programs/xmonad/config.hs
+++ b/home/alex/programs/xmonad/config.hs
@@ -116,7 +116,7 @@ myConfig =
                                  , ("M-g", WS.prevWS)
                                  , ("M-r", WS.nextWS)
                                  , -- scratchpads
-                                   ("M-s M-s", namedScratchpadAction scratchpads "notes")
+                                   ("M-s n", namedScratchpadAction scratchpads "notes")
                                  , ("M-s s", namedScratchpadAction scratchpads "shell")
                                  , -- backlight control
 
diff --git a/home/alex/services/screen-locker/default.nix b/home/alex/services/screen-locker/default.nix
index 9f714e6..43d5e3d 100644
--- a/home/alex/services/screen-locker/default.nix
+++ b/home/alex/services/screen-locker/default.nix
@@ -5,6 +5,6 @@
     enable = true;
     inactiveInterval = 30;
     lockCmd = "${pkgs.betterlockscreen}/bin/betterlockscreen -l dim";
-    xautolock.extraOptions = [ "-killer 'systemctl suspend'" ];
+    xautolock.extraOptions = [ "Xautolock.killer: systemctl suspend" ];
   };
 }
diff --git a/hosts/dregil/configuration.nix b/hosts/dregil/configuration.nix
index 186fa29..cd23964 100644
--- a/hosts/dregil/configuration.nix
+++ b/hosts/dregil/configuration.nix
@@ -101,7 +101,7 @@ in {
   services.blueman.enable = true;
 
   # Open ports in the firewall.
-  networking.firewall.allowedTCPPorts = [ 5223 ];
+  # networking.firewall.allowedTCPPorts = [ ... ];
   # networking.firewall.allowedUDPPorts = [ ... ];
   # Or disable the firewall altogether.
   # networking.firewall.enable = false;
diff --git a/hosts/dregil/default.nix b/hosts/dregil/default.nix
index c670933..a7c278f 100644
--- a/hosts/dregil/default.nix
+++ b/hosts/dregil/default.nix
@@ -2,8 +2,7 @@
   imports = [
     ({ inputs, lib, ... }: {
       nixpkgs = { config.allowUnfree = true; };
-      nix.registry =
-        lib.mkForce (lib.mapAttrs (_: value: { flake = value; }) inputs);
+      nix.registry = lib.mapAttrs (_: value: { flake = value; }) inputs;
     })
     ../../modules/security.nix
     ../../modules/common-system.nix
diff --git a/modules/wm/x.nix b/modules/wm/x.nix
index cb669fb..0159bf6 100644
--- a/modules/wm/x.nix
+++ b/modules/wm/x.nix
@@ -8,10 +8,9 @@
     xserver = {
       enable = true;
 
-      xkb = {
-        options = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
-        layout = "us";
-      };
+      layout = "us";
+
+      xkbOptions = "terminate:ctrl_alt_bksp,caps:escape,compose:ralt";
 
       videoDrivers = [ "nvidia" ]; # "modesetting" ];