Skip to content

Commit 36217a0

Browse files
committed
fixes for the KDE Livesession Theming and icons
1 parent aebf2d7 commit 36217a0

File tree

12 files changed

+55
-8
lines changed

12 files changed

+55
-8
lines changed

airootfs/etc/nsswitch.conf

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
# Name Service Switch configuration file.
2+
# See nsswitch.conf(5) for details.
3+
# mdns_minimal added for local hostname resolution by EndeavourOS
4+
5+
passwd: files systemd
6+
group: files [SUCCESS=merge] systemd
7+
shadow: files systemd
8+
gshadow: files systemd
9+
10+
publickey: files
11+
12+
hosts: mymachines mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] files myhostname dns
13+
networks: files
14+
15+
protocols: files
16+
services: files
17+
ethers: files
18+
rpc: files
19+
20+
netgroup: files

airootfs/root/calamares.svg

+1
Loading
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,3 @@
1+
[Favorites]
2+
FavoriteURLs=/usr/share/applications/firefox.desktop,/usr/share/applications/calamares.desktop,/usr/share/applications/eos-apps-info.desktop,/usr/share/applications/eos-log-tool.desktop,/usr/share/applications/firefox.desktop,/usr/share/applications/org.kde.partitionmanager.desktop,/usr/share/applications/org.kde.systemmonitor.desktop,/usr/share/applications/pavucontrol.desktop,/usr/share/applications/reflector-simple.desktop./usr/share/applications/welcome.desktop
3+
Binary file not shown.

airootfs/root/endeavouros-skel-liveuser/src/etc/skel/.local/share/plasma/look-and-feel/com.endeavouros.breezedarkeos.desktop/contents/layouts/org.kde.plasma.desktop-layout.js

+2
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,8 @@ if (panel.formFactor === "horizontal") {
2424
var kickoff = panel.addWidget("org.kde.plasma.kickoff")
2525
kickoff.currentConfigGroup = ["Shortcuts"]
2626
kickoff.writeConfig("global", "Alt+F1")
27+
kickoff.currentConfigGroup = ["General"]
28+
kickoff.writeConfig("favorites",[,"preferred://browser","preferred://filemanager","org.kde.konsole.desktop","calamares.desktop","org.kde.partitionmanager","eos-log-tool.desktop","org.kde.spectacle.desktop"])
2729

2830
panel.addWidget("org.kde.plasma.pager")
2931

airootfs/root/liveuser.png

83.5 KB
Loading

airootfs/root/livewall.png

-4.24 KB
Loading

airootfs/root/welcome.patch

+20-2
Original file line numberDiff line numberDiff line change
@@ -1,2 +1,20 @@
1-
296d295
2-
< --field=" $(ltr install_community)!$WELCOME_ICON_INSTALL_COMMUNITY!$(ltr install_community_tip)":fbtn "eos-install-mode-run-calamares '$lang' community"
1+
50a51,52
2+
> export ICO_BLUETOOTH=/usr/share/icons/Qogir/scalable/devices/bluetooth.svg
3+
>
4+
295,296c297
5+
< --field=" $(ltr ins_start)!$ICO_INSTALL!$(ltr ins_starttip)":fbtn "eos-install-mode-run-calamares '$lang' ''"
6+
< --field=" $(ltr install_community)!$ICO_INSTALL!$(ltr install_community_tip)":fbtn "eos-install-mode-run-calamares '$lang' community"
7+
---
8+
> --field=" $(ltr ins_start)!$ICO_CALAMARES!$(ltr ins_starttip)":fbtn "eos-install-mode-run-calamares '$lang' ''"
9+
304c305
10+
< --field=" $(ltr ins_pm)!$ICO_GPARTED!$(ltr ins_pmtip)":fbtn 'gparted'
11+
---
12+
> --field=" $(ltr ins_pm)!$ICO_GPARTED!$(ltr ins_pmtip)":fbtn 'partitionmanager'
13+
309c310
14+
< --field=" $(ltr ins_blue_notes)!$ICO_TIPS!$(ltr ins_blue_notes_tip)":fbtn "$INSTALLER_BROWSER '$btdoc'"
15+
---
16+
> --field=" $(ltr ins_blue_notes)!$ICO_BLUETOOTH!$(ltr ins_blue_notes_tip)":fbtn "$INSTALLER_BROWSER '$btdoc'"
17+
670c671
18+
< --field=" $(ltr after_install_bt)!$ICO_INFO_WEB!$(ltr after_install_bttip)":fbtn "WelcomeBrowser 'https://discovery.endeavouros.com/bluetooth/bluetooth/2021/03'" # 'https://discovery.endeavouros.com/bluetooth'
19+
---
20+
> --field=" $(ltr after_install_bt)!$ICO_BLUETOOTH!$(ltr after_install_bttip)":fbtn "WelcomeBrowser 'https://discovery.endeavouros.com/bluetooth/bluetooth/2021/03'" # 'https://discovery.endeavouros.com/bluetooth'

livewall-galileo-devel.xcf

5.74 MB
Binary file not shown.

packages.x86_64

+2-1
Original file line numberDiff line numberDiff line change
@@ -269,8 +269,9 @@ welcome
269269
yay
270270

271271
## Calamares EndeavourOS
272-
#calamares
272+
calamares-git
273273
ckbcomp
274+
os-prober
274275

275276
# VM SUPPORT
276277

prepare.sh

-3
Original file line numberDiff line numberDiff line change
@@ -6,9 +6,6 @@ wget -qN --show-progress -P "airootfs/etc/pacman.d/" "https://raw.githubusercont
66
# Get wallpaper for installed system
77
wget -qN --show-progress -P "airootfs/root/" "https://raw.githubusercontent.com/endeavouros-team/endeavouros-theming/master/backgrounds/endeavouros-wallpaper.png"
88

9-
# current downgrade mesa for calamares lag in vms:
10-
#wget "https://archive.archlinux.org/packages/m/mesa/mesa-22.1.7-1-x86_64.pkg.tar.zst"
11-
#mv mesa-22.1.7-1-x86_64.pkg.tar.zst "airootfs/root/packages/"
129

1310
# Make sure build scripts are executable
1411
chmod +x "./"{"mkarchiso","run_before_squashfs.sh"}

run_before_squashfs.sh

+7-2
Original file line numberDiff line numberDiff line change
@@ -43,13 +43,16 @@ usermod -s /usr/bin/bash root
4343
4444
# Create liveuser
4545
useradd -m -p "" -g 'liveuser' -G 'sys,rfkill,wheel,uucp,nopasswdlogin,adm,tty' -s /bin/bash liveuser
46+
cp "/root/liveuser.png" "/var/lib/AccountsService/icons/liveuser"
47+
rm "/root/liveuser.png"
4648
4749
# Remove liveuser skel to then install user skel
4850
pacman -Rns --noconfirm -- "endeavouros-skel-liveuser"
4951
rm -rf "/root/endeavouros-skel-liveuser"
5052
5153
# setup theming for root user
5254
cp -a "/root/root-theme" "/root/.config"
55+
rm -R "/root/root-theme"
5356
5457
# Add builddate to motd:
5558
cat "/usr/lib/endeavouros-release" >> "/etc/motd"
@@ -71,11 +74,13 @@ patch "/etc/calamares/scripts/chrooted_cleaner_script.sh" "/root/chrooted_cleane
7174
rm "/root/chrooted_cleaner_script.patch"
7275
rm "/root/eos-install-mode-run-calamares.patch"
7376
74-
# patching welcome to not show community editions
77+
# patching welcome to not show community editions and icon fix test
7578
patch "/usr/share/endeavouros/scripts/welcome" "/root/welcome.patch"
76-
patch "/usr/bin/arm-eos-welcome-installer" "/root/arm-eos-welcome-installer.patch"
7779
rm "/root/welcome.patch"
80+
patch "/usr/bin/arm-eos-welcome-installer" "/root/arm-eos-welcome-installer.patch"
7881
rm "/root/arm-eos-welcome-installer.patch"
82+
cp "/root/calamares.svg" "/usr/share/icons/Qogir/scalable/apps/calamares.svg"
83+
rm "/root/calamares.svg"
7984
8085
# Set wallpaper for live-session and original for installed system
8186
mv "endeavouros-wallpaper.png" "/etc/calamares/files/endeavouros-wallpaper.png"

0 commit comments

Comments
 (0)