diff --git a/scripts/menu/menu-otp b/scripts/menu/menu-otp
deleted file mode 100755
index 8dbcf82..0000000
--- a/scripts/menu/menu-otp
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/bin/sh
-# OTP script for 'pass'
-
-PASSWORD_STORE_DIR="$XDG_DATA_HOME/password-store"
-
-# Ask for password name in vault
-password="$(find "$PASSWORD_STORE_DIR" -type f -name '*.gpg' |
-    sed "s@$PASSWORD_STORE_DIR/@@g ; s@.gpg@@g" | menu "OTP:")"
-
-# Exit if none chosen
-[ -z "$password" ] && exit
-
-# Otherwise, copy to clipboard and notify OTP
-pass otp "$password" | while read -r OUTPUT; do
-    echo $OUTPUT | xsel -ib
-    xdotool type "$OUTPUT"
-    [ -e /usr/bin/notify-send ] && notify-send " $password" "$OUTPUT"
-done
diff --git a/scripts/menu/menu-pass b/scripts/menu/menu-pass
index c1d437b..7b943b9 100755
--- a/scripts/menu/menu-pass
+++ b/scripts/menu/menu-pass
@@ -1,6 +1,5 @@
 #!/bin/sh
 # menu for 'pass'
-PASSWORD_STORE_DIR="$HOME/.local/share/password-store"
 MENU="$HOME/.config/scripts/menu/menu"
 
 password="$(find "$PASSWORD_STORE_DIR" -type f -name '*.gpg' | sed "s@$PASSWORD_STORE_DIR/@@g ; s@.gpg@@g" | $MENU "Pass:")"
diff --git a/scripts/sway/swayotp b/scripts/sway/swayotp
index cc2e3f1..4c79d6d 100755
--- a/scripts/sway/swayotp
+++ b/scripts/sway/swayotp
@@ -1,5 +1,6 @@
 #!/bin/sh
+PASSWORD_STORE_DIR="$HOME/.local/share/password-store"
 
 password="$(~/.config/scripts/menu/menu-pass)"
 [ -z "$password" ] && exit
-wtype $(pass otp "$password")
+wtype $(pass otp "$password" | head -n 1)
diff --git a/scripts/sway/swaypass b/scripts/sway/swaypass
index 8f8bfad..3a66dd6 100755
--- a/scripts/sway/swaypass
+++ b/scripts/sway/swaypass
@@ -1,4 +1,5 @@
 #!/bin/sh
+PASSWORD_STORE_DIR="$HOME/.local/share/password-store"
 
 password="$(~/.config/scripts/menu/menu-pass)"
 [ -z "$password" ] && exit
diff --git a/sway/config b/sway/config
index 5d6e8de..dc0e9cb 100644
--- a/sway/config
+++ b/sway/config
@@ -118,3 +118,4 @@ bar {
 
 # Autostart
 exec_always dunst
+exec_always dbus-update-activation-environment WAYLAND_DISPLAY
diff --git a/vim/vimrc b/vim/vimrc
index 66e96a2..bc9e5fe 100644
--- a/vim/vimrc
+++ b/vim/vimrc
@@ -118,7 +118,6 @@ Plug 'junegunn/goyo.vim'
 Plug 'mhinz/vim-signify'
 Plug 'ibhagwan/fzf-lua'
 Plug 'morhetz/gruvbox'
-Plug 'vimwiki/vimwiki'
 "Plug 'dracula/vim'
 call plug#end()