diff --git a/setup/config.zsh b/setup/config.zsh
index 3f4438d..db42a73 100644
--- a/setup/config.zsh
+++ b/setup/config.zsh
@@ -36,7 +36,7 @@ CONFIG__VIM() {
 	CONFIG__ENV vim || return 1
 	CONFIG__RC  vim || return 2
 
-	[ $NO_COMPILE_VIM ] && return 0
+	[ $COMPILE_VIM ] && [[ $COMPILE_VIM -eq 1 ]] && return 0
 
 	STATUS 'starting vim setup'
 	"$DOTWRYN_PATH/vim/update" \
diff --git a/setup/os-dependencies/arch.txt b/setup/os-dependencies/arch.txt
index 3ca89d6..3850658 100644
--- a/setup/os-dependencies/arch.txt
+++ b/setup/os-dependencies/arch.txt
@@ -1,4 +1,4 @@
-aws-cli-v2-bin
+aws-cli-v2
 cmake
 cowsay
 figlet
@@ -8,3 +8,5 @@ ncurses
 python
 ripgrep
 tmux
+vim
+vim-runtime
diff --git a/setup/os-dependencies/generic.txt b/setup/os-dependencies/generic.txt
index 23ad7b0..01e1ac7 100644
--- a/setup/os-dependencies/generic.txt
+++ b/setup/os-dependencies/generic.txt
@@ -1,5 +1,4 @@
 aws
-build-essential
 cmake
 cowsay
 figlet
diff --git a/setup/os.zsh b/setup/os.zsh
index 204c8cd..11c2b7f 100644
--- a/setup/os.zsh
+++ b/setup/os.zsh
@@ -33,19 +33,16 @@ OS__GET_OS() {
 OS__INSTALL_SOURCE_DEPENDENCIES() {
 	case $OS_NAME in
 		arch )
-			SCWRYPTS packages/install \
-				'https://aur.archlinux.org/yay.git' \
-				--local-name 'yay' \
+			command -v yay >/dev/null 2>&1 \
+				|| SCWRYPTS packages/install 'https://aur.archlinux.org/yay.git' --local-name 'yay' \
 				;
 			;;
 		debian ) ;;
 		* ) ;;
 	esac
 
-	SCWRYPTS packages/install \
-		'https://github.com/tiyn/dmenu' \
-		--local-name 'patched-dmenu' \
-		;
+	[ $COMPILE_DMENU ] && [[ $COMPILE_DMENU -eq 1 ]] \
+		&& SCWRYPTS packages/install 'https://github.com/tiyn/dmenu' --local-name 'patched-dmenu'
 }
 
 #####################################################################
diff --git a/setup/run b/setup/run
index e2a9b15..5bac10d 100755
--- a/setup/run
+++ b/setup/run
@@ -3,11 +3,15 @@ cd "${0:a:h}"
 while [[ $# -gt 0 ]]
 do
 	case $1 in
-		--no-compile-vim ) NO_COMPILE_VIM=1 ;;
-		--ci             ) export CI=1      ;;
-		--force-root     ) FORCE_ROOT=1     ;;
-		--no-fluff )
-			NO_COMPILE_VIM=1
+		--force-root ) FORCE_ROOT=1     ;;
+		        --ci ) export CI=1      ;;
+
+		--no-compile-dmenu ) COMPILE_DMENU=0 ;;
+		  --no-compile-vim ) COMPILE_VIM=0 ;;
+
+		--min )
+			COMPILE_VIM=0
+			COMPILE_DMENU=0
 			;;
 	esac
 	shift 1