diff --git a/lisp/fg42/editor.el b/lisp/fg42/editor.el
index 30d1e7d..a883a59 100644
--- a/lisp/fg42/editor.el
+++ b/lisp/fg42/editor.el
@@ -204,23 +204,13 @@ match all of the components in any order."
      :init
      (savehist-mode))
 
-   (when-not-wm
-    ;; Minibuffer related stuff
     (use! marginalia
       "Adds useful info to minibuffers completions."
-       ;; Bind `marginalia-cycle' locally in the minibuffer.  To make the binding
-      ;; available in the *Completions* buffer, add it to the
-      ;; `completion-list-mode-map'.
-      :bind (:map minibuffer-local-map
-                  ("M-A" . marginalia-cycle))
-
-      ;; The :init section is always executed.
-      :init
-      ;; Since we used `:bind', `use!' assumes `:defer', but we want
-      ;; this mode to start right away.
-      (require 'marginalia)
-      (marginalia-mode))
+      :commands marginalia-mode
+      :hook (emacs-startup . marginalia-mode))
 
+   (when-not-wm
+    ;; Minibuffer related stuff
     (use! ctrlf
       "Single buffer text search."
       :config
diff --git a/nix/fg42.nix b/nix/fg42.nix
index b7e9129..4bc6998 100644
--- a/nix/fg42.nix
+++ b/nix/fg42.nix
@@ -51,7 +51,6 @@
   slock,
 
   supportPython ? true,
-
   supportVerilog ? true,
   svls,
   verilator,
@@ -97,6 +96,7 @@ let
   ]) ++ (lib.optional (supportWM && stdenv.isLinux) [
     # Window manager supports works on Linux only
     xorg.xhost
+    slock
   ]);
 
   paths = map (x: "${x}/bin/") (lib.lists.flatten runtimeBins);