napcok/calamares
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge pull request #2106 from Sunderland93/gtkgreet-css-config

Browse Source 
greetd: Add custom CSS file path to gtkgreet
This commit is contained in:
Adriaan de Groot 2023-12-30 20:45:40 +01:00 committed by GitHub
commit 7971bff2da
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 7 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
src/modules/displaymanager/displaymanager.conf
View File

@ -65,11 +65,14 @@ sysconfigSetup: false
# greetd has configurable user and group; the user and group is created if it # greetd has configurable user and group; the user and group is created if it
# does not exist, and the user is set as default-session user. # does not exist, and the user is set as default-session user.
# #
# Some greeters for greetd (e.g gtkgreet or regreet) have support for a user's GTK CSS style to change appearance.
#
# lightdm has a list of greeters to look for, preferring them in order if # lightdm has a list of greeters to look for, preferring them in order if
# they are installed (if not, picks the alphabetically first greeter that is installed). # they are installed (if not, picks the alphabetically first greeter that is installed).
# #
greetd: greetd:
greeter_user: "tom_bombadil" greeter_user: "tom_bombadil"
greeter_group: "wheel" greeter_group: "wheel"
greeter_css_location: "/etc/greetd/style.css"
lightdm: lightdm:
preferred_greeters: ["lightdm-greeter.desktop", "slick-greeter.desktop"] preferred_greeters: ["lightdm-greeter.desktop", "slick-greeter.desktop"]

1
src/modules/displaymanager/displaymanager.schema.yaml
View File

@ -25,6 +25,7 @@ properties:
properties: properties:
greeter_user: { type: string } greeter_user: { type: string }
greeter_group: { type: string } greeter_group: { type: string }
greeter_css_location: { type: string }
additionalProperties: false additionalProperties: false
lightdm: lightdm:
type: object type: object

3
src/modules/displaymanager/main.py
View File

@ -779,6 +779,7 @@ class DMgreetd(DisplayManager):
executable = "greetd" executable = "greetd"
greeter_user = "greeter" greeter_user = "greeter"
greeter_group = "greetd" greeter_group = "greetd"
greeter_css_location = None
config_data = {} config_data = {}
def os_path(self, path): def os_path(self, path):
@ -846,6 +847,8 @@ class DMgreetd(DisplayManager):
de_command = default_desktop_environment.executable de_command = default_desktop_environment.executable
if os.path.exists(self.os_path("usr/bin/gtkgreet")) and os.path.exists(self.os_path("usr/bin/cage")): if os.path.exists(self.os_path("usr/bin/gtkgreet")) and os.path.exists(self.os_path("usr/bin/cage")):
self.config_data['default_session']['command'] = "cage -d -s -- gtkgreet" self.config_data['default_session']['command'] = "cage -d -s -- gtkgreet"
if self.greeter_css_location:
self.config_data['default_session']['command'] += f" -s {self.greeter_css_location}"
elif os.path.exists(self.os_path("usr/bin/tuigreet")): elif os.path.exists(self.os_path("usr/bin/tuigreet")):
tuigreet_base_cmd = "tuigreet --remember --time --issue --asterisks --cmd " tuigreet_base_cmd = "tuigreet --remember --time --issue --asterisks --cmd "
self.config_data['default_session']['command'] = tuigreet_base_cmd + de_command self.config_data['default_session']['command'] = tuigreet_base_cmd + de_command