From 38a4e8e941ee07a15b0aa5d388a69df061585ec9 Mon Sep 17 00:00:00 2001
From: Matt Singleton <matt@xcolour.net>
Date: Tue, 11 Jun 2024 20:51:49 -0500
Subject: separate sway-de folder causes problems with overlapping stow
 responsibilities

---
 Makefile | 20 ++++++++++----------
 1 file changed, 10 insertions(+), 10 deletions(-)

(limited to 'Makefile')

diff --git a/Makefile b/Makefile
index 5b132e7..e57ae3e 100644
--- a/Makefile
+++ b/Makefile
@@ -29,7 +29,7 @@ else
 		udiskie libappindicator-gtk3 python3-b2sdk pass passmenu \
 		vlc unzip vim wget git zsh stow dnf-automatic \
 		grimshot pulseaudio-utils thunar pavucontrol-qt \
-		network-manager-applet
+		network-manager-applet sway-config-fedora
 endif
 
 .PHONY: fedora
@@ -37,14 +37,14 @@ fedora: console
 ifneq ($(IS_FEDORA),0)
 	$(warning not fedora workstation, skipping.)
 else
-	stow --adopt --dir=sway-de --target=$(HOME) foot
-	stow --adopt --dir=sway-de --target=$(HOME) mako
-	stow --adopt --dir=sway-de --target=$(HOME) rofi
-	stow --adopt --dir=sway-de --target=$(HOME) sway
-	stow --adopt --dir=sway-de --target=$(HOME) swaylock
-	stow --adopt --dir=sway-de --target=$(HOME) udiskie
-	stow --adopt --dir=sway-de --target=$(HOME) waybar
-	stow --adopt --dir=sway-de --target=$(HOME) xdg-names
+	stow --adopt --dir=stow --target=$(HOME) foot
+	stow --adopt --dir=stow --target=$(HOME) mako
+	stow --adopt --dir=stow --target=$(HOME) rofi
+	stow --adopt --dir=stow --target=$(HOME) sway
+	stow --adopt --dir=stow --target=$(HOME) swaylock
+	stow --adopt --dir=stow --target=$(HOME) udiskie
+	stow --adopt --dir=stow --target=$(HOME) waybar
+	stow --adopt --dir=stow --target=$(HOME) xdg-names
 ifeq ($(shell systemctl --user is-active sway-session.target),active)
 	systemctl --user enable --now udiskie.service
 	systemctl --user enable --now xdg-names.service
@@ -57,4 +57,4 @@ endif
 
 .PHONY: restore
 restore:
-	git restore stow sway-de
+	git restore stow
-- 
cgit v1.2.3