From f870de2adf9f29f05261ecc12df90d5b3a7e6efe Mon Sep 17 00:00:00 2001
From: Daniel Flanagan <daniel@lyte.dev>
Date: Mon, 10 May 2021 13:29:39 -0500
Subject: [PATCH] Fixes from dragon install

---
 common/bin/clipshot                                 | 1 +
 common/bin/dotfiles-link-environments               | 1 +
 common/bin/dotfiles-setup                           | 5 +++--
 os/linux/arch/provision.d/optional/ui-packages.bash | 6 +++---
 4 files changed, 8 insertions(+), 5 deletions(-)

diff --git a/common/bin/clipshot b/common/bin/clipshot
index c4b4d4d..8becd5a 100755
--- a/common/bin/clipshot
+++ b/common/bin/clipshot
@@ -5,6 +5,7 @@ set -x
 umask 077
 d="$(date +"%Y-%m-%d_%H-%M-%S")"
 fn="$SCROTS_PATH/clipshot_$d.png"
+mkdir -p "$SCROTS_PATH"
 
 if is_wayland; then
 	dim="$(slurp -d)"
diff --git a/common/bin/dotfiles-link-environments b/common/bin/dotfiles-link-environments
index 8718fad..0d157d0 100755
--- a/common/bin/dotfiles-link-environments
+++ b/common/bin/dotfiles-link-environments
@@ -12,6 +12,7 @@ files $dfp/common/envs | \
 		--preview="ls -la --color=always {}" | \
 	string trim | \
 	read -a -d \n -z lines
+mkdir -p $ENV_PATH
 for l in $lines
 	test $l = "" && continue
 	set ll (string replace -a / - $l)
diff --git a/common/bin/dotfiles-setup b/common/bin/dotfiles-setup
index 0e0b613..3a08509 100755
--- a/common/bin/dotfiles-setup
+++ b/common/bin/dotfiles-setup
@@ -8,7 +8,8 @@ set lock_file $HOME/.using-lytedev-dotfiles.lock
 
 if not test -f $lock_file
 	echo This will delete existing files. Make sure you know what you\'re doing.
-	read -r -p "Are you sure you want to continue? [y/N] " response
+	printf 'Are you sure you want to continue? [y/N] '
+	read response
 	set response (string lower $response)
 	if string match $response y
 		echo "agreed" > "$lock_file"
@@ -47,7 +48,7 @@ l common/kak $c/kak
 l common/gpg/agent.conf $h/.gnupg/gpg-agent.conf
 l common/htop/rc $c/htop/htoprc
 l common/kitty $c/kitty
-l common/mutt/rc $c/.muttrc
+l common/mutt/rc $h/.muttrc
 l common/git/config $h/.gitconfig
 l common/elixir/iex.exs $h/.iex.exs
 l common/data/user-dirs $c/user-dirs.dirs
diff --git a/os/linux/arch/provision.d/optional/ui-packages.bash b/os/linux/arch/provision.d/optional/ui-packages.bash
index c5bb29f..7eda7dd 100755
--- a/os/linux/arch/provision.d/optional/ui-packages.bash
+++ b/os/linux/arch/provision.d/optional/ui-packages.bash
@@ -11,7 +11,7 @@ fi
 
 # TODO: switch to Nautilus?
 
-yay -Sy \
+yay -Sy --needed \
 	xf86-input-libinput \
 	libinput libinput-gestures `# Trackpad Control` \
 	bluez bluez-libs bluez-utils bluez-tools `# Bluetooth` \
@@ -46,7 +46,7 @@ yay -Sy \
 	firefox-nightly `# Default Web Browser` \
 	alsa-utils `# Audio Utilities` \
 	alsa-plugins `# Plugins for ALSA` \
-	pulseaudio pavucontrol pulsemixer `# Audio Backend and Controls` \
+	pavucontrol pulsemixer `# Audio Backend and Controls` \
 	playerctl `# Media Keys Controls` \
 	feh `# Image Viewer & Wallpaper Manager` \
 	wlroots sway `# Wayland Compositor` \
@@ -57,7 +57,7 @@ yay -Sy \
 	slurp grim wl-clipboard `# Sway Screen Selection & Clipping` \
 	pipewire pipewire-pulse pipewire-media-session `# Pipewire` \
 	xdg-desktop-portal xdg-desktop-portal-wlr `# Screensharing` \
-	obs-studio-wayland obs-xdg-portal `# OBS` \
+	obs-studio `# OBS` \
 	ttf-iosevka `# Primary Fonts` \
 	ttf-font-awesome `# Icon Font` \
 	ripcord `# Discord and Slack Client`