From 8e8da7f7c6a20f530bf25dbb6fbb8d000f5c6d45 Mon Sep 17 00:00:00 2001
From: askiiart <dev@askiiart.net>
Date: Sun, 17 Mar 2024 18:57:12 -0500
Subject: [PATCH] Update fedora-sway, fix minor issues

---
 fedora-sway.sh   | 8 ++++----
 fish/config.fish | 1 -
 restore.sh       | 1 -
 3 files changed, 4 insertions(+), 6 deletions(-)
 delete mode 120000 fish/config.fish

diff --git a/fedora-sway.sh b/fedora-sway.sh
index 941ee5d..dcdefb5 100755
--- a/fedora-sway.sh
+++ b/fedora-sway.sh
@@ -1,12 +1,14 @@
 #!/usr/bin/env bash
-# assumes a budgie base with askiiart/configs/do-everything.bash already run
+# assumes a Fedora Sway base with askiiart/configs/do-everything.bash already run
+# TODO: Add schildichat-desktop to askiiart.net repo, add GTK themes and fix-gamepad.service from askiiart/nix
 if [ $(whoami) == "root" ]; then
     echo "Run as a normal user, not root"
     exit 1
 fi
 GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
-sudo dnf install sway i3status clipman swaybg swaylock j4-dmenu-desktop slurp grim zenity -y
+sudo dnf install i3status clipman swaybg swaylock slurp grim zenity wdisplays eom nemo pavucontrol brightnessctl gnome-calculator wl-clipboard gedit -y
+sudo dnf remove Thunar
 
 # Install catppuccin grub theme
 git clone --depth=1 https://github.com/catppuccin/grub
@@ -16,8 +18,6 @@ rm -rf grub/
 echo 'GRUB_THEME=/usr/share/grub/themes/catppuccin-mocha-grub-theme/theme.txt' | sudo tee /etc/default/grub
 sudo grub2-mkconfig -o /boot/grub2/grub.cfg
 
-echo "Log out, change to sway, then log back in"
-
 # greetd
 #sudo dnf install tuigreet -y
 #sudo cp $GIT_DIR/greetd/config.toml /etc/greetd/config.toml
diff --git a/fish/config.fish b/fish/config.fish
deleted file mode 120000
index 72dbe27..0000000
--- a/fish/config.fish
+++ /dev/null
@@ -1 +0,0 @@
-/nix/store/gbyb346pv88ah3nwgrswgimx1xcvp9h5-home-manager-files/.config/fish/config.fish
\ No newline at end of file
diff --git a/restore.sh b/restore.sh
index 74bceae..9e287b6 100755
--- a/restore.sh
+++ b/restore.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-set -x
 GIT_DIR=$(cd -- "$(dirname -- "${BASH_SOURCE[0]}")" &>/dev/null && pwd)
 
 # fish