From 8f0d2e7d274921133950092118d1d3501167263c Mon Sep 17 00:00:00 2001
From: qpismont <pismont.quentin@protonmail.com>
Date: Sun, 1 Nov 2026 13:34:00 +0100
Subject: [PATCH] Switch desktop environment from KDE Plasma to GNOME with
 Noctalia/Umbriel

---
 Containerfile             | 36 ++++++++++++++++++++++++++++++------
 build-iso.sh              |  3 +--
 config/umbriel.toml       | 10 ++++++++++
 config/xorg-keyboard.conf |  6 ++++++
 4 files changed, 47 insertions(+), 8 deletions(-)
 create mode 100644 config/umbriel.toml
 create mode 100644 config/xorg-keyboard.conf

diff --git a/Containerfile b/Containerfile
index e15b817..39940bd 100644
--- a/Containerfile
+++ b/Containerfile
@@ -6,9 +6,13 @@ RUN dnf5 install 'dnf5-command(copr)' -y
 #Ajout du dépot mullvad
 RUN curl -fsSL https://repository.mullvad.net/rpm/stable/mullvad.repo -o /etc/yum.repos.d/mullvad.repo
 
-#Install de KDE Plasma avec support hardware + Podman + Cups + Vulkan driver + Plymouth + dev tools + divers utilitaires
+#Ajout du dépot Terra (Umbriel n'est pas dans les depots Fedora)
+RUN dnf install -y --nogpgcheck --repofrompath 'terra,https://repos.fyralabs.com/terra$releasever' terra-release \
+    && dnf clean all
+
+#Install de GNOME + stack Noctalia/Umbriel avec support hardware + Podman + Cups + Vulkan driver + Plymouth + dev tools + divers utilitaires
 RUN dnf install -y --refresh --setopt=tsflags=nodocs \
-    @kde-desktop-environment \
+    @gnome-desktop \
     @hardware-support \
     @development-tools \
     @multimedia \
@@ -26,8 +30,6 @@ RUN dnf install -y --refresh --setopt=tsflags=nodocs \
     buildah \
     podman \
     rsync \
-    plasma-login-manager \
-	kcm-plasmalogin \
     podman-docker \
     podman-compose \
     fuse-overlayfs \
@@ -35,6 +37,9 @@ RUN dnf install -y --refresh --setopt=tsflags=nodocs \
     cups-pdf \
     jq \
     mullvad-vpn \
+    noctalia \
+    umbriel-nightly \
+    xdg-desktop-portal-umbriel-nightly \
     plymouth \
     plymouth-system-theme \
     plymouth-plugin-label \
@@ -51,9 +56,13 @@ RUN dnf install -y --refresh --setopt=tsflags=nodocs \
     gstreamer1-vaapi \
     ffmpeg \
     flatpak \
-    && (dnf remove -y sddm snapshot PackageKit PackageKit-gstreamer-plugin PackageKit-command-not-found toolbox || true) \
+    && (dnf remove -y alacritty waybar gnome-software gnome-software-rpm-ostree gnome-system-monitor showtime decibels snapshot PackageKit PackageKit-gstreamer-plugin PackageKit-command-not-found toolbox || true) \
+    && dnf install -y flatpak \
     && dnf clean all
 
+#Configuration de GDM : clavier FR (GNOME Initial Setup cree le premier compte au boot)
+COPY config/xorg-keyboard.conf /etc/X11/xorg.conf.d/00-keyboard.conf
+
 #Installation de Filen Desktop
 RUN wget https://cdn.filen.io/@filen/desktop/release/latest/Filen_linux_x86_64.rpm -O /tmp/filen.rpm \
 	&& dnf install -y --setopt=tsflags=nodocs /tmp/filen.rpm \
@@ -79,12 +88,27 @@ RUN echo 'eval "$(starship init bash)"' >> /etc/bashrc
 RUN mkdir -p /etc/skel/.config && \
     starship preset nerd-font-symbols -o /etc/skel/.config/starship.toml
 
+#Configuration Umbriel par défaut : config de départ du paquet + autostart Noctalia
+COPY config/umbriel.toml /etc/xdg/umbriel/config.toml
+
 #Langue FR par défaut + Fuse userns + Timezone Paris
 RUN echo "LANG=fr_FR.UTF-8" > /etc/locale.conf \
     && echo "KEYMAP=fr" > /etc/vconsole.conf \
     && ln -sf /usr/share/zoneinfo/Europe/Paris /etc/localtime \
     && echo "user.max_user_namespaces=28633" > /etc/sysctl.d/userns.conf
 
+# Installation du pack d'icones MoreWaita
+RUN git clone https://github.com/somepaulo/MoreWaita.git && cd MoreWaita && ./install.sh && \
+    rm -rf MoreWaita && \
+    printf "[org/gnome/desktop/interface]\nicon-theme='MoreWaita'\n" > /etc/dconf/db/local.d/02-icon-theme && \
+    dconf update 2>/dev/null || true
+
+#Configuration des fenêtres gnome pour avoir les btns style windows
+RUN mkdir -p /etc/dconf/db/local.d /etc/dconf/profile && \
+    printf "[org/gnome/desktop/wm/preferences]\nbutton-layout=':minimize,maximize,close'\n" > /etc/dconf/db/local.d/02-window-buttons && \
+    printf "user-db:user\nsystem-db:local\n" > /etc/dconf/profile/user && \
+    dconf update 2>/dev/null || true
+
 #Activation du module xpad pour support manette xbox
 RUN echo "xpad" > /etc/modules-load.d/xpad.conf
 
@@ -100,5 +124,5 @@ RUN systemctl set-default graphical.target
 
 #Activation des services + Desactivation de bootc-update automatique
 RUN systemctl preset-all && \
-    systemctl enable --force plasmalogin.service NetworkManager.service bluetooth.service podman.socket cups.service mullvad-daemon.service && \
+    systemctl enable --force gdm.service NetworkManager.service bluetooth.service podman.socket cups.service mullvad-daemon.service && \
     systemctl mask bootc-fetch-apply-updates.timer systemd-remount-fs.service
diff --git a/build-iso.sh b/build-iso.sh
index 1f122b4..3c986df 100755
--- a/build-iso.sh
+++ b/build-iso.sh
@@ -25,7 +25,6 @@ sudo podman run --rm -it \
   --type iso \
   --local \
   --rootfs btrfs \
-  --use-lib-repo=true \
   localhost/${IMAGE_NAME}:${IMAGE_TAG}
 
-echo "[SUCCÈS] ISO généré dans $OUTPUT_DIR"
\ No newline at end of file
+echo "[SUCCÈS] ISO généré dans $OUTPUT_DIR"
diff --git a/config/umbriel.toml b/config/umbriel.toml
new file mode 100644
index 0000000..42cae2d
--- /dev/null
+++ b/config/umbriel.toml
@@ -0,0 +1,10 @@
+# Configuration Umbriel par défaut, commune à tous les utilisateurs
+# (XDG_CONFIG_DIRS). Un fichier ~/.config/umbriel/config.toml la remplace.
+#
+# On charge la configuration de départ fournie par le paquet (keybinds,
+# layout, effets, window/layer rules) puis on démarre Noctalia avec la session.
+[include]
+files = ["/usr/share/umbriel/config.toml"]
+
+[general]
+autostart = ["noctalia"]
diff --git a/config/xorg-keyboard.conf b/config/xorg-keyboard.conf
new file mode 100644
index 0000000..65719d4
--- /dev/null
+++ b/config/xorg-keyboard.conf
@@ -0,0 +1,6 @@
+Section "InputClass"
+        Identifier "system-keyboard"
+        MatchIsKeyboard "on"
+        Option "XkbModel" "pc105"
+        Option "XkbLayout" "fr"
+EndSection