From 0931a95f553e8ee9a0a61587b42031db53fb4fe4 Mon Sep 17 00:00:00 2001
From: Ruben <60184397+sneexy-boi@users.noreply.github.com>
Date: Wed, 28 Feb 2024 10:52:38 -0600
Subject: [PATCH] chore(mazurek): move scripts, merge scripts, enable sddm

---
 config/common/sneexy/mazurek/system.yml             |  1 +
 config/recipes/sneexy/mazurek.yml                   |  3 +--
 config/scripts/mazurek-disable-copr.sh              | 13 -------------
 ...zurek-install-from-copr.sh => system-mazurek.sh} | 12 ++++++++++++
 4 files changed, 14 insertions(+), 15 deletions(-)
 delete mode 100644 config/scripts/mazurek-disable-copr.sh
 rename config/scripts/{mazurek-install-from-copr.sh => system-mazurek.sh} (60%)

diff --git a/config/common/sneexy/mazurek/system.yml b/config/common/sneexy/mazurek/system.yml
index 20b7ee84..95e5e8ce 100644
--- a/config/common/sneexy/mazurek/system.yml
+++ b/config/common/sneexy/mazurek/system.yml
@@ -14,6 +14,7 @@ repos:
 install:
 # display manager
     - sddm
+    - sddm-wayland-generic
     - sddm-themes
 
 # environment
diff --git a/config/recipes/sneexy/mazurek.yml b/config/recipes/sneexy/mazurek.yml
index a10e0c12..848f7c65 100644
--- a/config/recipes/sneexy/mazurek.yml
+++ b/config/recipes/sneexy/mazurek.yml
@@ -22,8 +22,7 @@ modules:
     # run scripts afterwards
   - type: script
     scripts:
-        - mazurek-install-from-copr.sh
-        - mazurek-disable-copr.sh
+        - system-mazurek.sh
 
   # installs default repositories and flatpak packages
   - from-file: common/sneexy/flatpaks.yml
diff --git a/config/scripts/mazurek-disable-copr.sh b/config/scripts/mazurek-disable-copr.sh
deleted file mode 100644
index 960cd593..00000000
--- a/config/scripts/mazurek-disable-copr.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-
-# Tell build process to exit if there are any errors.
-set -euo pipefail
-
-# disabling the respositories for the booted system (since they'll be dealt with in image creation)
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/swayfx-swayfx-fedora-$(rpm -E %fedora).repo
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/sneexy-swayland-fedora-$(rpm -E %fedora).repo
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/erikreider-SwayNotificationCenter-fedora-$(rpm -E %fedora).repo
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/wezfurlong-wezterm-nightly-fedora-$(rpm -E %fedora).repo
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo
-sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_vrumger-swaylock-effects.repo
diff --git a/config/scripts/mazurek-install-from-copr.sh b/config/scripts/system-mazurek.sh
similarity index 60%
rename from config/scripts/mazurek-install-from-copr.sh
rename to config/scripts/system-mazurek.sh
index 838777e5..bd36ae14 100644
--- a/config/scripts/mazurek-install-from-copr.sh
+++ b/config/scripts/system-mazurek.sh
@@ -24,3 +24,15 @@ if rpm -qa | grep power-profiles-daemon ; then
 else
     rpm-ostree install tlp tlp-rdw powertop
 fi
+
+# enable sddm
+systemctl enable sddm
+
+# disabling the respositories for the booted system (since they'll be dealt with in image creation)
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/swayfx-swayfx-fedora-$(rpm -E %fedora).repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/sneexy-swayland-fedora-$(rpm -E %fedora).repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/erikreider-SwayNotificationCenter-fedora-$(rpm -E %fedora).repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/wezfurlong-wezterm-nightly-fedora-$(rpm -E %fedora).repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite.repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_kylegospo-bazzite-multilib.repo
+sed -i 's@enabled=1@enabled=0@g' /etc/yum.repos.d/_copr_vrumger-swaylock-effects.repo