separate sway-de folder causes problems with overlapping stow responsibilities

15 files changed, 10 insertions, 10 deletions

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
diff --git a/sway-de/foot/.config/foot/foot.ini b/stow/foot/.config/foot/foot.ini
index 98964ba..98964ba 100644
--- a/sway-de/foot/.config/foot/foot.ini
+++ b/stow/foot/.config/foot/foot.ini
diff --git a/sway-de/mako/.config/mako/config b/stow/mako/.config/mako/config
index 35a08d8..35a08d8 100644
--- a/sway-de/mako/.config/mako/config
+++ b/stow/mako/.config/mako/config
diff --git a/sway-de/rofi/.config/rofi/config.rasi b/stow/rofi/.config/rofi/config.rasi
index 2a37aca..2a37aca 100644
--- a/sway-de/rofi/.config/rofi/config.rasi
+++ b/stow/rofi/.config/rofi/config.rasi
diff --git a/sway-de/rofi/.config/rofi/themes/totus.rasi b/stow/rofi/.config/rofi/themes/totus.rasi
index 227f5f8..227f5f8 100644
--- a/sway-de/rofi/.config/rofi/themes/totus.rasi
+++ b/stow/rofi/.config/rofi/themes/totus.rasi
diff --git a/sway-de/rofi/.local/bin/dmenu-wl b/stow/rofi/.local/bin/dmenu-wl
index fdc4fa5..fdc4fa5 100755
--- a/sway-de/rofi/.local/bin/dmenu-wl
+++ b/stow/rofi/.local/bin/dmenu-wl
diff --git a/sway-de/sway/.config/sway/config b/stow/sway/.config/sway/config
index 32442ad..32442ad 100644
--- a/sway-de/sway/.config/sway/config
+++ b/stow/sway/.config/sway/config
diff --git a/sway-de/sway/.local/bin/dnf-needs-restarting b/stow/sway/.local/bin/dnf-needs-restarting
index 7fc6542..7fc6542 100755
--- a/sway-de/sway/.local/bin/dnf-needs-restarting
+++ b/stow/sway/.local/bin/dnf-needs-restarting
diff --git a/sway-de/swaylock/.config/swaylock/config b/stow/swaylock/.config/swaylock/config
index f4ee89e..f4ee89e 100644
--- a/sway-de/swaylock/.config/swaylock/config
+++ b/stow/swaylock/.config/swaylock/config
diff --git a/sway-de/udiskie/.config/systemd/user/udiskie.service b/stow/udiskie/.config/systemd/user/udiskie.service
index ba7e7f0..ba7e7f0 100644
--- a/sway-de/udiskie/.config/systemd/user/udiskie.service
+++ b/stow/udiskie/.config/systemd/user/udiskie.service
diff --git a/sway-de/waybar/.config/waybar/config b/stow/waybar/.config/waybar/config
index f3dd9b1..f3dd9b1 100644
--- a/sway-de/waybar/.config/waybar/config
+++ b/stow/waybar/.config/waybar/config
diff --git a/sway-de/waybar/.config/waybar/style.css b/stow/waybar/.config/waybar/style.css
index de3eb19..de3eb19 100644
--- a/sway-de/waybar/.config/waybar/style.css
+++ b/stow/waybar/.config/waybar/style.css
diff --git a/sway-de/xdg-names/.config/systemd/user/xdg-names.service b/stow/xdg-names/.config/systemd/user/xdg-names.service
index 799431b..799431b 100644
--- a/sway-de/xdg-names/.config/systemd/user/xdg-names.service
+++ b/stow/xdg-names/.config/systemd/user/xdg-names.service
diff --git a/sway-de/xdg-names/.config/xdg-names.ini b/stow/xdg-names/.config/xdg-names.ini
index 3a08dd8..3a08dd8 100644
--- a/sway-de/xdg-names/.config/xdg-names.ini
+++ b/stow/xdg-names/.config/xdg-names.ini
diff --git a/sway-de/xdg-names/.local/bin/xdg-names.py b/stow/xdg-names/.local/bin/xdg-names.py
index b5c3e42..b5c3e42 100755
--- a/sway-de/xdg-names/.local/bin/xdg-names.py
+++ b/stow/xdg-names/.local/bin/xdg-names.py