From f2823f2c78823ce610a3260e0c47ecd92bbc2b93 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Fri, 6 Dec 2024 22:21:21 -0600
Subject: [PATCH] update dnf add repo syntax

---
 distro-specific.bash                 |  2 +-
 do-everything.bash                   |  1 +
 dotfiles                             |  2 +-
 install-stuff/install-librewolf.bash |  4 ++--
 install-stuff/install-rust.sh        |  3 +--
 install-stuff/install-swayfx.bash    | 15 +++++++++++++++
 install-stuff/install-yt-music.bash  |  2 +-
 7 files changed, 22 insertions(+), 7 deletions(-)
 create mode 100755 install-stuff/install-swayfx.bash

diff --git a/distro-specific.bash b/distro-specific.bash
index bb5c630..b9c0b06 100755
--- a/distro-specific.bash
+++ b/distro-specific.bash
@@ -11,7 +11,7 @@ if command_exists "apt-get"; then
     sudo apt install curl -y
 
 elif command_exists "dnf"; then
-    sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo
+    sudo dnf config-manager addrepo --from-repofile 'https://askiiart.net/repos/fedora/x86_64/askiiart.repo'
     sudo dnf remove libreoffice* atril -y
     sudo dnf install https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm https://mirrors.rpmfusion.org/nonfree/fedora/rpmfusion-nonfree-release-$(rpm -E %fedora).noarch.rpm -y
 
diff --git a/do-everything.bash b/do-everything.bash
index 6f10672..04aadfc 100755
--- a/do-everything.bash
+++ b/do-everything.bash
@@ -23,6 +23,7 @@ chmod 700 ./*.bash
 ./install-fonts.bash
 ./install-yt-music.bash
 ./install-vesktop.bash
+./install-swayfx.bash
 cd ..
 
 cd ./dotfiles
diff --git a/dotfiles b/dotfiles
index 3efec5e..378dd53 160000
--- a/dotfiles
+++ b/dotfiles
@@ -1 +1 @@
-Subproject commit 3efec5e1415f31d5421f07f1a389b82c765c2338
+Subproject commit 378dd535145954be0e101d8358890e79ddb7b601
diff --git a/install-stuff/install-librewolf.bash b/install-stuff/install-librewolf.bash
index b22b806..f5bf655 100755
--- a/install-stuff/install-librewolf.bash
+++ b/install-stuff/install-librewolf.bash
@@ -14,7 +14,7 @@ if command_exists "apt-get"; then
     sudo apt update
     sudo apt install librewolf -y
 elif command_exists "dnf"; then
-    sudo dnf config-manager --add-repo https://rpm.librewolf.net/librewolf-repo.repo
+    sudo dnf config-manager addrepo --from-repofile 'https://repo.librewolf.net/librewolf.repo'
     sudo dnf install librewolf
     sudo dnf remove firefox
     mkdir tmp-openh264
@@ -31,7 +31,7 @@ elif command_exists "dnf"; then
     rm -rf ./tmp-openh264/
 elif command_exists "rpm-ostree"; then
     if ! command_exists "librewolf"; then
-        sudo wget https://rpm.librewolf.net/librewolf-repo.repo -O /etc/yum.repos.d/librewolf.repo
+        sudo wget https://repo.librewolf.net/librewolf.repo -O /etc/yum.repos.d/librewolf.repo
         rpm-ostree install librewolf
         rpm-ostree remove firefox
         read -p "Press enter to reboot, then run do-everything.bash again"
diff --git a/install-stuff/install-rust.sh b/install-stuff/install-rust.sh
index 3f665b7..924569f 100755
--- a/install-stuff/install-rust.sh
+++ b/install-stuff/install-rust.sh
@@ -7,7 +7,6 @@ fi
 command_exists() { type "$1" &>/dev/null; }
 
 if command_exists "yum"; then
-    sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo
     sudo dnf install rustup -y
     fish -c "rustup-init"
 elif command_exists "rpm-ostree"; then
@@ -20,4 +19,4 @@ else
     echo "figure out rustup yourself"
     echo "enter to continue"
     read -p ""
-fi
\ No newline at end of file
+fi
diff --git a/install-stuff/install-swayfx.bash b/install-stuff/install-swayfx.bash
new file mode 100755
index 0000000..b16d59d
--- /dev/null
+++ b/install-stuff/install-swayfx.bash
@@ -0,0 +1,15 @@
+#!/usr/bin/env bash
+if [ $(whoami) == "root" ]; then
+    echo "Run as a normal user, not root"
+    exit 1
+fi
+
+# only fedora is up-to-date
+
+command_exists() { type "$1" &>/dev/null; }
+
+if command_exists "dnf"; then
+    sudo dnf copr enable swayfx/swayfx
+    sudo rm /etc/dnf/protected.d/fedora-sway.conf
+    sudo dnf install swayfx --allowerasing  # conflicts with sway, so this will remove sway
+fi
diff --git a/install-stuff/install-yt-music.bash b/install-stuff/install-yt-music.bash
index 7d9b5a0..318f41c 100755
--- a/install-stuff/install-yt-music.bash
+++ b/install-stuff/install-yt-music.bash
@@ -12,7 +12,7 @@ if command_exists "apt-get"; then
     sudo apt update --allow-insecure-repositories
     sudo apt install youtube-music -y --allow-unauthenticated
 elif command_exists "yum"; then
-    sudo dnf config-manager --add-repo https://askiiart.net/repos/fedora/x86_64/askiiart.repo
+    sudo dnf config-manager addrepo --from-repofile 'https://askiiart.net/repos/fedora/x86_64/askiiart.repo'
     sudo dnf install youtube-music -y
 elif command_exists "rpm-ostree"; then
     sudo wget https://askiiart.net/repos/fedora/x86_64/askiiart.repo -O /etc/yum.repos.d/askiiart.repo