Skip to content

Commit 41ebcb1

Browse files
committed
Branding fixes
1 parent de2f30e commit 41ebcb1

File tree

6 files changed

+237
-23
lines changed

6 files changed

+237
-23
lines changed

branding/plymouth/hypercube/hypercube.script

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -49,11 +49,11 @@ background.sprite.SetZ(-100);
4949

5050
//--------------------------------- Logo Display ------------------------------------
5151

52-
// Load logo image (centered, smaller version of the hypercube)
52+
// Load logo image (centered on screen)
5353
logo.image = Image("logo.png");
5454
logo.sprite = Sprite(logo.image);
5555
logo.sprite.SetX(screen.half.w - logo.image.GetWidth() / 2);
56-
logo.sprite.SetY(screen.half.h - logo.image.GetHeight() / 2 - 50);
56+
logo.sprite.SetY(screen.half.h - logo.image.GetHeight() / 2);
5757
logo.sprite.SetZ(10);
5858
logo.sprite.SetOpacity(1);
5959

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
# Hypercube Plymouth dracut configuration
2+
# Include Plymouth theme in initramfs for early boot display
3+
4+
# Force Plymouth to be included
5+
add_dracutmodules+=" plymouth "
6+
7+
# Include the script renderer module
8+
add_drivers+=" drm "
9+
10+
# Ensure the Hypercube theme files are included
11+
install_items+=" /usr/share/plymouth/themes/hypercube/hypercube.plymouth /usr/share/plymouth/themes/hypercube/hypercube.script /usr/share/plymouth/themes/hypercube/*.png "

build_files/build.sh

Lines changed: 23 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -112,19 +112,23 @@ if [ -d /ctx/branding/plymouth/hypercube ]; then
112112
# Set Hypercube as the default Plymouth theme
113113
plymouth-set-default-theme hypercube
114114

115-
# Update initramfs to include the new theme
116-
# Note: This is handled by bootc/ostree during deployment, but we set the config
117-
if [ -f /etc/plymouth/plymouthd.conf ]; then
118-
sed -i 's/^Theme=.*/Theme=hypercube/' /etc/plymouth/plymouthd.conf
119-
else
120-
mkdir -p /etc/plymouth
121-
cat >/etc/plymouth/plymouthd.conf <<EOF
115+
# Configure Plymouth daemon
116+
mkdir -p /etc/plymouth
117+
cat >/etc/plymouth/plymouthd.conf <<EOF
122118
[Daemon]
123119
Theme=hypercube
124120
ShowDelay=0
125121
DeviceTimeout=8
126122
EOF
127-
fi
123+
124+
# Install dracut configuration to ensure Plymouth is included in initramfs
125+
mkdir -p /etc/dracut.conf.d
126+
cp /ctx/50-hypercube-plymouth.conf /etc/dracut.conf.d/
127+
128+
# Configure bootc kernel arguments for Plymouth
129+
# These ensure Plymouth shows during early boot and hides firmware logo
130+
mkdir -p /usr/lib/bootc/kargs.d
131+
cp /ctx/hypercube-kargs.json /usr/lib/bootc/kargs.d/
128132

129133
# Rebuild initramfs to include Plymouth theme
130134
# This is required for the theme to be available during early boot
@@ -163,3 +167,14 @@ if [ -d /usr/share/hypercube/config/gdm/dconf ]; then
163167

164168
echo "GDM branding installed successfully"
165169
fi
170+
171+
### Install GDM Tokyo Night theme CSS
172+
if [ -f /usr/share/hypercube/config/gdm/gnome-shell/gnome-shell.css ]; then
173+
echo "Installing GDM Tokyo Night CSS theme..."
174+
175+
# Install custom CSS to GDM's gnome-shell theme directory
176+
mkdir -p /usr/share/gnome-shell/theme
177+
cp -f /usr/share/hypercube/config/gdm/gnome-shell/gnome-shell.css /usr/share/gnome-shell/theme/gdm.css
178+
179+
echo "GDM Tokyo Night CSS theme installed successfully"
180+
fi

build_files/hypercube-kargs.json

Lines changed: 10 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
{
2+
"kargs": [
3+
"plymouth.enable=1",
4+
"quiet",
5+
"splash",
6+
"rd.plymouth=1",
7+
"plymouth.use-simpledrm=1",
8+
"bgrt_disable"
9+
]
10+
}

dot_files/gdm/dconf/hypercube-gdm

Lines changed: 16 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -6,34 +6,37 @@
66
disable-user-list=false
77

88
# Enable banner message with Hypercube branding
9-
banner-message-enable=true
9+
banner-message-enable=false
1010
banner-message-text='Welcome to Hypercube'
1111

1212
# Logo for GDM (displayed above login)
1313
logo='/usr/share/pixmaps/hypercube-logo.png'
1414

1515
[org/gnome/desktop/background]
16-
# GDM background - uses the same background as hyprlock
17-
picture-uri='file:///usr/share/hypercube/config/hypr/background.webp'
18-
picture-uri-dark='file:///usr/share/hypercube/config/hypr/background.webp'
19-
picture-options='zoom'
16+
# GDM background - cube logo centered on black
17+
picture-uri='file:///usr/share/pixmaps/hypercube-logo.png'
18+
picture-uri-dark='file:///usr/share/pixmaps/hypercube-logo.png'
19+
picture-options='centered'
2020

21-
# Tokyo Night background color as fallback
22-
primary-color='#1a1b26'
23-
secondary-color='#1a1b26'
21+
# Black background behind the centered logo
22+
primary-color='#000000'
23+
secondary-color='#000000'
2424
color-shading-type='solid'
2525

2626
[org/gnome/desktop/screensaver]
27-
# Lock screen background matches GDM
28-
picture-uri='file:///usr/share/hypercube/config/hypr/background.webp'
29-
primary-color='#1a1b26'
30-
secondary-color='#1a1b26'
27+
# Lock screen background - cube logo centered on black
28+
picture-uri='file:///usr/share/pixmaps/hypercube-logo.png'
29+
primary-color='#000000'
30+
secondary-color='#000000'
3131
color-shading-type='solid'
32-
picture-options='zoom'
32+
picture-options='centered'
3333

3434
[org/gnome/desktop/interface]
3535
# Tokyo Night compatible GTK theme and icon settings
3636
color-scheme='prefer-dark'
3737
cursor-theme='Adwaita'
3838
icon-theme='Adwaita'
3939
gtk-theme='Adwaita-dark'
40+
font-name='JetBrainsMono Nerd Font 13'
41+
monospace-font-name='JetBrainsMono Nerd Font Mono 13'
42+
document-font-name='JetBrainsMono Nerd Font 13'
Lines changed: 175 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,175 @@
1+
/* Hypercube GDM Theme - Tokyo Night Colors */
2+
3+
/* Font */
4+
stage {
5+
font-family: "JetBrainsMono Nerd Font", "JetBrains Mono", monospace;
6+
}
7+
8+
/* Tokyo Night Color Palette:
9+
* Background: #1a1b26
10+
* Foreground: #c0caf5
11+
* Selection: #33467c
12+
* Comment: #565f89
13+
* Red: #f7768e
14+
* Orange: #ff9e64
15+
* Yellow: #e0af68
16+
* Green: #9ece6a
17+
* Cyan: #7dcfff
18+
* Blue: #7aa2f7
19+
* Magenta: #bb9af7
20+
* Purple: #9d7cd8
21+
*/
22+
23+
/* Main stage/background */
24+
#lockDialogGroup {
25+
background-color: #000000;
26+
}
27+
28+
/* Login dialog */
29+
.login-dialog {
30+
background-color: transparent;
31+
border: none;
32+
}
33+
34+
/* User list and selection */
35+
.login-dialog-user-list-item {
36+
color: #c0caf5;
37+
}
38+
39+
.login-dialog-user-list-item:focus,
40+
.login-dialog-user-list-item:hover,
41+
.login-dialog-user-list-item:selected {
42+
background-color: #33467c;
43+
color: #c0caf5;
44+
}
45+
46+
/* Username text */
47+
.login-dialog-user-list-item .login-dialog-user-name {
48+
color: #c0caf5;
49+
}
50+
51+
/* Password entry */
52+
.login-dialog-prompt-entry {
53+
background-color: #1a1b26;
54+
border: 1px solid #33467c;
55+
color: #c0caf5;
56+
}
57+
58+
.login-dialog-prompt-entry:focus {
59+
border-color: #7aa2f7;
60+
}
61+
62+
/* Prompt label (e.g., "Password:") */
63+
.login-dialog-prompt-label {
64+
color: #c0caf5;
65+
}
66+
67+
/* Message text */
68+
.login-dialog-message {
69+
color: #c0caf5;
70+
}
71+
72+
.login-dialog-message-warning {
73+
color: #ff9e64;
74+
}
75+
76+
.login-dialog-message-hint {
77+
color: #565f89;
78+
}
79+
80+
/* Banner message */
81+
.login-dialog-banner {
82+
color: #c0caf5;
83+
}
84+
85+
/* Session/gear button */
86+
.login-dialog-session-list-button {
87+
color: #c0caf5;
88+
}
89+
90+
.login-dialog-session-list-button:hover,
91+
.login-dialog-session-list-button:focus {
92+
background-color: #33467c;
93+
}
94+
95+
/* Not listed / other user button */
96+
.login-dialog-not-listed-label {
97+
color: #7aa2f7;
98+
}
99+
100+
.login-dialog-not-listed-label:hover {
101+
color: #bb9af7;
102+
}
103+
104+
/* Auth prompt buttons */
105+
.modal-dialog-button {
106+
background-color: #1a1b26;
107+
border: 1px solid #33467c;
108+
color: #c0caf5;
109+
}
110+
111+
.modal-dialog-button:hover,
112+
.modal-dialog-button:focus {
113+
background-color: #33467c;
114+
border-color: #7aa2f7;
115+
}
116+
117+
.modal-dialog-button:default {
118+
background-color: #7aa2f7;
119+
color: #1a1b26;
120+
}
121+
122+
.modal-dialog-button:default:hover {
123+
background-color: #bb9af7;
124+
}
125+
126+
/* Clock and date on lock screen */
127+
.clock-display .clock {
128+
color: #c0caf5;
129+
}
130+
131+
.clock-display .message {
132+
color: #565f89;
133+
}
134+
135+
/* Top bar in GDM */
136+
#panel {
137+
background-color: transparent;
138+
}
139+
140+
#panel .panel-button {
141+
color: #c0caf5;
142+
}
143+
144+
#panel .panel-button:hover {
145+
background-color: #33467c;
146+
}
147+
148+
/* System menu items */
149+
.popup-menu {
150+
background-color: #1a1b26;
151+
border: 1px solid #33467c;
152+
}
153+
154+
.popup-menu-item {
155+
color: #c0caf5;
156+
}
157+
158+
.popup-menu-item:hover,
159+
.popup-menu-item:focus {
160+
background-color: #33467c;
161+
}
162+
163+
/* Power off / restart dialog */
164+
.end-session-dialog {
165+
background-color: #1a1b26;
166+
border: 1px solid #33467c;
167+
}
168+
169+
.end-session-dialog-subject {
170+
color: #c0caf5;
171+
}
172+
173+
.end-session-dialog-description {
174+
color: #565f89;
175+
}

0 commit comments

Comments
 (0)