diff --git a/git-files/gitconfig b/git-files/gitconfig
deleted file mode 100644
index 2593ff7..0000000
--- a/git-files/gitconfig
+++ /dev/null
@@ -1,14 +0,0 @@
-[user]
-	name = Haak Saxberg
-	email = haak.erling@gmail.com
-[color]
-	ui = auto
-[alias]
-	aa = add --all
-	dc = diff --cached
-	ff = merge --ff-only
-	fa = fetch --all
-[push]
-	default = simple
-[core]
-	excludesfile = ~/.gitignore
diff --git a/install.sh b/install.sh
deleted file mode 100755
index b1de0bb..0000000
--- a/install.sh
+++ /dev/null
@@ -1,144 +0,0 @@
-#! /usr/bin/env bash
-set -e
-
-main() {
-	DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" && pwd )"
-	# sore the calling directory to return later
-	CALLING_DIR=$PWD
-	cd $DIR
-	if [[ $1 == "--ycm" ]]; then
-		local vim_version=`vim --version | head -1 | cut -d " " -f 5`
-		if [[ $(echo "$vim_version >= 7.4" | bc) = 1 ]]; then
-			rm .youcompletemesetup
-			vim +BundleInstall +qall
-			setup_youcompleteme
-		else
-			echo "YCM requires vim 7.4 and up; you have ${vim_version}."
-		fi
-
-	else
-		install_everything
-
-	fi
-	cd $CALLING_DIR
-}
-
-install_everything() {
-	echo "setting up the mac environment"
-	bash mac-files/setup_mac.sh
-
-	echo "updating git modules..."
-	setup_gitmodules
-
-	echo "setting up vim files..."
-	symlink_files vim-files vimrc vim
-	echo "installing bundles (vim will appear)..."
-	vim +BundleInstall +qall
-	setup_youcompleteme
-
-  echo "setting up neovim files..."
-  mkdir ~/.config
-  ln -s ~/.vim ~/.config/nvim
-
-	echo "setting up tmux files..."
-	symlink_files tmux-files tmux.conf
-
-	echo "setting up bash files..."
-	symlink_files bash-files bashrc bash_profile
-
-	echo "setting up zsh files..."
-	setup_zsh
-
-	echo "setting up powerline..."
-
-	echo "setting up git files..."
-	symlink_files git-files gitconfig
-
-	create_local_bin
-	setup_local_symlinks
-
-	echo "sourcing rc files..."
-	source_rc_files
-}
-
-setup_gitmodules() {
-	# assumes we're already in a git repo
-	git submodule init
-	git submodule update --init --recursive
-}
-
-symlink_files() {
-	local source_dir=$1
-	local filenames=${@:2}
-
-	for filename in $filenames
-	do
-		if [ -e $HOME/.${filename} ]; then
-			echo "moving old .$filename to .${filename}.bak"
-			mv $HOME/.$filename $HOME/.${filename}.bak
-		fi
-		echo "linking $DIR/$source_dir/$filename -> $HOME/.$filename"
-		ln -s "$DIR/$source_dir/$filename" "$HOME/.$filename"
-	done
-}
-
-setup_youcompleteme() {
-	# YouCompleteMe is slow to setup, so don't do it if we don't have to
-	if [ -e $DIR/.youcompletemesetup ]; then
-		echo "YouCompleteMe already setup, skipping... (remove .youcompletemesetup to force)"
-	else
-		echo "setting up YouCompleteMe..."
-		cd vim-files/vim/plugged/YouCompleteMe
-		./install.sh --clang-completer
-		cd $DIR
-		touch .youcompletemesetup
-	fi
-}
-
-setup_zsh() {
-	symlink_files zsh-files zshrc
-	symlink_antigen
-}
-
-symlink_antigen() {
-	if [ -e $HOME/antigen.zsh ]; then
-		echo "moving old antigen file to antigen.zsh.bak"
-		mv $HOME/antigen.zsh $HOME/antigen.zsh.bak
-	fi
-	echo "linking $DIR/zsh-files/antigen/antigen.zsh -> $HOME/antigen.zsh"
-	ln -s "$DIR/zsh-files/antigen/antigen.zsh" "$HOME/antigen.zsh"
-}
-
-create_local_bin() {
-	(cd ~/local) || mkdir ~/local
-	(cd ~/local/bin) || mkdir ~/local/bin
-}
-
-setup_local_symlinks() {
-	setup_vim_symlink
-}
-
-setup_vim_symlink() {
-	local vim_version=`vim --version | head -1 | cut -d " " -f 5`
-	if [[ $(echo "$vim_version >= 7.4" | bc) = 1 ]]; then
-		ln -s `which vim` ~/local/bin/vim
-	else
-		if [ -d $DIR/vim-files/vim/bundle/YouCompleteMe ]; then
-			echo "Your version of vim is too old to use YCM -- removing the YCM bundle..."
-			echo "rerun this installer with the --ycm option once vim is >= 7.4"
-			echo "your new shellrc files will look for 'vim' in ~/local/bin, but this has not been setup for you."
-			rm -rf $DIR/vim-files/vim/bundle/YouCompleteMe
-		fi
-	fi
-}
-
-source_rc_files() {
-	local current_shell=$(ps -p $$ | grep `echo $$` | awk '{print $4}')
-	if [[ "$current_shell" == "zsh" ]]; then
-		source ~/.zshrc
-	elif [[ "$current_shell" == "bash" ]]; then
-		source ~/.bashrc
-	fi
-}
-
-main $@
diff --git a/nix/home.nix b/nix/home.nix
index 50f8c31..767ad0f 100644
--- a/nix/home.nix
+++ b/nix/home.nix
@@ -5,7 +5,6 @@ with lib;
 {
   home.packages = with pkgs; [
     htop
-    tmuxinator
     ripgrep
     ranger
     nox
@@ -29,6 +28,7 @@ with lib;
 
     initExtra = mkForce (''
       export NIX_PATH=$HOME/.nix-defexpr/channels:$NIX_PATH
+      export EDITOR=vim
 
       source $HOME/.nix-profile/etc/profile.d/nix.sh
       source $HOME/.nix-profile/share/fzf/key-bindings.zsh
@@ -46,6 +46,7 @@ with lib;
       plugins = [
         "git"
         "z"
+        "sudo"
         "nix-shell"
         "tmuxinator"
       ];
@@ -59,6 +60,9 @@ with lib;
 
   programs.tmux = {
     enable = true;
+    tmuxinator = {
+      enable = true;
+    };
   };
 
   programs.fzf = {
@@ -69,4 +73,8 @@ with lib;
 
   # Let Home Manager install and manage itself.
   programs.home-manager.enable = true;
+
+  home.file.".tmux.conf" = {
+    source = ./tmux/tmux.conf;
+  };
 }
diff --git a/tmux-files/tmux.conf b/nix/tmux/tmux.conf
similarity index 100%
rename from tmux-files/tmux.conf
rename to nix/tmux/tmux.conf
diff --git a/zsh-files/.config/powerline/colors.json b/zsh-files/.config/powerline/colors.json
deleted file mode 100644
index 5b8a764..0000000
--- a/zsh-files/.config/powerline/colors.json
+++ /dev/null
@@ -1,110 +0,0 @@
-{
-	"colors": {
-		"black": 16,
-		"white": 231,
-
-		"darkestgreen": 22,
-		"darkgreen": 28,
-		"mediumgreen": 70,
-		"brightgreen": 148,
-
-		"darkestcyan": 23,
-		"darkcyan": 74,
-		"mediumcyan": 117,
-		"brightcyan": 159,
-
-		"darkestblue": 24,
-		"darkblue": 31,
-
-		"darkestred": 52,
-		"darkred": 88,
-		"mediumred": 124,
-		"brightred": 160,
-		"brightestred": 196,
-
-		"darkestpurple": 55,
-		"mediumpurple": 98,
-		"brightpurple": 189,
-
-		"darkorange": 94,
-		"mediumorange": 166,
-		"brightorange": 208,
-		"brightestorange": 214,
-
-		"brightyellow": 220,
-
-		"gray0": 233,
-		"gray1": 235,
-		"gray2": 236,
-		"gray3": 239,
-		"gray4": 240,
-		"gray5": 241,
-		"gray6": 244,
-		"gray7": 245,
-		"gray8": 247,
-		"gray9": 250,
-		"gray10": 252,
-
-		"gray61": [14, "93a1a1"],
-		"gray13": [8, "002b36"],
-
-		"royalblue5": [0, "073642"],
-		"darkgreencopper": [10, "586e75"],
-		"lightskyblue4": [11, "657b83"],
-		"azure4": [12, "839496"],
-		"lightyellow": [7, "eee8d5"],
-		"oldlace": [15, "fdf6e3"],
-
-		"green": [2, "719e07"],
-		"cyan": [6, "2aa198"],
-		"blue": [4, "268bd2"],
-		"red": [1, "dc322f"],
-		"magenta": [5, "d33682"],
-		"violet": [13, "6c71c4"],
-		"orange": [9, "cb4b16"],
-		"yellow": [3, "b58900"],
-
-		"lightyellowgreen": 106,
-		"gold3": 178,
-		"orangered": 202,
-
-		"steelblue": 67,
-		"darkorange3": 166,
-		"skyblue1": 117,
-		"khaki1": 228
-	},
-	"gradients": {
-		"dark_GREEN_Orange_red": [
-			[22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 22, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 58, 94, 94, 94, 94, 94, 94, 94, 52],
-			["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
-		],
-		"GREEN_Orange_red": [
-			[2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 2, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 3, 1],
-			["005f00", "015f00", "025f00", "035f00", "045f00", "055f00", "065f00", "075f00", "085f00", "095f00", "0b5f00", "0c5f00", "0d5f00", "0e5f00", "0f5f00", "105f00", "115f00", "125f00", "135f00", "145f00", "165f00", "175f00", "185f00", "195f00", "1a5f00", "1b5f00", "1c5f00", "1d5f00", "1e5f00", "1f5f00", "215f00", "225f00", "235f00", "245f00", "255f00", "265f00", "275f00", "285f00", "295f00", "2a5f00", "2c5f00", "2d5f00", "2e5f00", "2f5f00", "305f00", "315f00", "325f00", "335f00", "345f00", "355f00", "375f00", "385f00", "395f00", "3a5f00", "3b5f00", "3c5f00", "3d5f00", "3e5f00", "3f5f00", "415f00", "425f00", "435f00", "445f00", "455f00", "465f00", "475f00", "485f00", "495f00", "4a5f00", "4c5f00", "4d5f00", "4e5f00", "4f5f00", "505f00", "515f00", "525f00", "535f00", "545f00", "555f00", "575f00", "585f00", "595f00", "5a5f00", "5b5f00", "5c5f00", "5d5f00", "5e5f00", "615f00", "655f00", "685f00", "6c5f00", "6f5f00", "735f00", "765f00", "7a5f00", "7d5f00", "815f00", "845f00", "815200", "702900"]
-		],
-		"green_yellow_red": [
-			[190, 184, 178, 172, 166, 160],
-			["8ae71c", "8ce71c", "8fe71c", "92e71c", "95e71d", "98e71d", "9ae71d", "9de71d", "a0e71e", "a3e71e", "a6e71e", "a8e71e", "abe71f", "aee71f", "b1e71f", "b4e71f", "b6e720", "b9e720", "bce720", "bfe720", "c2e821", "c3e721", "c5e621", "c7e521", "c9e522", "cbe422", "cde322", "cfe222", "d1e223", "d3e123", "d5e023", "d7df23", "d9df24", "dbde24", "dddd24", "dfdc24", "e1dc25", "e3db25", "e5da25", "e7d925", "e9d926", "e9d626", "e9d426", "e9d126", "e9cf27", "e9cc27", "e9ca27", "e9c727", "e9c528", "e9c228", "e9c028", "e9bd28", "e9bb29", "e9b829", "e9b629", "e9b329", "e9b12a", "e9ae2a", "e9ac2a", "e9a92a", "eaa72b", "eaa42b", "eaa22b", "ea9f2b", "ea9d2c", "ea9b2c", "ea982c", "ea962c", "ea942d", "ea912d", "ea8f2d", "ea8d2d", "ea8a2e", "ea882e", "ea862e", "ea832e", "ea812f", "ea7f2f", "ea7c2f", "ea7a2f", "eb7830", "eb7530", "eb7330", "eb7130", "eb6f31", "eb6c31", "eb6a31", "eb6831", "eb6632", "eb6332", "eb6132", "eb5f32", "eb5d33", "eb5a33", "eb5833", "eb5633", "eb5434", "eb5134", "eb4f34", "eb4d34", "ec4b35"]
-		],
-		"green_yellow_orange_red": [
-			[2, 3, 9, 1],
-			["719e07", "739d06", "759c06", "779c06", "799b06", "7b9a05", "7d9a05", "7f9905", "819805", "839805", "859704", "879704", "899604", "8b9504", "8d9504", "8f9403", "919303", "949303", "969203", "989102", "9a9102", "9c9002", "9e9002", "a08f02", "a28e01", "a48e01", "a68d01", "a88c01", "aa8c01", "ac8b00", "ae8a00", "b08a00", "b28900", "b58900", "b58700", "b68501", "b78302", "b78102", "b87f03", "b97d04", "b97b04", "ba7905", "bb7806", "bb7606", "bc7407", "bd7208", "bd7008", "be6e09", "bf6c0a", "bf6a0a", "c0690b", "c1670c", "c1650c", "c2630d", "c3610e", "c35f0e", "c45d0f", "c55b10", "c55a10", "c65811", "c75612", "c75412", "c85213", "c95014", "c94e14", "ca4c15", "cb4b16", "cb4a16", "cc4917", "cc4818", "cd4719", "cd4719", "ce461a", "ce451b", "cf441c", "cf441c", "d0431d", "d0421e", "d1411f", "d1411f", "d24020", "d23f21", "d33e22", "d33e22", "d43d23", "d43c24", "d53b25", "d53b25", "d63a26", "d63927", "d73828", "d73828", "d83729", "d8362a", "d9352b", "d9352b", "da342c", "da332d", "db322e", "dc322f"]
-		],
-		"yellow_red": [
-			[220, 178, 172, 166, 160],
-			["ffd700", "fdd500", "fbd300", "fad200", "f8d000", "f7cf00", "f5cd00", "f3cb00", "f2ca00", "f0c800", "efc700", "edc500", "ebc300", "eac200", "e8c000", "e7bf00", "e5bd00", "e3bb00", "e2ba00", "e0b800", "dfb700", "ddb500", "dbb300", "dab200", "d8b000", "d7af00", "d7ad00", "d7ab00", "d7aa00", "d7a800", "d7a700", "d7a500", "d7a300", "d7a200", "d7a000", "d79f00", "d79d00", "d79b00", "d79a00", "d79800", "d79700", "d79500", "d79300", "d79200", "d79000", "d78f00", "d78d00", "d78b00", "d78a00", "d78800", "d78700", "d78500", "d78300", "d78200", "d78000", "d77f00", "d77d00", "d77b00", "d77a00", "d77800", "d77700", "d77500", "d77300", "d77200", "d77000", "d76f00", "d76d00", "d76b00", "d76a00", "d76800", "d76700", "d76500", "d76300", "d76200", "d76000", "d75f00", "d75b00", "d75700", "d75300", "d74f00", "d74c00", "d74800", "d74400", "d74000", "d73c00", "d73900", "d73500", "d73100", "d72d00", "d72900", "d72600", "d72200", "d71e00", "d71a00", "d71600", "d71300", "d70f00", "d70b00", "d70700"]
-		],
-		"yellow_orange_red": [
-			[3, 9, 1],
-			["b58900", "b58700", "b58600", "b68501", "b68401", "b78202", "b78102", "b88003", "b87f03", "b87d03", "b97c04", "b97b04", "ba7a05", "ba7805", "bb7706", "bb7606", "bc7507", "bc7307", "bc7207", "bd7108", "bd7008", "be6e09", "be6d09", "bf6c0a", "bf6b0a", "c06a0b", "c0680b", "c0670b", "c1660c", "c1650c", "c2630d", "c2620d", "c3610e", "c3600e", "c35e0e", "c45d0f", "c45c0f", "c55b10", "c55910", "c65811", "c65711", "c75612", "c75412", "c75312", "c85213", "c85113", "c94f14", "c94e14", "ca4d15", "ca4c15", "cb4b16", "cb4a16", "cb4a17", "cc4917", "cc4918", "cc4818", "cd4819", "cd4719", "cd471a", "ce461a", "ce461b", "ce451b", "cf451c", "cf441c", "cf441d", "d0431d", "d0431e", "d0421e", "d1421f", "d1411f", "d14120", "d24020", "d24021", "d23f21", "d33f22", "d33e22", "d33e23", "d43d23", "d43d24", "d43c24", "d53c25", "d53b25", "d53b26", "d63a26", "d63a27", "d63927", "d73928", "d73828", "d73829", "d83729", "d8372a", "d8362a", "d9362b", "d9352b", "d9352c", "da342c", "da342d", "da332d", "db332e"]
-		],
-		"blue_red": [
-			[39, 74, 68, 67, 103, 97, 96, 132, 131, 167, 203, 197],
-			["19b4fe", "1bb2fc", "1db1fa", "1faff8", "22aef6", "24adf4", "26abf2", "29aaf0", "2ba9ee", "2da7ec", "30a6ea", "32a5e8", "34a3e6", "36a2e4", "39a0e2", "3b9fe1", "3d9edf", "409cdd", "429bdb", "449ad9", "4798d7", "4997d5", "4b96d3", "4d94d1", "5093cf", "5292cd", "5490cb", "578fc9", "598dc7", "5b8cc6", "5e8bc4", "6089c2", "6288c0", "6487be", "6785bc", "6984ba", "6b83b8", "6e81b6", "7080b4", "727eb2", "757db0", "777cae", "797aac", "7b79ab", "7e78a9", "8076a7", "8275a5", "8574a3", "8772a1", "89719f", "8c709d", "8e6e9b", "906d99", "926b97", "956a95", "976993", "996791", "9c668f", "9e658e", "a0638c", "a3628a", "a56188", "a75f86", "a95e84", "ac5c82", "ae5b80", "b05a7e", "b3587c", "b5577a", "b75678", "ba5476", "bc5374", "be5273", "c05071", "c34f6f", "c54e6d", "c74c6b", "ca4b69", "cc4967", "ce4865", "d14763", "d34561", "d5445f", "d7435d", "da415b", "dc4059", "de3f58", "e13d56", "e33c54", "e53a52", "e83950", "ea384e", "ec364c", "ee354a", "f13448", "f33246", "f53144", "f83042", "fa2e40"]
-		],
-		"white_red": [
-			[231, 223, 216, 209, 196],
-			["ffffff", "fffe61", "fffcc4", "fffb28", "fff98b", "fff7ef", "fff651", "fff4b4", "fff318", "fff17b", "ffefdf", "ffee41", "ffeca4", "ffeb08", "ffe96b", "ffe7cf", "ffe631", "ffe494", "ffe2f8", "ffe15b", "ffdfbf", "ffde21", "ffdc84", "ffdae8", "ffd94b", "ffd7af", "ffd602", "ffd455", "ffd2aa", "ffd0fd", "ffcf50", "ffcda5", "ffcbf8", "ffca4b", "ffc8a0", "ffc6f3", "ffc546", "ffc39b", "ffc1ee", "ffc041", "ffbe96", "ffbce9", "ffbb3c", "ffb991", "ffb7e4", "ffb637", "ffb48c", "ffb2df", "ffb132", "ffaf87", "ffadda", "ffac2d", "ffaa82", "ffa8d5", "ffa728", "ffa57d", "ffa3d0", "ffa223", "ffa078", "ff9ecb", "ff9d1e", "ff9b73", "ff99c6", "ff9819", "ff966e", "ff94c1", "ff9314", "ff9169", "ff8fbc", "ff8e0f", "ff8c64", "ff8ab7", "ff890a", "ff875f", "ff81f4", "ff7c8a", "ff771f", "ff71b5", "ff6c4c", "ff66e1", "ff6177", "ff5c0c", "ff56a2", "ff5139", "ff4bce", "ff4664", "ff40f9", "ff3b8f", "ff3626", "ff30bb", "ff2b51", "ff25e6", "ff207c", "ff1b13", "ff15a8", "ff103e", "ff0ad3", "ff0569", "ff0000"]
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/ipython/default.json b/zsh-files/.config/powerline/colorschemes/ipython/default.json
deleted file mode 100644
index d787591..0000000
--- a/zsh-files/.config/powerline/colorschemes/ipython/default.json
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-	"name": "Default color scheme for IPython prompt",
-	"groups": {
-		"virtualenv": { "fg": "white", "bg": "darkcyan" },
-		"prompt": { "fg": "gray9", "bg": "gray4" },
-		"prompt_count": { "fg": "white", "bg": "gray4" }
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/shell/default.json b/zsh-files/.config/powerline/colorschemes/shell/default.json
deleted file mode 100644
index 9a5c588..0000000
--- a/zsh-files/.config/powerline/colorschemes/shell/default.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"name": "Default color scheme for shell prompts",
-	"groups": {
-		"user": { "fg": "white", "bg": "darkblue", "attr": ["bold"] },
-		"superuser": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"virtualenv": { "fg": "white", "bg": "darkcyan" },
-		"branch": { "fg": "gray9", "bg": "gray2" },
-		"branch_dirty": { "fg": "brightyellow", "bg": "gray2" },
-		"branch_clean": { "fg": "gray9", "bg": "gray2" },
-		"cwd": { "fg": "gray9", "bg": "gray4" },
-		"cwd:current_folder": { "fg": "gray10", "bg": "gray4", "attr": ["bold"] },
-		"cwd:divider": { "fg": "gray7", "bg": "gray4" },
-		"hostname": { "fg": "brightyellow", "bg": "mediumorange" },
-		"exit_fail": { "fg": "white", "bg": "darkestred" },
-		"exit_success": { "fg": "white", "bg": "darkestgreen" },
-		"environment": { "fg": "white", "bg": "darkestgreen" }
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/shell/solarized.json b/zsh-files/.config/powerline/colorschemes/shell/solarized.json
deleted file mode 100644
index 70093ba..0000000
--- a/zsh-files/.config/powerline/colorschemes/shell/solarized.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"name": "Solarized Dark",
-	"groups": {
-		"user":               { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
-		"superuser":          { "fg": "oldlace", "bg": "red", "attr": ["bold"] },
-		"virtualenv":         { "fg": "oldlace", "bg": "green" },
-		"branch":             { "fg": "gray61", "bg": "royalblue5" },
-		"branch_dirty":       { "fg": "yellow", "bg": "royalblue5" },
-		"branch_clean":       { "fg": "gray61", "bg": "royalblue5" },
-		"cwd":                { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"cwd:current_folder": { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
-		"cwd:divider":        { "fg": "gray61", "bg": "darkgreencopper" },
-		"hostname":           { "fg": "oldlace", "bg": "darkgreencopper" },
-		"exit_fail":          { "fg": "oldlace", "bg": "red" },
-		"exit_success":       { "fg": "oldlace", "bg": "green" },
-		"environment":        { "fg": "oldlace", "bg": "green" }
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/tmux/default.json b/zsh-files/.config/powerline/colorschemes/tmux/default.json
deleted file mode 100644
index c7c76a4..0000000
--- a/zsh-files/.config/powerline/colorschemes/tmux/default.json
+++ /dev/null
@@ -1,27 +0,0 @@
-{
-	"name": "Default color scheme for terminal prompts",
-	"groups": {
-		"background:divider": { "fg": "gray5", "bg": "gray0" },
-		"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"date": { "fg": "gray8", "bg": "gray2" },
-		"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
-		"time:divider": { "fg": "gray5", "bg": "gray2" },
-		"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] },
-		"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"weather": { "fg": "gray8", "bg": "gray0" },
-		"weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" },
-		"weather_condition_hot": { "fg": "khaki1", "bg": "gray0" },
-		"weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" },
-		"weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" },
-		"uptime": { "fg": "gray8", "bg": "gray0" },
-		"external_ip": { "fg": "gray8", "bg": "gray0" },
-		"network_load": { "fg": "gray8", "bg": "gray0" },
-		"network_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" },
-		"system_load": { "fg": "gray8", "bg": "gray0" },
-		"system_load_gradient": { "fg": "green_yellow_orange_red", "bg": "gray0" },
-		"environment": { "fg": "gray8", "bg": "gray0" },
-		"battery": { "fg": "gray8", "bg": "gray0" },
-		"battery_gradient": { "fg": "white_red", "bg": "gray0" }
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/vim/default.json b/zsh-files/.config/powerline/colorschemes/vim/default.json
deleted file mode 100644
index 612eb57..0000000
--- a/zsh-files/.config/powerline/colorschemes/vim/default.json
+++ /dev/null
@@ -1,96 +0,0 @@
-{
-	"name": "Default color scheme",
-	"groups": {
-		"background": { "fg": "white", "bg": "gray2" },
-		"background:divider": { "fg": "gray6", "bg": "gray2" },
-		"mode": { "fg": "darkestgreen", "bg": "brightgreen", "attr": ["bold"] },
-		"modified_indicator": { "fg": "brightyellow", "bg": "gray4", "attr": ["bold"] },
-		"paste_indicator": { "fg": "white", "bg": "mediumorange", "attr": ["bold"] },
-		"readonly_indicator": { "fg": "brightestred", "bg": "gray4" },
-		"branch": { "fg": "gray9", "bg": "gray4" },
-		"branch_dirty": { "fg": "brightyellow", "bg": "gray4" },
-		"branch_clean": { "fg": "gray9", "bg": "gray4" },
-		"branch:divider": { "fg": "gray7", "bg": "gray4" },
-		"file_directory": { "fg": "gray9", "bg": "gray4" },
-		"file_name": { "fg": "white", "bg": "gray4", "attr": ["bold"] },
-		"file_size": { "fg": "gray8", "bg": "gray2" },
-		"file_name_no_file": { "fg": "gray9", "bg": "gray4", "attr": ["bold"] },
-		"file_name_empty": { "fg": "gray9", "bg": "gray4" },
-		"file_format": { "fg": "gray8", "bg": "gray2" },
-		"file_encoding": { "fg": "gray8", "bg": "gray2" },
-		"file_type": { "fg": "gray8", "bg": "gray2" },
-		"file_vcs_status": { "fg": "brightestred", "bg": "gray4" },
-		"file_vcs_status_M": { "fg": "brightyellow", "bg": "gray4" },
-		"file_vcs_status_A": { "fg": "brightgreen", "bg": "gray4" },
-		"line_percent": { "fg": "gray9", "bg": "gray4" },
-		"line_percent_gradient": { "fg": "green_yellow_red", "bg": "gray4" },
-		"line_current": { "fg": "gray1", "bg": "gray10", "attr": ["bold"] },
-		"line_current_symbol": { "fg": "gray1", "bg": "gray10" },
-		"virtcol_current_gradient": { "fg": "dark_GREEN_Orange_red", "bg": "gray10" },
-		"col_current": { "fg": "gray6", "bg": "gray10" },
-		"modified_buffers": { "fg": "brightyellow", "bg": "gray2" },
-		"environment": { "fg": "gray8", "bg": "gray2" }
-	},
-	"mode_translations": {
-		"nc": {
-			"colors": {
-				"brightyellow": "darkorange",
-				"brightestred": "darkred",
-				"gray0": "gray0",
-				"gray1": "gray0",
-				"gray2": "gray0",
-				"gray3": "gray1",
-				"gray4": "gray1",
-				"gray5": "gray1",
-				"gray6": "gray1",
-				"gray7": "gray4",
-				"gray8": "gray4",
-				"gray9": "gray4",
-				"gray10": "gray5",
-				"white": "gray6",
-				"green_yellow_red": "gray5"
-			}
-		},
-		"i": {
-			"colors": {
-				"gray0": "darkestblue",
-				"gray1": "darkestblue",
-				"gray2": "darkestblue",
-				"gray3": "darkblue",
-				"gray4": "darkblue",
-				"gray5": "darkestcyan",
-				"gray6": "darkestcyan",
-				"gray7": "darkestcyan",
-				"gray8": "mediumcyan",
-				"gray9": "mediumcyan",
-				"gray10": "mediumcyan",
-				"green_yellow_red": "gray5"
-			},
-			"groups": {
-				"mode": { "fg": "darkestcyan", "bg": "white", "attr": ["bold"] },
-				"background:divider": { "fg": "darkcyan", "bg": "darkestblue" },
-				"branch:divider": { "fg": "darkcyan", "bg": "darkblue" }
-			}
-		},
-		"v": {
-			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
-			}
-		},
-		"V": {
-			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
-			}
-		},
-		"^V": {
-			"groups": {
-				"mode": { "fg": "darkorange", "bg": "brightestorange", "attr": ["bold"] }
-			}
-		},
-		"R": {
-			"groups": {
-				"mode": { "fg": "white", "bg": "brightred", "attr": ["bold"] }
-			}
-		}
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/vim/solarized.json b/zsh-files/.config/powerline/colorschemes/vim/solarized.json
deleted file mode 100644
index 0d28db8..0000000
--- a/zsh-files/.config/powerline/colorschemes/vim/solarized.json
+++ /dev/null
@@ -1,93 +0,0 @@
-{
-	"name": "Solarized Dark",
-	"groups": {
-		"background":               { "fg": "oldlace", "bg": "royalblue5" },
-		"background:divider":       { "fg": "lightskyblue4", "bg": "royalblue5" },
-		"mode":                     { "fg": "oldlace", "bg": "green", "attr": ["bold"] },
-		"modified_indicator":       { "fg": "yellow", "bg": "darkgreencopper", "attr": ["bold"] },
-		"paste_indicator":          { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
-		"readonly_indicator":       { "fg": "red", "bg": "darkgreencopper" },
-		"branch":                   { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"branch_dirty":             { "fg": "yellow", "bg": "darkgreencopper" },
-		"branch_clean":             { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"branch:divider":           { "fg": "gray61", "bg": "darkgreencopper" },
-		"file_directory":           { "fg": "lightyellow", "bg": "darkgreencopper" },
-		"file_name":                { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
-		"file_size":                { "fg": "oldlace", "bg": "darkgreencopper" },
-		"file_name_no_file":        { "fg": "oldlace", "bg": "darkgreencopper", "attr": ["bold"] },
-		"file_name_empty":          { "fg": "oldlace", "bg": "darkgreencopper" },
-		"file_format":              { "fg": "gray61", "bg": "royalblue5" },
-		"file_encoding":            { "fg": "gray61", "bg": "royalblue5" },
-		"file_type":                { "fg": "gray61", "bg": "royalblue5" },
-		"file_vcs_status":          { "fg": "red", "bg": "darkgreencopper" },
-		"file_vcs_status_M":        { "fg": "yellow", "bg": "darkgreencopper" },
-		"file_vcs_status_A":        { "fg": "green", "bg": "darkgreencopper" },
-		"line_percent":             { "fg": "oldlace", "bg": "lightskyblue4" },
-		"line_percent_gradient":    { "fg": "green_yellow_orange_red", "bg": "lightskyblue4" },
-		"line_current":             { "fg": "gray13", "bg": "lightyellow", "attr": ["bold"] },
-		"line_current_symbol":      { "fg": "gray13", "bg": "lightyellow" },
-		"virtcol_current_gradient": { "fg": "GREEN_Orange_red", "bg": "gray10" },
-		"col_current":              { "fg": "azure4", "bg": "lightyellow" },
-		"environment":              { "fg": "gray61", "bg": "royalblue5" }
-	},
-	"mode_translations": {
-		"nc": {
-			"colors": {
-				"darkgreencopper": "royalblue5",
-				"lightskyblue4": "royalblue5",
-				"azure4": "darkgreencopper",
-				"gray61": "lightskyblue4",
-				"lightyellow": "azure4",
-				"oldlace": "gray61"
-			}
-		},
-		"i": {
-			"groups": {
-				"background":             { "fg": "oldlace", "bg": "darkgreencopper" },
-				"background:divider":     { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"mode":                   { "fg": "oldlace", "bg": "blue", "attr": ["bold"] },
-				"modified_indicator":     { "fg": "yellow", "bg": "lightyellow", "attr": ["bold"] },
-				"paste_indicator":        { "fg": "oldlace", "bg": "orange", "attr": ["bold"] },
-				"readonly_indicator":     { "fg": "red", "bg": "lightyellow" },
-				"branch":                 { "fg": "darkgreencopper", "bg": "lightyellow" },
-				"branch:divider":         { "fg": "lightskyblue4", "bg": "lightyellow" },
-				"file_directory":         { "fg": "darkgreencopper", "bg": "lightyellow" },
-				"file_name":              { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
-				"file_size":              { "fg": "royalblue5", "bg": "lightyellow" },
-				"file_name_no_file":      { "fg": "royalblue5", "bg": "lightyellow", "attr": ["bold"] },
-				"file_name_empty":        { "fg": "royalblue5", "bg": "lightyellow" },
-				"file_format":            { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"file_encoding":          { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"file_type":              { "fg": "lightyellow", "bg": "darkgreencopper" },
-				"file_vcs_status":        { "fg": "red", "bg": "lightyellow" },
-				"file_vcs_status_M":      { "fg": "yellow", "bg": "lightyellow" },
-				"file_vcs_status_A":      { "fg": "green", "bg": "lightyellow" },
-				"line_percent":           { "fg": "oldlace", "bg": "gray61" },
-				"line_percent_gradient":  { "fg": "oldlace", "bg": "gray61" },
-				"line_current":           { "fg": "gray13", "bg": "oldlace", "attr": ["bold"] },
-				"line_current_symbol":    { "fg": "gray13", "bg": "oldlace" },
-				"col_current":            { "fg": "azure4", "bg": "oldlace" }
-			}
-		},
-		"v": {
-			"groups": {
-				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
-			}
-		},
-		"V": {
-			"groups": {
-				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
-			}
-		},
-		"^V": {
-			"groups": {
-				"mode": { "fg": "oldlace", "bg": "orange", "attr": ["bold"] }
-			}
-		},
-		"R": {
-			"groups": {
-				"mode": { "fg": "oldlace", "bg": "red", "attr": ["bold"] }
-			}
-		}
-	}
-}
diff --git a/zsh-files/.config/powerline/colorschemes/wm/default.json b/zsh-files/.config/powerline/colorschemes/wm/default.json
deleted file mode 100644
index 445da4f..0000000
--- a/zsh-files/.config/powerline/colorschemes/wm/default.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"name": "Default color scheme for window managers",
-	"groups": {
-		"background:divider": { "fg": "gray5", "bg": "gray0" },
-		"session": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"date": { "fg": "gray8", "bg": "gray2" },
-		"time": { "fg": "gray10", "bg": "gray2", "attr": ["bold"] },
-		"time:divider": { "fg": "gray5", "bg": "gray2" },
-		"email_alert": { "fg": "white", "bg": "brightred", "attr": ["bold"] },
-		"email_alert_gradient": { "fg": "white", "bg": "yellow_orange_red", "attr": ["bold"] },
-		"hostname": { "fg": "black", "bg": "gray10", "attr": ["bold"] },
-		"weather": { "fg": "gray8", "bg": "gray0" },
-		"weather_temp_gradient": { "fg": "blue_red", "bg": "gray0" },
-		"weather_condition_hot": { "fg": "khaki1", "bg": "gray0" },
-		"weather_condition_snowy": { "fg": "skyblue1", "bg": "gray0" },
-		"weather_condition_rainy": { "fg": "skyblue1", "bg": "gray0" },
-		"uptime": { "fg": "gray8", "bg": "gray0" },
-		"external_ip": { "fg": "gray8", "bg": "gray0" },
-		"network_load": { "fg": "gray8", "bg": "gray0" },
-		"system_load": { "fg": "gray8", "bg": "gray0" },
-		"system_load_good": { "fg": "lightyellowgreen", "bg": "gray0" },
-		"system_load_bad": { "fg": "gold3", "bg": "gray0" },
-		"system_load_ugly": { "fg": "orangered", "bg": "gray0" },
-		"environment": { "fg": "gray8", "bg": "gray0" }
-	}
-}
diff --git a/zsh-files/.config/powerline/config.json b/zsh-files/.config/powerline/config.json
deleted file mode 100644
index a70922f..0000000
--- a/zsh-files/.config/powerline/config.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"common": {
-		"term_truecolor": false,
-		"dividers": {
-			"left": {
-				"hard": " ",
-				"soft": " "
-			},
-			"right": {
-				"hard": " ",
-				"soft": " "
-			}
-		},
-		"spaces": 1
-	},
-	"ext": {
-		"ipython": {
-			"colorscheme": "default",
-			"theme": "in",
-			"local_themes": {
-				"rewrite": "rewrite",
-				"out": "out",
-				"in2": "in2"
-			}
-		},
-		"shell": {
-			"colorscheme": "default",
-			"theme": "default"
-		},
-		"tmux": {
-			"colorscheme": "default",
-			"theme": "default"
-		},
-		"vim": {
-			"colorscheme": "default",
-			"theme": "default",
-			"local_themes": {
-				"cmdwin": "cmdwin",
-				"help": "help",
-				"quickfix": "quickfix"
-			}
-		},
-		"wm": {
-			"colorscheme": "default",
-			"theme": "default"
-		}
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/ipython/in.json b/zsh-files/.config/powerline/themes/ipython/in.json
deleted file mode 100644
index ac979c5..0000000
--- a/zsh-files/.config/powerline/themes/ipython/in.json
+++ /dev/null
@@ -1,26 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"name": "virtualenv"
-			},
-			{
-				"type": "string",
-				"contents": "In[",
-				"draw_soft_divider": false,
-				"highlight_group": ["prompt"]
-			},
-			{
-				"name": "prompt_count",
-				"module": "powerline.segments.ipython",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": "]",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/ipython/in2.json b/zsh-files/.config/powerline/themes/ipython/in2.json
deleted file mode 100644
index 601fc9e..0000000
--- a/zsh-files/.config/powerline/themes/ipython/in2.json
+++ /dev/null
@@ -1,13 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "",
-				"width": "auto",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/ipython/out.json b/zsh-files/.config/powerline/themes/ipython/out.json
deleted file mode 100644
index 11a6323..0000000
--- a/zsh-files/.config/powerline/themes/ipython/out.json
+++ /dev/null
@@ -1,25 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Out[",
-				"draw_soft_divider": false,
-				"width": "auto",
-				"align": "r",
-				"highlight_group": ["prompt"]
-			},
-			{
-				"name": "prompt_count",
-				"module": "powerline.segments.ipython",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": "]",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/ipython/rewrite.json b/zsh-files/.config/powerline/themes/ipython/rewrite.json
deleted file mode 100644
index 47d8de0..0000000
--- a/zsh-files/.config/powerline/themes/ipython/rewrite.json
+++ /dev/null
@@ -1,23 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "",
-				"draw_soft_divider": false,
-				"width": "auto",
-				"highlight_group": ["prompt"]
-			},
-			{
-				"name": "prompt_count",
-				"module": "powerline.segments.ipython",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"contents": ">",
-				"highlight_group": ["prompt"]
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/shell/default.json b/zsh-files/.config/powerline/themes/shell/default.json
deleted file mode 100644
index 6a64b60..0000000
--- a/zsh-files/.config/powerline/themes/shell/default.json
+++ /dev/null
@@ -1,48 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segment_data": {
-		"hostname": {
-			"before": " ",
-			"args": {
-				"only_if_ssh": true
-			}
-		},
-		"virtualenv": {
-			"before": "ⓔ  "
-		},
-		"branch": {
-			"before": " "
-		}
-	},
-	"segments": {
-		"left": [
-			{
-				"name": "user"
-			},
-			{
-				"name": "hostname"
-			},
-			{
-				"name": "virtualenv"
-			},
-			{
-				"name": "cwd",
-				"args": {
-					"dir_limit_depth": 3
-				}
-			}
-		],
-		"right": [
-			{
-				"module": "powerline.segments.shell",
-				"name": "last_pipe_status"
-			},
-			{
-				"name": "branch",
-				"args": {
-					"status_colors": true
-				}
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/shell/default_leftonly.json b/zsh-files/.config/powerline/themes/shell/default_leftonly.json
deleted file mode 100644
index 16af975..0000000
--- a/zsh-files/.config/powerline/themes/shell/default_leftonly.json
+++ /dev/null
@@ -1,43 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segment_data": {
-		"hostname": {
-			"before": " ",
-			"args": {
-				"only_if_ssh": true
-			}
-		},
-		"virtualenv": {
-			"before": "ⓔ  "
-		},
-		"branch": {
-			"before": " "
-		}
-	},
-	"segments": {
-		"left": [
-			{
-				"name": "hostname"
-			},
-			{
-				"name": "user"
-			},
-			{
-				"name": "virtualenv"
-			},
-			{
-				"name": "branch"
-			},
-			{
-				"name": "cwd",
-				"args": {
-					"dir_limit_depth": 3
-				}
-			},
-			{
-				"name": "last_status",
-				"module": "powerline.segments.shell"
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/tmux/default.json b/zsh-files/.config/powerline/themes/tmux/default.json
deleted file mode 100644
index eb5d7e6..0000000
--- a/zsh-files/.config/powerline/themes/tmux/default.json
+++ /dev/null
@@ -1,62 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segment_data": {
-		"uptime": {
-			"before": "⇑  "
-		},
-		"external_ip": {
-			"before": "ⓦ  "
-		},
-		"date": {
-			"before": "⌚ "
-		},
-		"email_imap_alert": {
-			"before": "✉ ",
-			"args": {
-				"username": "",
-				"password": ""
-			}
-		}
-	},
-	"segments": {
-		"right": [
-			{
-				"name": "uptime",
-				"priority": 50
-			},
-			{
-				"name": "external_ip",
-				"priority": 50
-			},
-			{
-				"name": "network_load",
-				"priority": 50
-			},
-			{
-				"name": "system_load",
-				"priority": 50
-			},
-			{
-				"name": "weather",
-				"priority": 50
-			},
-			{
-				"name": "date"
-			},
-			{
-				"name": "date",
-				"args": {
-					"format": "%H:%M",
-					"istime": true
-				}
-			},
-			{
-				"name": "email_imap_alert",
-				"priority": 10
-			},
-			{
-				"name": "hostname"
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/vim/cmdwin.json b/zsh-files/.config/powerline/themes/vim/cmdwin.json
deleted file mode 100644
index c300d94..0000000
--- a/zsh-files/.config/powerline/themes/vim/cmdwin.json
+++ /dev/null
@@ -1,18 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"contents": "Command Line",
-				"highlight_group": ["file_name"]
-			},
-			{
-				"type": "string",
-				"highlight_group": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/vim/default.json b/zsh-files/.config/powerline/themes/vim/default.json
deleted file mode 100644
index 29d6a2a..0000000
--- a/zsh-files/.config/powerline/themes/vim/default.json
+++ /dev/null
@@ -1,108 +0,0 @@
-{
-	"segment_data": {
-		"branch": {
-			"before": " "
-		},
-		"modified_indicator": {
-			"args": { "text": "+" }
-		},
-		"line_percent": {
-			"args": { "gradient": true },
-			"after": "%"
-		},
-		"line_current_symbol": {
-			"contents": " "
-		}
-	},
-	"segments": {
-		"left": [
-			{
-				"name": "mode",
-				"exclude_modes": ["nc"]
-			},
-			{
-				"name": "paste_indicator",
-				"exclude_modes": ["nc"],
-				"priority": 10
-			},
-			{
-				"name": "branch",
-				"exclude_modes": ["nc"],
-				"priority": 30
-			},
-			{
-				"name": "readonly_indicator",
-				"draw_soft_divider": false,
-				"after": " "
-			},
-			{
-				"name": "file_directory",
-				"priority": 40,
-				"draw_soft_divider": false
-			},
-			{
-				"name": "file_name",
-				"draw_soft_divider": false
-			},
-			{
-				"name": "file_vcs_status",
-				"before": " ",
-				"draw_soft_divider": false
-			},
-			{
-				"name": "modified_indicator",
-				"before": " "
-			},
-			{
-				"type": "string",
-				"highlight_group": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"name": "file_format",
-				"draw_soft_divider": false,
-				"exclude_modes": ["nc"],
-				"priority": 60
-			},
-			{
-				"name": "file_encoding",
-				"exclude_modes": ["nc"],
-				"priority": 60
-			},
-			{
-				"name": "file_type",
-				"exclude_modes": ["nc"],
-				"priority": 60
-			},
-			{
-				"name": "line_percent",
-				"priority": 50,
-				"width": 4,
-				"align": "r"
-			},
-			{
-				"type": "string",
-				"name": "line_current_symbol",
-				"highlight_group": ["line_current_symbol", "line_current"]
-			},
-			{
-				"name": "line_current",
-				"draw_soft_divider": false,
-				"width": 3,
-				"align": "r"
-			},
-			{
-				"name": "virtcol_current",
-				"draw_soft_divider": false,
-				"priority": 20,
-				"before": ":",
-				"width": 3,
-				"align": "l"
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/vim/help.json b/zsh-files/.config/powerline/themes/vim/help.json
deleted file mode 100644
index 7407105..0000000
--- a/zsh-files/.config/powerline/themes/vim/help.json
+++ /dev/null
@@ -1,36 +0,0 @@
-{
-	"segments": {
-		"left": [
-			{
-				"name": "file_name",
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"highlight_group": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"name": "line_percent",
-				"priority": 30,
-				"width": 4,
-				"align": "r"
-			},
-			{
-				"type": "string",
-				"name": "line_current_symbol",
-				"highlight_group": ["line_current_symbol", "line_current"]
-			},
-			{
-				"name": "line_current",
-				"draw_soft_divider": false,
-				"width": 3,
-				"align": "r"
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/vim/quickfix.json b/zsh-files/.config/powerline/themes/vim/quickfix.json
deleted file mode 100644
index da77d63..0000000
--- a/zsh-files/.config/powerline/themes/vim/quickfix.json
+++ /dev/null
@@ -1,37 +0,0 @@
-{
-	"segment_data": {
-		"buffer_name": {
-			"contents": "Location List"
-		}
-	},
-	"segments": {
-		"left": [
-			{
-				"type": "string",
-				"name": "buffer_name",
-				"highlight_group": ["file_name"],
-				"draw_soft_divider": false
-			},
-			{
-				"type": "string",
-				"highlight_group": ["background"],
-				"draw_soft_divider": false,
-				"draw_hard_divider": false,
-				"width": "auto"
-			}
-		],
-		"right": [
-			{
-				"type": "string",
-				"name": "line_current_symbol",
-				"highlight_group": ["line_current_symbol", "line_current"]
-			},
-			{
-				"name": "line_current",
-				"draw_soft_divider": false,
-				"width": 3,
-				"align": "r"
-			}
-		]
-	}
-}
diff --git a/zsh-files/.config/powerline/themes/wm/default.json b/zsh-files/.config/powerline/themes/wm/default.json
deleted file mode 100644
index c1cee4b..0000000
--- a/zsh-files/.config/powerline/themes/wm/default.json
+++ /dev/null
@@ -1,31 +0,0 @@
-{
-	"default_module": "powerline.segments.common",
-	"segments": {
-		"right": [
-			{
-				"name": "weather",
-				"priority": 50
-			},
-			{
-				"name": "date"
-			},
-			{
-				"name": "date",
-				"args": {
-					"format": "%H:%M",
-					"istime": true
-				},
-				"before": "⌚ "
-			},
-			{
-				"name": "email_imap_alert",
-				"before": "✉ ",
-				"priority": 10,
-				"args": {
-					"username": "",
-					"password": ""
-				}
-			}
-		]
-	}
-}
diff --git a/zsh-files/aliases.zsh b/zsh-files/aliases.zsh
deleted file mode 100644
index 87475d7..0000000
--- a/zsh-files/aliases.zsh
+++ /dev/null
@@ -1 +0,0 @@
-alias vim="~/local/bin/vim"
diff --git a/zsh-files/antigen b/zsh-files/antigen
deleted file mode 160000
index 7860ce7..0000000
--- a/zsh-files/antigen
+++ /dev/null
@@ -1 +0,0 @@
-Subproject commit 7860ce7aecdbed8fd8ff75472ac59c52c2ac9a7e
diff --git a/zsh-files/exports.zsh b/zsh-files/exports.zsh
deleted file mode 100644
index f3825cf..0000000
--- a/zsh-files/exports.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-# Colors in grep
-export GREP_COLOR='3;33'
-
-# venv
-export VENVS_DIR=$HOME/.virtualenvs
-
-# Vim is Life, Vim is Happiness
-export EDITOR=vim
diff --git a/zsh-files/functions.zsh b/zsh-files/functions.zsh
deleted file mode 100644
index dd5a2c8..0000000
--- a/zsh-files/functions.zsh
+++ /dev/null
@@ -1,8 +0,0 @@
-fancy-ctrl-z () {
-  if [[ $#BUFFER -eq 0 ]]; then
-    bg
-    zle redisplay
-  else
-    zle push-input
-  fi
-}
diff --git a/zsh-files/zsh_opts.zsh b/zsh-files/zsh_opts.zsh
deleted file mode 100644
index ef89a29..0000000
--- a/zsh-files/zsh_opts.zsh
+++ /dev/null
@@ -1,19 +0,0 @@
-setopt no_beep # don't beep on error
-setopt interactive_comments # Allow comments even in interactive shells
-bindkey -v # Vim is king, Vim is life
-bindkey -M viins 'jj' vi-cmd-mode
-bindkey "^R" history-incremental-search-backward
-
-# ===== Navigation
-setopt pushd_ignore_dups
-
-# ===== Completion
-setopt always_to_end # When completing from the middle of a word, move the cursor to the end of the word 
-setopt auto_menu # show completion menu on successive tab press. needs unsetop menu_complete to work
-setopt auto_name_dirs # any parameter that is set to the absolute name of a directory immediately becomes a name for that directory
-setopt complete_in_word # Allow completion from within a word/phrase
-
-unsetopt menu_complete # do not autoselect the first completion entry
-
-# ===== Prompt
-setopt prompt_subst
diff --git a/zsh-files/zshrc b/zsh-files/zshrc
deleted file mode 100644
index 78cae2c..0000000
--- a/zsh-files/zshrc
+++ /dev/null
@@ -1,48 +0,0 @@
-HISTFILE=~/.histfile
-HISTSIZE=1000
-SAVEHIST=1000
-
-source ~/antigen.zsh
-
-antigen use oh-my-zsh
-
-antigen bundle zsh-users/zsh-syntax-highlighting
-antigen bundle zsh-users/zsh-history-substring-search
-antigen bundle rupa/z
-antigen bundle git
-
-# OSX specific
-if [[ "$(uname -s)" = "Darwin" ]]; then
-  antigen bundle brew
-  antigen bundle brew-cask
-fi
-
-antigen theme bureau
-
-antigen apply
-
-source ~/dotfiles/zsh-files/zsh_opts.zsh
-source ~/dotfiles/zsh-files/exports.zsh
-source ~/dotfiles/zsh-files/functions.zsh
-source ~/dotfiles/zsh-files/aliases.zsh
-
-zstyle :compinstall filename '/Users/haak/.zshrc'
-
-autoload -Uz compinit
-compinit
-
-zle -N fancy-ctrl-z
-bindkey '^Z' fancy-ctrl-z
-
-eval "$(direnv hook zsh)"
-
-export NVM_DIR="/home/haak/.nvm"
-[ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh"  # This loads nvm
-
-autoload bashcompinit
-export PATH="$HOME/.linuxbrew/bin:$PATH"
-bashcompinit
-. $HOME/.asdf/asdf.sh
-. $HOME/.asdf/completions/asdf.bash
-
-[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh