From 87930be3aabcf404c59ae11a3f4534f440a78070 Mon Sep 17 00:00:00 2001 From: Jaiden Riordan Date: Mon, 25 Nov 2024 23:02:17 -0600 Subject: [PATCH] finish the job --- .../release/60-ultramarine-presets.conf | 2 +- .../release/lightdm-gtk-greeter-flagship.conf | 67 ------------------- .../release/lightdm-gtk-greeter-xfce.conf | 67 ------------------- .../release/slick-greeter-flagship.conf | 2 +- ultramarine/release/ultramarine-release.spec | 16 ++--- 5 files changed, 10 insertions(+), 144 deletions(-) delete mode 100644 ultramarine/release/lightdm-gtk-greeter-flagship.conf delete mode 100644 ultramarine/release/lightdm-gtk-greeter-xfce.conf diff --git a/ultramarine/release/60-ultramarine-presets.conf b/ultramarine/release/60-ultramarine-presets.conf index e1770b0..784a6fc 100644 --- a/ultramarine/release/60-ultramarine-presets.conf +++ b/ultramarine/release/60-ultramarine-presets.conf @@ -1,2 +1,2 @@ [Seat:*] -greeter-session=lightdm-gtk-greeter \ No newline at end of file +greeter-session=slick-greeter \ No newline at end of file diff --git a/ultramarine/release/lightdm-gtk-greeter-flagship.conf b/ultramarine/release/lightdm-gtk-greeter-flagship.conf deleted file mode 100644 index 6259724..0000000 --- a/ultramarine/release/lightdm-gtk-greeter-flagship.conf +++ /dev/null @@ -1,67 +0,0 @@ -# Keep for one release for compat -# -# LightDM GTK+ Configuration -# Available configuration options listed below. -# -# Appearance: -# theme-name = GTK+ theme to use -# icon-theme-name = Icon theme to use -# cursor-theme-name = Cursor theme to use -# cursor-theme-size = Cursor size to use -# background = Background file to use, either an image path or a color (e.g. #772953) -# user-background = false|true ("true" by default) Display user background (if available) -# transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default) -# transition-type = ease-in-out|linear|none ("ease-in-out" by default) -# -# Fonts: -# font-name = Font to use -# xft-antialias = false|true Whether to antialias Xft fonts -# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) -# xft-hintstyle = none|slight|medium|hintfull What degree of hinting to use -# xft-rgba = none|rgb|bgr|vrgb|vbgr Type of subpixel antialiasing -# -# Login window: -# active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor. Can be a semicolon separated list -# position = x y ("50% 50%" by default) Login window position -# default-user-image = Image used as default user icon, path or #icon-name -# hide-user-image = false|true ("false" by default) -# -# Panel: -# panel-position = top|bottom ("top" by default) -# clock-format = strftime-format string, e.g. %H:%M -# indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power", "~clock", "~host", "~spacer". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path -# -# Accessibility: -# a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader. -# keyboard = command to launch on-screen keyboard (e.g. "onboard") -# keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default) Works only for "onboard" -# reader = command to launch screen reader (e.g. "orca") -# at-spi-enabled = false|true ("true" by default) Enables accessibility at-spi-command if the greeter is built with it enabled -# -# Security: -# allow-debugging = false|true ("false" by default) -# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen -# -# Template for per-monitor configuration: -# [monitor: name] -# background = overrides default value -# user-background = overrides default value -# laptop = false|true ("false" by default) Marks monitor as laptop display -# transition-duration = overrides default value -# -[greeter] -background=/usr/share/backgrounds/ultramarine-linux/40/umbrella-light.png -#user-background= -theme-name=Helium -icon-theme-name=Hydrogen -#font-name= -#xft-antialias= -#xft-dpi= -#xft-hintstyle= -#xft-rgba= -#indicators= -#clock-format= -#keyboard= -#reader= -#position= -#screensaver-timeout= diff --git a/ultramarine/release/lightdm-gtk-greeter-xfce.conf b/ultramarine/release/lightdm-gtk-greeter-xfce.conf deleted file mode 100644 index a3f8405..0000000 --- a/ultramarine/release/lightdm-gtk-greeter-xfce.conf +++ /dev/null @@ -1,67 +0,0 @@ -# Keep for one release for compat -# -# LightDM GTK+ Configuration -# Available configuration options listed below. -# -# Appearance: -# theme-name = GTK+ theme to use -# icon-theme-name = Icon theme to use -# cursor-theme-name = Cursor theme to use -# cursor-theme-size = Cursor size to use -# background = Background file to use, either an image path or a color (e.g. #772953) -# user-background = false|true ("true" by default) Display user background (if available) -# transition-duration = Length of time (in milliseconds) to transition between background images ("500" by default) -# transition-type = ease-in-out|linear|none ("ease-in-out" by default) -# -# Fonts: -# font-name = Font to use -# xft-antialias = false|true Whether to antialias Xft fonts -# xft-dpi = Resolution for Xft in dots per inch (e.g. 96) -# xft-hintstyle = none|slight|medium|hintfull What degree of hinting to use -# xft-rgba = none|rgb|bgr|vrgb|vbgr Type of subpixel antialiasing -# -# Login window: -# active-monitor = Monitor to display greeter window (name or number). Use #cursor value to display greeter at monitor with cursor. Can be a semicolon separated list -# position = x y ("50% 50%" by default) Login window position -# default-user-image = Image used as default user icon, path or #icon-name -# hide-user-image = false|true ("false" by default) -# -# Panel: -# panel-position = top|bottom ("top" by default) -# clock-format = strftime-format string, e.g. %H:%M -# indicators = semi-colon ";" separated list of allowed indicator modules. Built-in indicators include "~a11y", "~language", "~session", "~power", "~clock", "~host", "~spacer". Unity indicators can be represented by short name (e.g. "sound", "power"), service file name, or absolute path -# -# Accessibility: -# a11y-states = states of accessibility features: "name" - save state on exit, "-name" - disabled at start (default value for unlisted), "+name" - enabled at start. Allowed names: contrast, font, keyboard, reader. -# keyboard = command to launch on-screen keyboard (e.g. "onboard") -# keyboard-position = x y[;width height] ("50%,center -0;50% 25%" by default) Works only for "onboard" -# reader = command to launch screen reader (e.g. "orca") -# at-spi-enabled = false|true ("true" by default) Enables accessibility at-spi-command if the greeter is built with it enabled -# -# Security: -# allow-debugging = false|true ("false" by default) -# screensaver-timeout = Timeout (in seconds) until the screen blanks when the greeter is called as lockscreen -# -# Template for per-monitor configuration: -# [monitor: name] -# background = overrides default value -# user-background = overrides default value -# laptop = false|true ("false" by default) Marks monitor as laptop display -# transition-duration = overrides default value -# -[greeter] -background=/usr/share/backgrounds/ultramarine-linux/40/umbrella-light.png -#user-background= -theme-name=Fluent-round-Dark -icon-theme-name=Fluent-dark -#font-name= -#xft-antialias= -#xft-dpi= -#xft-hintstyle= -#xft-rgba= -#indicators= -#clock-format= -#keyboard= -#reader= -#position= -#screensaver-timeout= diff --git a/ultramarine/release/slick-greeter-flagship.conf b/ultramarine/release/slick-greeter-flagship.conf index 74a9d23..8e2ef99 100644 --- a/ultramarine/release/slick-greeter-flagship.conf +++ b/ultramarine/release/slick-greeter-flagship.conf @@ -18,7 +18,7 @@ #background=/usr/share/backgrounds/default.png #background-color=#000000 draw-user-backgrounds=true -#draw-grid=false +draw-grid=true show-hostname=true #logo= #background-logo= diff --git a/ultramarine/release/ultramarine-release.spec b/ultramarine/release/ultramarine-release.spec index 18a7f12..d68c262 100644 --- a/ultramarine/release/ultramarine-release.spec +++ b/ultramarine/release/ultramarine-release.spec @@ -79,8 +79,8 @@ Source9: 90-default-user.preset Source10: 89-ultramarine-default.preset Source12: 60-ultramarine-presets.conf -Source13: lightdm-gtk-greeter-flagship.conf -Source14: lightdm-gtk-greeter-xfce.conf +Source13: slick-greeter-flagship.conf +Source14: slick-greeter-xfce.conf Source15: 50_ultramarine-gnome.gschema.override Source19: distro-template.swidtag @@ -809,10 +809,10 @@ install %{SOURCE73} %{buildroot}%{_sysconfdir}/polycrystal/entries/ultramarine-x # Budgie config mkdir -p %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/ install %{SOURCE12} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/ -install %{SOURCE13} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-lightdm-gtk-greeter.conf +install %{SOURCE13} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-slick-greeter.conf # XFCE config -install %{SOURCE14} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-lightdm-gtk-greeter.conf +install %{SOURCE14} %{buildroot}%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-slick-greeter.conf # GNOME config install -Dm0644 %{SOURCE15} -t %{buildroot}%{_datadir}/glib-2.0/schemas/ @@ -979,7 +979,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %{_sysconfdir}/dnf/protected.d/ultramarine-flagship.conf %config %{_sysconfdir}/polycrystal/entries/ultramarine-flagship.json %{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf -%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-lightdm-gtk-greeter.conf +%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-slick-greeter.conf %endif %if %{with atomic_flagship} @@ -989,7 +989,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %attr(0644,root,root) %{_swidtagdir}/org.ultramarinelinux.Ultramarine-edition.swidtag.atomic-flagship %config %{_sysconfdir}/polycrystal/entries/ultramarine-flagship.json %{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf -%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-lightdm-gtk-greeter.conf +%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-flagship-slick-greeter.conf %endif %if %{with plasma} @@ -1041,7 +1041,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %config %{_sysconfdir}/polycrystal/entries/ultramarine-xfce.json %{_sysconfdir}/skel/.config/xfce4/ %{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf -%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-lightdm-gtk-greeter.conf +%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-slick-greeter.conf %endif %if %{with atomic_xfce} @@ -1052,7 +1052,7 @@ install -Dm0644 %{SOURCE32} -t %{buildroot}%{_datadir}/polkit-1/rules.d/ %config %{_sysconfdir}/polycrystal/entries/ultramarine-xfce.json %{_sysconfdir}/skel/.config/xfce4/ %{_sysconfdir}/lightdm/lightdm.conf.d/60-ultramarine-presets.conf -%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-lightdm-gtk-greeter.conf +%{_sysconfdir}/lightdm/lightdm.conf.d/50-ultramarine-xfce-slick-greeter.conf %endif %if %{with desktop}