diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..eb2d171
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1 @@
+en.utf-8.*
diff --git a/dotfiles.sh b/dotfiles.sh
new file mode 100755
index 0000000..6a947b1
--- /dev/null
+++ b/dotfiles.sh
@@ -0,0 +1,4 @@
+#!/bin/bash
+for conf in $(ls dotfiles); do
+    ln -sn $PWD/dotfiles/$conf $HOME/.config/$conf
+done
diff --git a/dotfiles/fish/functions/fish_load_env.fish b/dotfiles/fish/functions/fish_load_env.fish
new file mode 100644
index 0000000..8ec11c6
--- /dev/null
+++ b/dotfiles/fish/functions/fish_load_env.fish
@@ -0,0 +1,6 @@
+function fish_load_env
+    for i in (cat $argv)
+        set arr (echo $i | tr = \n)
+        set -gx $arr[1] (echo $arr[2] | tr -d '"')
+    end
+end
diff --git a/dotfiles/nvim/init.vim b/dotfiles/nvim/init.vim
index ae77615..ab95b36 100644
--- a/dotfiles/nvim/init.vim
+++ b/dotfiles/nvim/init.vim
@@ -3,6 +3,7 @@ call plug#begin('~/.local/share/nvim/plugged')
     Plug 'morhetz/gruvbox'
     Plug 'neoclide/coc.nvim', {'branch': 'release'}
     Plug 'mattn/emmet-vim'
+    Plug 'NoahTheDuke/vim-just'
 call plug#end()
 
 "Theme
@@ -19,6 +20,12 @@ command TMK w | call system("latexmk -pdf " . expand("%")) | call system("latexm
 command Shh set nonu norelativenumber scl=no
 command NoShh set nu relativenumber scl=auto
 
+autocmd BufWritePost *.tf call TerraformFormat()
+function TerraformFormat()
+    call system("terraform fmt " . expand("%"))"
+    edit
+endfunction
+
 inoremap <silent><expr> <cr> pumvisible() ? coc#_select_confirm()
     \: "\<C-g>u\<CR>\<c-r>=coc#on_enter()\<CR>"
 
diff --git a/setup.sh b/setup.sh
deleted file mode 100755
index b6aa47d..0000000
--- a/setup.sh
+++ /dev/null
@@ -1,29 +0,0 @@
-#!/bin/bash
-setup_macos() {
-    # Install Homebrew
-    /bin/bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/HEAD/install.sh)";
-}
-
-for conf in $(ls dotfiles); do
-    ln -sn $PWD/dotfiles/$conf $HOME/.config/$conf
-done
-
-# Determine which OS is in use
-case "$(uname)" in
-    Linux*)   INSTALL_CMD="yay -S";;
-    Darwin*)  INSTALL_CMD="brew install";;
-esac
-
-# Install software
-$INSTALL_CMD fish git cloc htop ncdu tree
-$INSTALL_CMD alacritty neovim zellij zoxide
-$INSTALL_CMD rustup rust-analyzer
-$INSTALL_CMD go gopls
-$INSTALL_CMD nodejs yarn
-$INSTALL_CMD obsidian
-
-if [[ "$(uname)" == "Linux" ]]; then
-    $INSTALL_CMD rofi
-    $INSTALL_CMD lxappearance adapta-gtk-theme papirus-icon-theme nerd-fonts-complete
-    $INSTALL_CMD docker docker-compose
-fi