diff --git a/dotfiles/config/systemd/user/github-notifications.service b/dotfiles/config/systemd/user/github-notifications.service
index 2fac459d..3f26ee3a 100644
--- a/dotfiles/config/systemd/user/github-notifications.service
+++ b/dotfiles/config/systemd/user/github-notifications.service
@@ -5,8 +5,8 @@ After=taffybar.service
 
 [Service]
 Type=simple
-ExecStart=/usr/bin/env notifications-tray-icon --github-pass-token github-token
-ExecStop=/usr/bin/pkill 'notifications-tray-icon --github-pass-token github-token'
+ExecStart=/usr/bin/env notifications-tray-icon --github-token-pass github-token
+ExecStop=/usr/bin/pkill 'notifications-tray-icon --github-token-pass github-token'
 
 [Install]
 WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/keepassx.service b/dotfiles/config/systemd/user/keepassx.service
deleted file mode 100644
index f1e75228..00000000
--- a/dotfiles/config/systemd/user/keepassx.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=KeePassX
-Wants=taffybar.service
-After=taffybar.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/env keepassxc --keyfile="$HOME/SparkleShare/config/creds/keepass.key" "$HOME/SparkleShare/config/db.kdbx"
-ExecStop=/usr/bin/pkill keepassxc
-
-[Install]
-WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/keybase.service b/dotfiles/config/systemd/user/keybase.service
deleted file mode 100644
index fe30c2bb..00000000
--- a/dotfiles/config/systemd/user/keybase.service
+++ /dev/null
@@ -1,12 +0,0 @@
-[Unit]
-Description=Keybase
-Wants=taffybar.service
-After=taffybar.service
-
-[Service]
-Type=forking
-ExecStart=/usr/bin/env run_keybase
-PIDFile=$XDG_RUNTIME_DIR/keybase/keybased.pid
-
-[Install]
-WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/pasystray.service b/dotfiles/config/systemd/user/pasystray.service
index 16c0c5c9..3997b938 100644
--- a/dotfiles/config/systemd/user/pasystray.service
+++ b/dotfiles/config/systemd/user/pasystray.service
@@ -6,7 +6,7 @@ After=taffybar.service
 [Service]
 Type=simple
 ExecStart=/usr/bin/env pasystray
-ExecStop=/usr/bin/pkill pasystray
+ExecStop=/usr/bin/env pkill pasystray
 
 [Install]
 WantedBy=wm.target
diff --git a/dotfiles/config/systemd/user/remmina.service b/dotfiles/config/systemd/user/remmina.service
deleted file mode 100644
index f6d497ca..00000000
--- a/dotfiles/config/systemd/user/remmina.service
+++ /dev/null
@@ -1,13 +0,0 @@
-[Unit]
-Description=remmina
-Wants=taffybar.service
-After=taffybar.service
-
-[Service]
-Type=simple
-ExecStart=/usr/bin/remmina -i
-ExecStop=/usr/bin/pkill remmina
-RemainAfterExit=Yes
-
-[Install]
-WantedBy=wm.target
diff --git a/nixos/configuration.nix b/nixos/configuration.nix
index 06e8665e..b2d7c219 100644
--- a/nixos/configuration.nix
+++ b/nixos/configuration.nix
@@ -52,6 +52,37 @@ let
       makeWrapper libtool gnome3.gnome-common
     ];
   });
+  keybase-gui-fixed = with pkgs; keybase-gui.overrideAttrs (oldAttrs: rec {
+    installPhase = ''
+    mkdir -p $out/bin
+    mv usr/share $out/share
+    mv opt/keybase $out/share/
+    cat > $out/bin/keybase-gui <<EOF
+    #!${stdenv.shell}
+    checkFailed() {
+      if [ "\$NIX_SKIP_KEYBASE_CHECKS" = "1" ]; then
+        return
+      fi
+      echo "Set NIX_SKIP_KEYBASE_CHECKS=1 if you want to skip this check." >&2
+      exit 1
+    }
+    if [ ! -S "\$XDG_RUNTIME_DIR/keybase/keybased.sock" ]; then
+      echo "Keybase service doesn't seem to be running." >&2
+      echo "You might need to run: keybase service" >&2
+      checkFailed
+    fi
+    if [ -z "\$(keybase status | grep kbfsfuse)" ]; then
+      echo "Could not find kbfsfuse client in keybase status." >&2
+      echo "You might need to run: kbfsfuse" >&2
+      checkFailed
+    fi
+    exec $out/share/keybase/Keybase "\$@"
+    EOF
+    chmod +x $out/bin/keybase-gui
+    substituteInPlace $out/share/applications/keybase.desktop \
+      --replace run_keybase $out/bin/keybase-gui
+  '';
+  });
 in
 {
   nixpkgs.config.allowUnfree = true;
@@ -105,7 +136,7 @@ in
     kleopatra
     google-chrome
     hexchat
-    keybase-gui
+    keybase-gui-fixed
     kodi
     lxappearance
     rxvt_unicode
@@ -195,6 +226,7 @@ in
     valgrind
     wget
     wmctrl
+    xorg.xev
     zsh
 
     # Nix
@@ -229,6 +261,7 @@ in
       userServices = true;
     };
   };
+  services.kbfs.enable = true;
   sound.enable = true;
   hardware.pulseaudio.enable = true;
 
@@ -242,7 +275,6 @@ in
     };
     windowManager = {
       default = "xmonad";
-      i3.enable = true;
       session = [{
         name = "xmonad";
         start = ''