diff --git a/.profile b/.profile
old mode 100644
new mode 100755
index 8fe35c5..2784b2c
--- a/.profile
+++ b/.profile
@@ -4,22 +4,19 @@
 
 ulimit -c unlimited
 
-export MESA_LOADER_DRIVER_OVERRIDE=crocus
-
 export PATH="$HOME/.local/bin:$PATH"
 export PATH="$HOME/go/bin:$PATH"
-# export PATH="$HOME/.local/share/theme.sh:$PATH"
-
-export MOZ_ENABLE_WAYLAND=1
 
 export EDITOR=kak
 
 export FZF_DEFAULT_COMMAND='rg -L --hidden --files'
 export FZF_CTRL_T_COMMAND='rg -L --hidden --files'
 
+export MOZ_ENABLE_WAYLAND=1
+
 export QT_WAYLAND_DISABLE_WINDOWDECORATION=1
 
-export XKB_DEFAULT_LAYOUT=us #-nulo
+export XKB_DEFAULT_LAYOUT=us
 export XKB_DEFAULT_VARIANT=altgr-intl
 export XKB_DEFAULT_OPTIONS=caps:escape
 
diff --git a/.profile.cauquenitx b/.profile.cauquenitx
new file mode 100755
index 0000000..30f2bb5
--- /dev/null
+++ b/.profile.cauquenitx
@@ -0,0 +1,3 @@
+#!/bin/sh
+
+export REMOTE=true
diff --git a/.profile.x69 b/.profile.x69
new file mode 100755
index 0000000..bd1026d
--- /dev/null
+++ b/.profile.x69
@@ -0,0 +1,4 @@
+#!/bin/sh
+
+export MESA_LOADER_DRIVER_OVERRIDE=crocus
+
diff --git a/.zprofile b/.zprofile
new file mode 100755
index 0000000..50c3f69
--- /dev/null
+++ b/.zprofile
@@ -0,0 +1,8 @@
+. ~/.profile
+test ! "$REMOTE" \
+&& test "$(tty)" = /dev/tty1 \
+&& exec env \
+    XDG_CURRENT_DESKTOP=river \
+    XDG_SESSION_DESKTOP=river \
+        dbus-run-session river
+. ~/.zshrc
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..9ab4934
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,54 @@
+source ~/.profile
+test -f "~/.profile.$(hostname)" && source "~/.profile.$(hostname)"
+
+HISTFILE=~/.histfile
+HISTSIZE=100000
+SAVEHIST=100000
+
+setopt autocd extendedglob notify
+bindkey -e
+bindkey "^[[1;5C" forward-word
+bindkey "^[[1;5D" backward-word
+
+zmodload zsh/complist
+zstyle ':completion:*' menu yes select
+
+zstyle ':completion:*' list-dirs-first yes
+zstyle ':completion:*' matcher-list '' 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+
+zstyle :compinstall filename ~/.zshrc
+autoload -Uz compinit && compinit
+
+autoload -Uz zcalc
+
+autoload -Uz vcs_info
+zstyle ':vcs_info:*' actionformats \
+  '%F{4}[%F{2}%b%F{3}|%F{1}%a%F{4}]%f '
+zstyle ':vcs_info:*' formats '%F{4}%b%f '
+zstyle ':vcs_info:*' enable git
+precmd () { vcs_info }
+
+setopt promptsubst
+PS1='%F{5}%3~ ${vcs_info_msg_0_}%f%# '
+test "$REMOTE" && PS1='%n@%m '$PS1
+
+alias ls='ls --color=always'
+alias grep='grep --color=always'
+
+alias gitdf='git --git-dir=$HOME/.config/dotfiles/ --work-tree=$HOME'
+alias ssh='TERM=xterm-256color ssh'
+alias e="$EDITOR"
+alias r="trash -r"
+
+source /usr/share/fzf/key-bindings.zsh
+source ~/.config/zsh_bg_notify.zsh
+source ~/.config/zsh_osc_7.zsh
+
+if test ! "$REMOTE"; then
+  unset SSH_AGENT_PID
+  if [ "${gnupg_SSH_AUTH_SOCK_by:-0}" -ne $$ ]; then
+    # Start if not started
+    gpg-agent --daemon 2>/dev/null
+    export SSH_AUTH_SOCK="$(gpgconf --list-dirs agent-ssh-socket)"
+  fi
+fi