diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..45a1a9e
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,26 @@
+# My tmux config file
+# copied from https://danielmiessler.com/study/tmux
+# and http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/
+
+set -g set-titles on
+set -g set-titles-string '#(whoami)@#(hostname)'
+
+# Customize status bar
+set -g status-utf8 on
+set -g status-bg green
+set -g status-fg black
+set -g status-interval 5
+set -g status-left-length 90
+set -g status-right-length 60
+set -g status-justify left
+set -g status-left '#[fg=white][#S] '
+set -g status-right '#[fg=white]%a %d %b %R'
+
+# Fast pane switching
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+bind -n M-b command-prompt
+set -g pane-base-index 1
\ No newline at end of file

diff --git a/.tmux.conf b/.tmux.conf
new file mode 100644
index 0000000..45a1a9e
--- /dev/null
+++ b/.tmux.conf
@@ -0,0 +1,26 @@
+# My tmux config file
+# copied from https://danielmiessler.com/study/tmux
+# and http://www.hamvocke.com/blog/a-guide-to-customizing-your-tmux-conf/
+
+set -g set-titles on
+set -g set-titles-string '#(whoami)@#(hostname)'
+
+# Customize status bar
+set -g status-utf8 on
+set -g status-bg green
+set -g status-fg black
+set -g status-interval 5
+set -g status-left-length 90
+set -g status-right-length 60
+set -g status-justify left
+set -g status-left '#[fg=white][#S] '
+set -g status-right '#[fg=white]%a %d %b %R'
+
+# Fast pane switching
+bind -n M-Left select-pane -L
+bind -n M-Right select-pane -R
+bind -n M-Up select-pane -U
+bind -n M-Down select-pane -D
+
+bind -n M-b command-prompt
+set -g pane-base-index 1
\ No newline at end of file
diff --git a/config.fish b/config.fish
new file mode 100644
index 0000000..4961958
--- /dev/null
+++ b/config.fish
@@ -0,0 +1,39 @@
+# ~/.config/fish/config.fish
+# Mostly copied from .bash_aliases
+
+function fish_prompt
+	set_color -o green
+	echo -ns (whoami) '@' (hostname)
+	set_color white
+	echo -n ':'
+	set_color -o cyan
+	echo -n (prompt_pwd)
+	set_color white
+	echo -n '$ '
+	set_color normal
+end
+	
+# handy ls aliases
+alias ll='ls -alhF'
+alias la='ls -A'
+alias l='ls -CF'
+alias i='ls'
+	
+# personal aliases
+alias w3md='w3m www.duckduckgo.com'
+alias tma='tmux a'
+alias tmn='tmux new -s'
+alias ping3='ping -c 3'
+alias gping='ping -c 3 www.google.com'
+alias emacs='emacsclient -c -a ""'
+alias emacs='emacsclient -c -a "" --tty'
+alias py='python3'
+alias t='date +%T'
+alias disk='df -h'
+alias df='df -h'
+alias du='du -sch *'
+alias wcl='wc -l'
+alias todolist='grep -r "FIXME" * ; grep -r "TODO" * ; grep -r "XXX" *'
+alias todo='todolist; wcl todolist'
+alias ghist='git hist | head'
+alias gstat='git status'