diff --git a/src/.config/fish/config.fish b/src/.config/fish/config.fish
index 387912e..978440a 100644
--- a/src/.config/fish/config.fish
+++ b/src/.config/fish/config.fish
@@ -17,17 +17,19 @@ set -gx  MANPATH "$MANPATH:/home/dogeystamp/.cache/cppman/"
 set fish_greeting ""
 
 if status --is-interactive
-	source ~/.config/fish/functions/prompts.fish
-	source ~/.config/fish/functions/extra_prompt.fish
-
 	# Enable Vi bindings
 	fish_hybrid_key_bindings
 
+	source ~/.config/fish/functions/prompts.fish
+
 	set __fish_git_prompt_showdirtystate 1
 	set __fish_git_prompt_showupstream auto
 
 	set fish_color_param normal
 	set fish_color_cwd grey
 
-	rem.sh show
+	if test $SYSTEM_PROFILE = "DEFAULT"
+		source ~/.config/fish/functions/extra_prompt.fish
+		rem.sh show
+	end
 end
diff --git a/src/.config/fish/functions/prompts.fish b/src/.config/fish/functions/prompts.fish
index 950b8ae..f2ad31d 100644
--- a/src/.config/fish/functions/prompts.fish
+++ b/src/.config/fish/functions/prompts.fish
@@ -1,4 +1,8 @@
 function fish_right_prompt
+	if test $SYSTEM_PROFILE != "DEFAULT"
+		return
+	end
+
 	set -l usercolor (set_color $fish_color_cwd)
 	if command -sq cksum
 		# randomised color for user/hostname based on disco.fish
diff --git a/src/.xinitrc b/src/.xinitrc
index 784db9e..10c60f7 100755
--- a/src/.xinitrc
+++ b/src/.xinitrc
@@ -1,7 +1,15 @@
 #!/bin/sh
 
 mon-on
-picom &
+
+if [ $SYSTEM_PROFILE == "MINIMAL" ]; then
+	dwm
+	exit
+fi
+
+if [ $SYSTEM_PROFILE == "DEFAULT" ]; then
+	picom &
+fi
 xwallpaper --center .config/wall.png
 # Host specific wallpapers
 wallpaper