fixed configs and changed terminal to kitty
This commit is contained in:
@@ -157,6 +157,7 @@ COPY configs/tmpfiles/noctalia-greeter-seed.conf /usr/lib/tmpfiles.d/noctalia-gr
|
|||||||
RUN set -u; \
|
RUN set -u; \
|
||||||
id greeter >/dev/null || { echo "FEHLER: Service-User greeter fehlt (21-greetd.sh pruefen)"; exit 1; }; \
|
id greeter >/dev/null || { echo "FEHLER: Service-User greeter fehlt (21-greetd.sh pruefen)"; exit 1; }; \
|
||||||
grep -q 'pam_gnome_keyring\.so' /etc/pam.d/greetd || { echo "FEHLER: Keyring-PAM in /etc/pam.d/greetd fehlt"; exit 1; }; \
|
grep -q 'pam_gnome_keyring\.so' /etc/pam.d/greetd || { echo "FEHLER: Keyring-PAM in /etc/pam.d/greetd fehlt"; exit 1; }; \
|
||||||
|
test -f /usr/lib64/security/pam_gnome_keyring.so || { echo "FEHLER: pam_gnome_keyring.so fehlt (Paket gnome-keyring-pam?)"; exit 1; }; \
|
||||||
wrapper="$(command -v noctalia-greeter-session || true)"; \
|
wrapper="$(command -v noctalia-greeter-session || true)"; \
|
||||||
echo "Gefundener Wrapper: ${wrapper}"; \
|
echo "Gefundener Wrapper: ${wrapper}"; \
|
||||||
test -n "${wrapper}" || { echo "FEHLER: noctalia-greeter-session nicht installiert (Terra-Repo/includepkgs pruefen)"; exit 1; }; \
|
test -n "${wrapper}" || { echo "FEHLER: noctalia-greeter-session nicht installiert (Terra-Repo/includepkgs pruefen)"; exit 1; }; \
|
||||||
|
|||||||
@@ -23,7 +23,7 @@ dnf5 install -y \
|
|||||||
pipewire-pulseaudio \
|
pipewire-pulseaudio \
|
||||||
wireplumber \
|
wireplumber \
|
||||||
NetworkManager \
|
NetworkManager \
|
||||||
alacritty \
|
kitty \
|
||||||
wl-clipboard \
|
wl-clipboard \
|
||||||
xdg-user-dirs \
|
xdg-user-dirs \
|
||||||
libnotify \
|
libnotify \
|
||||||
@@ -43,6 +43,7 @@ dnf5 install -y \
|
|||||||
adwaita-icon-theme \
|
adwaita-icon-theme \
|
||||||
adwaita-cursor-theme \
|
adwaita-cursor-theme \
|
||||||
gnome-keyring \
|
gnome-keyring \
|
||||||
|
gnome-keyring-pam \
|
||||||
libsecret \
|
libsecret \
|
||||||
thunar \
|
thunar \
|
||||||
thunar-volman \
|
thunar-volman \
|
||||||
|
|||||||
+3
-4
@@ -6,7 +6,8 @@ set -eoux pipefail
|
|||||||
# Zusammengefasst für effizientere Paketauflösung.
|
# Zusammengefasst für effizientere Paketauflösung.
|
||||||
# HINWEIS (labwc-Zweig): plasma-setup und noctalia sind hier raus.
|
# HINWEIS (labwc-Zweig): plasma-setup und noctalia sind hier raus.
|
||||||
# plasma-setup war KDE-spezifisch, noctalia liegt in 22-noctalia.sh.
|
# plasma-setup war KDE-spezifisch, noctalia liegt in 22-noctalia.sh.
|
||||||
# webkit2gtk bleibt (Bazaar/Flatpak-Store braucht es).
|
# webkit2gtk/javascriptcore sind ebenfalls raus: Bazaar laeuft als Flatpak
|
||||||
|
# und bundelt WebKit selbst; nativen Verbraucher gibt es im Image keinen.
|
||||||
###############################################################################
|
###############################################################################
|
||||||
echo "Installing Virtualization, Tools and Hardware Helpers..."
|
echo "Installing Virtualization, Tools and Hardware Helpers..."
|
||||||
dnf5 install -y \
|
dnf5 install -y \
|
||||||
@@ -18,8 +19,6 @@ dnf5 install -y \
|
|||||||
micro \
|
micro \
|
||||||
fuse \
|
fuse \
|
||||||
fuse-libs \
|
fuse-libs \
|
||||||
fuse3 \
|
fuse3
|
||||||
webkit2gtk4.1 \
|
|
||||||
javascriptcoregtk4.1
|
|
||||||
|
|
||||||
dnf5 clean all
|
dnf5 clean all
|
||||||
|
|||||||
@@ -4,5 +4,6 @@ set -oue pipefail
|
|||||||
echo "Downloading Flathub repository definition..."
|
echo "Downloading Flathub repository definition..."
|
||||||
mkdir -p /usr/share/flatpak/remotes.d/
|
mkdir -p /usr/share/flatpak/remotes.d/
|
||||||
curl -f --retry 3 --retry-delay 5 -o /usr/share/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
|
curl -f --retry 3 --retry-delay 5 -o /usr/share/flatpak/remotes.d/flathub.flatpakrepo https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||||
echo "Configuring Flatpak system-wide extra languages..."
|
# HINWEIS: `flatpak config --set extra-languages` steht bewusst NICHT hier:
|
||||||
flatpak config --set extra-languages "de"
|
# Es schreibt nach /var (verworfen beim Deployment) und laeuft stattdessen
|
||||||
|
# im flatpak-preinstall.service beim Erstboot (dort ist /var live).
|
||||||
@@ -1,28 +1,51 @@
|
|||||||
# fluffy-pancake Plymouth-Theme (script-Plugin).
|
# fluffy-pancake Plymouth-Theme (script-Plugin).
|
||||||
# Dunkler Hintergrund (Noctalia-nah), zentrierter Schriftzug, Statuszeile.
|
# API-Stand: verifiziert gegen funktionierende Referenz-Themes
|
||||||
# Plymouth ruft message_callback bei Boot-Meldungen und boot_progress_callback
|
# (nur Image.Text, Sprite/SetPosition/SetImage/SetOpacity,
|
||||||
# waehrenddessen; quit_callback beim Uebergang zum Login.
|
# Window.GetWidth/GetHeight/SetBackground*, Plymouth.Set*Function).
|
||||||
|
# Dunkler Hintergrund (Noctalia-nah), zentrierter Schriftzug,
|
||||||
|
# Boot-Meldungen unten links.
|
||||||
|
|
||||||
Window.SetBackgroundTopColor (0.10, 0.11, 0.15);
|
Window.SetBackgroundTopColor (0.101, 0.105, 0.149);
|
||||||
Window.SetBackgroundBottomColor (0.10, 0.11, 0.15);
|
Window.SetBackgroundBottomColor (0.101, 0.105, 0.149);
|
||||||
|
|
||||||
title_image = Message ("fluffy-pancake");
|
title.sprite = Sprite ();
|
||||||
title_sprite = Sprite (title_image);
|
status.sprite = Sprite ();
|
||||||
title_sprite.SetPosition (Window.GetX () / 2 - title_image.GetWidth () / 2,
|
|
||||||
Window.GetY () / 2 - title_image.GetHeight () / 2, 10);
|
|
||||||
|
|
||||||
status_image = Image.Text ("", 1, 1, 1);
|
global.layout_width = 0;
|
||||||
status_sprite = Sprite (status_image);
|
global.layout_height = 0;
|
||||||
|
|
||||||
fun message_callback (text) {
|
fun layout () {
|
||||||
status_image = Image.Text (text, 1, 1, 1);
|
global.layout_width = Window.GetWidth ();
|
||||||
status_sprite.SetImage (status_image);
|
global.layout_height = Window.GetHeight ();
|
||||||
status_sprite.SetPosition (Window.GetX () / 2 - status_image.GetWidth () / 2,
|
|
||||||
Window.GetY () * 3 / 4, 10);
|
title.image = Image.Text ("fluffy-pancake", 1, 1, 1);
|
||||||
|
title.sprite.SetImage (title.image);
|
||||||
|
title.sprite.SetPosition (global.layout_width / 2 - title.image.GetWidth () / 2,
|
||||||
|
global.layout_height / 2 - title.image.GetHeight () / 2, 10);
|
||||||
|
status.sprite.SetPosition (10, global.layout_height - 40, 10000);
|
||||||
}
|
}
|
||||||
|
|
||||||
fun boot_progress_callback (duration, progress) {
|
fun refresh_callback () {
|
||||||
|
# Displays koennen spaeter dazukommen (z.B. Docking-Monitor) -
|
||||||
|
# dann neu zentrieren.
|
||||||
|
if (Window.GetWidth () != global.layout_width || Window.GetHeight () != global.layout_height) {
|
||||||
|
layout ();
|
||||||
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
fun quit_callback () {
|
Plymouth.SetRefreshFunction (refresh_callback);
|
||||||
|
|
||||||
|
fun display_message_callback (text) {
|
||||||
|
message = Image.Text (text, 1, 1, 1);
|
||||||
|
status.sprite.SetImage (message);
|
||||||
|
status.sprite.SetOpacity (1);
|
||||||
}
|
}
|
||||||
|
|
||||||
|
fun hide_message_callback (text) {
|
||||||
|
status.sprite.SetOpacity (0);
|
||||||
|
}
|
||||||
|
|
||||||
|
Plymouth.SetDisplayMessageFunction (display_message_callback);
|
||||||
|
Plymouth.SetHideMessageFunction (hide_message_callback);
|
||||||
|
|
||||||
|
layout ();
|
||||||
|
|||||||
@@ -7,9 +7,18 @@ ConditionPathExists=!/var/lib/flatpak/.preinstall-done
|
|||||||
[Service]
|
[Service]
|
||||||
Type=oneshot
|
Type=oneshot
|
||||||
ExecStartPre=/usr/bin/flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
ExecStartPre=/usr/bin/flatpak remote-add --if-not-exists flathub https://dl.flathub.org/repo/flathub.flatpakrepo
|
||||||
|
# Systemweite Extra-Sprachen (hier, nicht im Build-Skript: schreibt nach
|
||||||
|
# /var, das es nur zur Laufzeit gibt). VOR install, damit Locale-
|
||||||
|
# Extensions gleich mitkommen.
|
||||||
|
ExecStart=/usr/bin/flatpak config --set extra-languages "de"
|
||||||
# Bazaar + Brave + GTK-Theme-Runtimes, damit Flatpak-GTK3-Apps dem
|
# Bazaar + Brave + GTK-Theme-Runtimes, damit Flatpak-GTK3-Apps dem
|
||||||
# Noctalia-Theme (adw-gtk3/-dark) folgen koennen. Laeuft einmalig.
|
# Noctalia-Theme (adw-gtk3/-dark) folgen koennen. Laeuft einmalig.
|
||||||
ExecStart=/usr/bin/flatpak install -y flathub io.github.kolunmi.Bazaar com.brave.Browser org.gtk.Gtk3theme.adw-gtk3 org.gtk.Gtk3theme.adw-gtk3-dark org.kde.KStyle.Adwaita
|
# HINWEIS: org.kde.KStyle.Adwaita steht bewusst NICHT hier - es existiert
|
||||||
|
# in mehreren Branches (6.x), die sich non-interaktiv nicht aufloesen
|
||||||
|
# lassen ("No ref chosen", Service wuerde ewig failen). Bei Bedarf (erste
|
||||||
|
# Qt-Flatpak-App) interaktiv nachinstallieren, dort darf flatpak fragen:
|
||||||
|
# flatpak install flathub org.kde.KStyle.Adwaita
|
||||||
|
ExecStart=/usr/bin/flatpak install -y flathub io.github.kolunmi.Bazaar com.brave.Browser org.gtk.Gtk3theme.adw-gtk3 org.gtk.Gtk3theme.adw-gtk3-dark
|
||||||
# Noctalia-CSS fuer ALLE Flatpaks lesbar machen (read-only, systemweit):
|
# Noctalia-CSS fuer ALLE Flatpaks lesbar machen (read-only, systemweit):
|
||||||
# volle Palette statt nur Hell/Dunkel - gilt auch fuer spaeter per Bazaar
|
# volle Palette statt nur Hell/Dunkel - gilt auch fuer spaeter per Bazaar
|
||||||
# installierte Apps (kein Override pro App noetig, Neustart genuegt).
|
# installierte Apps (kein Override pro App noetig, Neustart genuegt).
|
||||||
|
|||||||
@@ -1,11 +0,0 @@
|
|||||||
# Alacritty – fluffy-pancake (Noctalia-Zweig)
|
|
||||||
# Das Noctalia-Template "alacritty" schreibt themes/noctalia.toml
|
|
||||||
# (Platzhalter liegt bei, Import zeigt fest darauf).
|
|
||||||
[general]
|
|
||||||
import = [
|
|
||||||
"~/.config/alacritty/themes/noctalia.toml",
|
|
||||||
]
|
|
||||||
|
|
||||||
[font]
|
|
||||||
normal = { family = "Noto Sans Mono", style = "Regular" }
|
|
||||||
size = 10.0
|
|
||||||
@@ -1,2 +0,0 @@
|
|||||||
# Platzhalter, verwaltet vom Noctalia-Template "alacritty".
|
|
||||||
# Wird beim ersten Theme-Resolve mit der Palette befuellt.
|
|
||||||
@@ -1,6 +1,7 @@
|
|||||||
# kanshi-Template – fluffy-pancake (Noctalia-Zweig)
|
# kanshi-Template – fluffy-pancake (Noctalia-Zweig)
|
||||||
# Diese Datei liegt als Vorlage in /etc/skel und wird beim Anlegen neuer
|
# Reine Doku- und Beispiel-Datei (liegt in /etc/skel). Die echte,
|
||||||
# Benutzer nach ~/.config/kanshi/config kopiert.
|
# wirksame Config ~/.config/kanshi/config schreibt NUR kanshi-autoconfig
|
||||||
|
# (--apply) - dieses Template wird nie dorthin kopiert.
|
||||||
#
|
#
|
||||||
# EMPFOHLEN: nichts von Hand raten, sondern generieren lassen:
|
# EMPFOHLEN: nichts von Hand raten, sondern generieren lassen:
|
||||||
# kanshi-autoconfig --print # zeigt erkannte Outputs + Vorschlag
|
# kanshi-autoconfig --print # zeigt erkannte Outputs + Vorschlag
|
||||||
|
|||||||
@@ -0,0 +1,7 @@
|
|||||||
|
# Kitty – fluffy-pancake (Noctalia-Zweig)
|
||||||
|
# Das Noctalia-Template "kitty" schreibt themes/noctalia.conf
|
||||||
|
# (Platzhalter liegt bei, Live-Reload per USR1 macht der Hook).
|
||||||
|
include themes/noctalia.conf
|
||||||
|
|
||||||
|
font_family Noto Sans Mono
|
||||||
|
font_size 10.0
|
||||||
@@ -0,0 +1,2 @@
|
|||||||
|
# Platzhalter, verwaltet vom Noctalia-Template "kitty".
|
||||||
|
# Wird beim ersten Theme-Resolve mit der Palette befuellt.
|
||||||
@@ -10,4 +10,4 @@ GDK_BACKEND=wayland
|
|||||||
XDG_CURRENT_DESKTOP=labwc
|
XDG_CURRENT_DESKTOP=labwc
|
||||||
XDG_SESSION_TYPE=wayland
|
XDG_SESSION_TYPE=wayland
|
||||||
MOZ_ENABLE_WAYLAND=1
|
MOZ_ENABLE_WAYLAND=1
|
||||||
TERMINAL=alacritty
|
TERMINAL=kitty
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
<!-- labwc Root-Menue (Rechtsklick) – fluffy-pancake (Noctalia-Zweig) -->
|
<!-- labwc Root-Menue (Rechtsklick) – fluffy-pancake (Noctalia-Zweig) -->
|
||||||
<openbox_menu>
|
<openbox_menu>
|
||||||
<menu id="root-menu" label="">
|
<menu id="root-menu" label="">
|
||||||
<item label="Terminal (Alacritty)">
|
<item label="Terminal (Kitty)">
|
||||||
<action name="Execute" command="alacritty" />
|
<action name="Execute" command="kitty" />
|
||||||
</item>
|
</item>
|
||||||
<item label="Dateimanager (Thunar)">
|
<item label="Dateimanager (Thunar)">
|
||||||
<action name="Execute" command="thunar" />
|
<action name="Execute" command="thunar" />
|
||||||
|
|||||||
@@ -16,7 +16,7 @@
|
|||||||
<default />
|
<default />
|
||||||
<!-- Terminal -->
|
<!-- Terminal -->
|
||||||
<keybind key="W-Return">
|
<keybind key="W-Return">
|
||||||
<action name="Execute" command="alacritty" />
|
<action name="Execute" command="kitty" />
|
||||||
</keybind>
|
</keybind>
|
||||||
<!-- Dateimanager -->
|
<!-- Dateimanager -->
|
||||||
<keybind key="W-e">
|
<keybind key="W-e">
|
||||||
|
|||||||
@@ -2,8 +2,8 @@
|
|||||||
# Schaltet App-Theming an: Terminal, GTK3/4 und labwc-Deko folgen der
|
# Schaltet App-Theming an: Terminal, GTK3/4 und labwc-Deko folgen der
|
||||||
# Noctalia-Palette (IDs aus dem Built-in-Katalog:
|
# Noctalia-Palette (IDs aus dem Built-in-Katalog:
|
||||||
# `noctalia theme --list-templates`).
|
# `noctalia theme --list-templates`).
|
||||||
# - alacritty: schreibt ~/.config/alacritty/themes/noctalia.toml
|
# - kitty: schreibt ~/.config/kitty/themes/noctalia.conf
|
||||||
# (braucht den import in alacritty.toml + Platzhalter, beides in /etc/skel)
|
# (braucht das include in kitty.conf + Platzhalter, beides in /etc/skel)
|
||||||
# - gtk3/gtk4: schreibt noctalia.css + haengt den Import in gtk.css ein,
|
# - gtk3/gtk4: schreibt noctalia.css + haengt den Import in gtk.css ein,
|
||||||
# setzt adw-gtk3(-dark) und color-scheme (braucht Paket adw-gtk3)
|
# setzt adw-gtk3(-dark) und color-scheme (braucht Paket adw-gtk3)
|
||||||
# - labwc: schreibt das openbox-Theme + setzt <name>noctalia</name> in rc.xml
|
# - labwc: schreibt das openbox-Theme + setzt <name>noctalia</name> in rc.xml
|
||||||
@@ -12,7 +12,7 @@
|
|||||||
# sind absichtlich aus (keine Qt-Apps installiert).
|
# sind absichtlich aus (keine Qt-Apps installiert).
|
||||||
[theme.templates]
|
[theme.templates]
|
||||||
enable_builtin_templates = true
|
enable_builtin_templates = true
|
||||||
builtin_ids = ["alacritty", "gtk3", "gtk4", "labwc"]
|
builtin_ids = ["kitty", "gtk3", "gtk4", "labwc"]
|
||||||
|
|
||||||
# labwc nach jedem Theme-Resolve live neu laden (Deko + Root-Menue),
|
# labwc nach jedem Theme-Resolve live neu laden (Deko + Root-Menue),
|
||||||
# sonst bleibt die alte Optik bis zum Relogin stehen.
|
# sonst bleibt die alte Optik bis zum Relogin stehen.
|
||||||
|
|||||||
@@ -12,8 +12,8 @@ TARGETS=(
|
|||||||
".config/labwc/rc.xml"
|
".config/labwc/rc.xml"
|
||||||
".config/labwc/menu.xml"
|
".config/labwc/menu.xml"
|
||||||
".config/kanshi/config.template"
|
".config/kanshi/config.template"
|
||||||
".config/alacritty/alacritty.toml"
|
".config/kitty/kitty.conf"
|
||||||
".config/alacritty/themes/noctalia.toml"
|
".config/kitty/themes/noctalia.conf"
|
||||||
".config/noctalia/templates.toml"
|
".config/noctalia/templates.toml"
|
||||||
".config/noctalia/shell.toml"
|
".config/noctalia/shell.toml"
|
||||||
".config/noctalia/wallpaper.toml"
|
".config/noctalia/wallpaper.toml"
|
||||||
|
|||||||
Reference in New Issue
Block a user