lots of changes, mostly to align with the sway-config-fedora package

1 files changed, 9 insertions, 7 deletions

diff --git a/sway-de/install.sh b/sway-de/install.sh
index b80b7dd..88b50ab 100755
--- a/sway-de/install.sh
+++ b/sway-de/install.sh
@@ -19,6 +19,7 @@ if ! command -v dnf > /dev/null !! [ ! -f /etc/fedora-release ]; then
   exit 1
 fi
 
+
 # give the option to skip installing packages since dnf can be slow
 skip_packages=""
 while [[ $# -gt 0 ]]; do
@@ -36,7 +37,7 @@ done
 if [ -z "$skip_packages" ]; then
 
   # install rpmfusion if it's not already installed
-  repos_installed=$(dnf --cacheonly repolist | tail -n+2 | cut -f1 -d' ' | grep -Exc 'rpmfusion-free|rpmfusion-nonfree')
+  repos_installed="$(dnf --cacheonly repolist | tail -n+2 | cut -f1 -d' ' | awk '/(^rpmfusion-free$)|(^rpmfusion-nonfree$)/' | wc -l)"
   if [ "$repos_installed" -lt "2" ]; then
     sudo dnf install \
       "https://mirrors.rpmfusion.org/free/fedora/rpmfusion-free-release-$(rpm -E %fedora).noarch.rpm" \
@@ -45,9 +46,11 @@ if [ -z "$skip_packages" ]; then
 
   # install packages
   sudo dnf install \
-    sway waybar wob wofi foot lxpolkit mako cascadia-mono-pl-fonts \
+    sway waybar rofi-wayland foot mako cascadia-mono-pl-fonts \
     udiskie libappindicator-gtk3 duplicity python3-b2sdk pass passmenu \
-    brightnessctl vlc unzip vim wget git zsh stow dnf-automatic
+    brightnessctl vlc unzip vim wget git zsh stow dnf-automatic \
+    grimshot pulseaudio-utils thunar pavucontrol-qt \
+    network-manager-applet
 
 fi
 
@@ -67,12 +70,11 @@ fi
 $STOWCMD \
   --dir "$(pwd)" \
   --target "$HOME" \
-  foot lxpolkit mako sway swaylock udiskie waybar wob wofi
+  foot mako rofi sway swaylock udiskie waybar
 
 # enable new systemd units and start them if sway is running
-sway_active=$(systemctl --user is-active sway-session.target)
-for unit in lxpolkit.service mako.service udiskie.service wob.service wob.socket; do
-  if [ "active" = "$sway_active" ]; then
+for unit in udiskie.service; do
+  if systemctl --user is-active sway-session.target; then
     systemctl --user enable --now "$(basename "$unit")"
   else
     systemctl --user enable "$(basename "$unit")"