diff --git a/bash.org b/bash.org
index 7dcdba7..634e876 100644
--- a/bash.org
+++ b/bash.org
@@ -114,20 +114,10 @@ dircolors --print-database uses its own built-in database instead of using /etc/
   export PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]"
 #+END_SRC
 
-** SSH Agent
-#+begin_src bash
-# if ! pgrep -u "$USER" ssh-agent > /dev/null; then
-#     ssh-agent > "$XDG_RUNTIME_DIR/ssh-agent.env"
-# fi
-# if [[ ! "$SSH_AUTH_SOCK" ]]; then
-#     eval "$(<"$XDG_RUNTIME_DIR/ssh-agent.env")"
-# fi
-#+end_src
-
 ** Rebind up and down arrow keys to search through bash history
 #+BEGIN_SRC bash
-bind '"\e[A": history-search-backward'
-bind '"\e[B": history-search-forward'
+  bind '"\e[A": history-search-backward'
+  bind '"\e[B": history-search-forward'
 #+END_SRC
 
 ** Aliases
@@ -387,6 +377,13 @@ This is important for termite to work when sshing in remote machines.
   export PATH
 #+END_SRC
 
+** Automatically run =startx=
+#+begin_src bash
+  if [ -z "${DISPLAY}" ] && [ "${XDG_VTNR}" -eq 1 ]; then
+      exec startx
+  fi
+#+end_src
+
 * Input
 :PROPERTIES:
 :header-args: :tangle ~/.inputrc
diff --git a/xconfig.org b/xconfig.org
index 7b52d7f..3aa35a8 100644
--- a/xconfig.org
+++ b/xconfig.org
@@ -397,10 +397,20 @@ Merge in defaults and keymaps
   fi
 #+END_SRC
 
+Start =gnome-keyring-daemon=.
+#+begin_src bash
+  eval $(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)
+  export SSH_AUTH_SOCK
+#+end_src
+
 #+begin_src bash
   [ -f ~/.xprofile ] && . ~/.xprofile
 #+end_src
 
+#+begin_src bash
+  exec i3
+#+end_src
+
 * Xprofile
 :PROPERTIES:
 :header-args:  :tangle ~/.xprofile
@@ -440,16 +450,8 @@ Start programs related to display.
   picom --daemon &
 #+end_src
 
-Start other applications
 #+begin_src bash
-  # Start Power Manager
-  xfce4-power-manager &
-
-  # Aria2c daemon
-  # aria2c &
-
   # Mopidy
-  # mopidy --config ~/.config/mopidy/mopidy.conf >/dev/null 2>&1 &
   systemctl --user start mopidy
 #+end_src