diff --git a/home/features/cli/default.nix b/home/features/cli/default.nix
index 99eb821..8eb3763 100644
--- a/home/features/cli/default.nix
+++ b/home/features/cli/default.nix
@@ -18,8 +18,8 @@
   };
   home.packages = with pkgs; [
     bc
-    busybox
     comma
+    coreutils
     direnv
     exa
     fd
diff --git a/home/features/cli/fish.nix b/home/features/cli/fish.nix
index 79e9eeb..812a736 100644
--- a/home/features/cli/fish.nix
+++ b/home/features/cli/fish.nix
@@ -24,6 +24,7 @@ in {
         set -x WEBKIT_DISABLE_COMPOSITING_MODE 1
         set -x EDITOR emacsclient
         set -x VISUAL emacsclient
+        set -x TERMINAL alacritty
         set -x XDG_DATA_HOME $HOME/.local/share
         set -x FZF_ALT_C_COMMAND fd --type d --exclude .git --follow --hidden
         set -x FZF_DEFAULT_COMMAND fd --type f --exclude .git --follow --hidden
diff --git a/home/features/cli/secrets.nix b/home/features/cli/secrets.nix
index 30e1579..cf81a83 100644
--- a/home/features/cli/secrets.nix
+++ b/home/features/cli/secrets.nix
@@ -12,7 +12,7 @@ in {
 
     programs.password-store = {
       enable = true;
-      package = pkgs.pass.withExtensions (exts: [ exts.pass-otp exts.pass-import ]);
+      package = pkgs.pass-wayland.withExtensions (exts: [ exts.pass-otp exts.pass-import ]);
     };
     programs.gpg = { enable = true; };
     services.gpg-agent = {
diff --git a/home/features/desktop/default.nix b/home/features/desktop/default.nix
index 161e9ef..31bdbed 100644
--- a/home/features/desktop/default.nix
+++ b/home/features/desktop/default.nix
@@ -23,6 +23,7 @@
     NIXOS_OZONE_WL = "1";
     EDITOR = "emacs";
     VISUAL = "emacs";
+    TERMINAL = "alacritty";
     QT_QPA_PLATFORM = "wayland";
     XDG_CONFIG_HOME = "\${HOME}/.config";
     XDG_BIN_HOME = "\${HOME}/.local/bin";
diff --git a/hosts/m3-nix/default.nix b/hosts/m3-nix/default.nix
index 996a08c..112e838 100644
--- a/hosts/m3-nix/default.nix
+++ b/hosts/m3-nix/default.nix
@@ -131,7 +131,9 @@ in {
     };
     optimise.automatic = true;
   };
-
+  systemd.extraConfig = ''
+    DefaultTimeoutStopSec=10s
+  '';
   nixpkgs.config.allowUnfree = true;
 
   # This value determines the NixOS release from which the default