diff --git a/.bin/.e b/.bin/.e
index ea21212..e9f17ac 100755
--- a/.bin/.e
+++ b/.bin/.e
@@ -1,11 +1,13 @@
 #!/usr/bin/env bash
 
 declare -A mapper=(
+	[".e"]="$HOME/.bin/.e"
 	["alacritty"]="$HOME/.config/alacritty/alacritty.yml"
 	["astronvim"]="$HOME/.config/astronvim/lua/user/init.lua"
 	["bash"]="$HOME/.bashrc"
 	["bspwm"]="$HOME/.config/bspwm/bspwmrc"
 	["environment"]="$HOME/.config/environment"
+	["environment.local"]="$HOME/.config/environment.local"
 	["git"]="$HOME/.config/git/config"
 	["git-ignore"]="$HOME/.config/git/ignore"
 	["qutebrowser"]="$HOME/.config/qutebrowser/common.py"
diff --git a/.bin/autoinstall-packages b/.bin/autoinstall-packages
index bc89f7d..0638006 100755
--- a/.bin/autoinstall-packages
+++ b/.bin/autoinstall-packages
@@ -21,3 +21,10 @@ then
 	mkdir -p "$HOME/.local/bin"
 	curl -sS "https://starship.rs/install.sh" | BIN_DIR="$HOME/.local/bin" FORCE=1 sh
 fi
+
+if [ -x "$(command -v envsubst)" ]
+then
+	wakatime_cfg="$WAKATIME_HOME/.wakatime.cfg"
+	wakatime_tpl="$wakatime_cfg.tpl"
+	envsubst < "$wakatime_tpl" > "$wakatime_cfg"
+fi
diff --git a/.config/vim/vimrc b/.config/vim/vimrc
index f6596f1..7f37881 100644
--- a/.config/vim/vimrc
+++ b/.config/vim/vimrc
@@ -34,7 +34,9 @@ call plug#begin('~/.config/vim/plugged')
 	Plug 'sheerun/vim-polyglot'
 
 	" Misc
-	Plug 'wakatime/vim-wakatime'
+	if $WAKATIME_API_KEY != ""
+		Plug 'wakatime/vim-wakatime'
+	endif
 call plug#end()
 
 
diff --git a/.config/wakatime/.wakatime.cfg.tpl b/.config/wakatime/.wakatime.cfg.tpl
new file mode 100644
index 0000000..b2a8a73
--- /dev/null
+++ b/.config/wakatime/.wakatime.cfg.tpl
@@ -0,0 +1,12 @@
+[settings]
+debug=true
+hide_file_names=false
+hide_project_folder=true
+hide_branch_names=false
+ignore=
+    COMMIT_EDITMSG$
+    PULLREQ_EDITMSG$
+    MERGE_MSG$
+    TAG_EDITMSG$
+exclude_unknown_project=true
+api_key=${WAKATIME_API_KEY}