diff --git a/gitconfig b/gitconfig
index cf898d8..12e829f 100644
--- a/gitconfig
+++ b/gitconfig
@@ -4,3 +4,6 @@
 
 [push]
 	default = simple
+
+[core]
+	editor = /usr/bin/vim
diff --git a/htoprc b/htoprc
new file mode 100644
index 0000000..8858044
--- /dev/null
+++ b/htoprc
@@ -0,0 +1,22 @@
+# Beware! This file is rewritten every time htop exits.
+# The parser is also very primitive, and not human-friendly.
+# (I know, it's in the todo list).
+fields=0 48 17 18 38 39 40 2 46 47 49 1 
+sort_key=47
+sort_direction=1
+hide_threads=0
+hide_kernel_threads=1
+hide_userland_threads=1
+shadow_other_users=1
+highlight_base_name=1
+highlight_megabytes=1
+highlight_threads=1
+tree_view=0
+header_margin=1
+detailed_cpu_time=0
+color_scheme=0
+delay=15
+left_meters=AllCPUs Memory Swap 
+left_meter_modes=1 1 1 
+right_meters=Tasks LoadAverage Uptime 
+right_meter_modes=2 2 2 
diff --git a/tmux.conf b/tmux.conf
index 4fe6741..58ec45e 100644
--- a/tmux.conf
+++ b/tmux.conf
@@ -1,3 +1,4 @@
+set -g default-command "reattach-to-user-namespace -l $SHELL"
 set -g default-terminal "screen-256color"
 set -g base-index 1
 if-shell '[ "$(tmux -V | awk '{print $2*10}')" -ge 17 ]' 'set -g pane-base-index 1'