diff --git a/config/.bashrc b/config/.bashrc
index 5ff47aa..85928f1 100644
--- a/config/.bashrc
+++ b/config/.bashrc
@@ -1,19 +1,8 @@
 # If not running interactively, don't do anything
 [[ $- != *i* ]] && return
 
-#  _____ _   ___     _____ ____   ___  _   _ __  __ _____ _   _ _____
-# | ____| \ | \ \   / /_ _|  _ \ / _ \| \ | |  \/  | ____| \ | |_   _|
-# |  _| |  \| |\ \ / / | || |_) | | | |  \| | |\/| |  _| |  \| | | |
-# | |___| |\  | \ V /  | ||  _ <| |_| | |\  | |  | | |___| |\  | | |
-# |_____|_| \_|  \_/  |___|_| \_\\___/|_| \_|_|  |_|_____|_| \_| |_|
-#
-
 export DOTFILES="$HOME/dotfiles"
 
-export TERM=kitty
-export EDITOR=nvim
-export VISUAL=nvim
-
 export HISTSIZE=10000
 
 # Go ENVs
@@ -21,10 +10,10 @@ export GO111MODULE=auto
 export GOBIN="$HOME/go/bin"
 
 MY_BIN="$DOTFILES/bin"
-RUSTBIN="$HOME/.cargo/bin"
+RUST_BIN="$HOME/.cargo/bin"
 PYTHON_BIN="$HOME/.local/bin"
 
-export PATH="$PATH:$MY_BIN:$PYTHON_BIN:$RUSTBIN:$GOBIN"
+export PATH="$PATH:$MY_BIN:$PYTHON_BIN:$RUST_BIN"
 
 # Source bash completions
 source $HOME/.config/bash-completions/*
@@ -32,9 +21,6 @@ source $HOME/.config/bash-completions/*
 # Install aliases
 source $DOTFILES/config/bash/aliases.bash
 
-# Find arch package by binary
-source /usr/share/doc/pkgfile/command-not-found.bash
-
 shopt -s autocd
 
 _GREEN="\[\033[32m\]"
@@ -46,10 +32,10 @@ export PS1="${_BLUE}${_BOLD}\w${_RESET} \$ "
 # Vim everywhere
 set -o vi
 
-# Show calendar and date on start
-cal -m
-date +"%d %B %Y - %H:%M:%S, %A"
-
 # BEGIN_KITTY_SHELL_INTEGRATION
 if test -n "$KITTY_INSTALLATION_DIR" -a -e "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; then source "$KITTY_INSTALLATION_DIR/shell-integration/bash/kitty.bash"; fi
 # END_KITTY_SHELL_INTEGRATION
+
+export NVM_DIR="$([ -z "${XDG_CONFIG_HOME-}" ] && printf %s "${HOME}/.nvm" || printf %s "${XDG_CONFIG_HOME}/nvm")"
+[ -s "$NVM_DIR/nvm.sh" ] && \. "$NVM_DIR/nvm.sh" # This loads nvm
+[ -s "$NVM_DIR/bash_completion" ] && \. "$NVM_DIR/bash_completion"  # This loads nvm bash_completion
diff --git a/config/.tmux.conf b/config/.tmux.conf
index e69de29..ba305c3 100644
--- a/config/.tmux.conf
+++ b/config/.tmux.conf
@@ -0,0 +1,10 @@
+bind h select-pane -L
+bind j select-pane -D
+bind k select-pane -U
+bind l select-pane -R
+
+# use <C-b>g and <C-b>v to split windows
+unbind %
+unbind '"'
+bind v split-window -h -c "#{pane_current_path}"
+bind g split-window -v -c "#{pane_current_path}"
diff --git a/config/nvim/lua/user/remaps.lua b/config/nvim/lua/user/remaps.lua
index 84dc5ce..5ea1b33 100644
--- a/config/nvim/lua/user/remaps.lua
+++ b/config/nvim/lua/user/remaps.lua
@@ -3,6 +3,8 @@ local nmap = utils.nmap
 local vmap = utils.vmap
 local tmap = utils.tmap
 
+-- General keymaps
+nmap("<leader><leader>", "<C-w><C-w>")
 nmap("<C-c>", ":nohl<CR>")
 
 -- Move focus between splits