Skip to content

Commit

Permalink
fixes for the KDE Livesession Theming and icons
Browse files Browse the repository at this point in the history
  • Loading branch information
killajoe committed Aug 22, 2023
1 parent aebf2d7 commit 36217a0
Show file tree
Hide file tree
Showing 12 changed files with 55 additions and 8 deletions.
20 changes: 20 additions & 0 deletions airootfs/etc/nsswitch.conf
Original file line number Diff line number Diff line change
@@ -0,0 +1,20 @@
# Name Service Switch configuration file.
# See nsswitch.conf(5) for details.
# mdns_minimal added for local hostname resolution by EndeavourOS

passwd: files systemd
group: files [SUCCESS=merge] systemd
shadow: files systemd
gshadow: files systemd

publickey: files

hosts: mymachines mdns_minimal [NOTFOUND=return] resolve [!UNAVAIL=return] files myhostname dns
networks: files

protocols: files
services: files
ethers: files
rpc: files

netgroup: files
1 change: 1 addition & 0 deletions airootfs/root/calamares.svg
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Original file line number Diff line number Diff line change
@@ -0,0 +1,3 @@
[Favorites]
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

Binary file not shown.
Original file line number Diff line number Diff line change
Expand Up @@ -24,6 +24,8 @@ if (panel.formFactor === "horizontal") {
var kickoff = panel.addWidget("org.kde.plasma.kickoff")
kickoff.currentConfigGroup = ["Shortcuts"]
kickoff.writeConfig("global", "Alt+F1")
kickoff.currentConfigGroup = ["General"]
kickoff.writeConfig("favorites",[,"preferred://browser","preferred://filemanager","org.kde.konsole.desktop","calamares.desktop","org.kde.partitionmanager","eos-log-tool.desktop","org.kde.spectacle.desktop"])

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

Expand Down
Binary file added airootfs/root/liveuser.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
Binary file modified airootfs/root/livewall.png
Loading
Sorry, something went wrong. Reload?
Sorry, we cannot display this file.
Sorry, this file is invalid so it cannot be displayed.
22 changes: 20 additions & 2 deletions airootfs/root/welcome.patch
Original file line number Diff line number Diff line change
@@ -1,2 +1,20 @@
296d295
< --field=" $(ltr install_community)!$WELCOME_ICON_INSTALL_COMMUNITY!$(ltr install_community_tip)":fbtn "eos-install-mode-run-calamares '$lang' community"
50a51,52
> export ICO_BLUETOOTH=/usr/share/icons/Qogir/scalable/devices/bluetooth.svg
>
295,296c297
< --field=" $(ltr ins_start)!$ICO_INSTALL!$(ltr ins_starttip)":fbtn "eos-install-mode-run-calamares '$lang' ''"
< --field=" $(ltr install_community)!$ICO_INSTALL!$(ltr install_community_tip)":fbtn "eos-install-mode-run-calamares '$lang' community"
---
> --field=" $(ltr ins_start)!$ICO_CALAMARES!$(ltr ins_starttip)":fbtn "eos-install-mode-run-calamares '$lang' ''"
304c305
< --field=" $(ltr ins_pm)!$ICO_GPARTED!$(ltr ins_pmtip)":fbtn 'gparted'
---
> --field=" $(ltr ins_pm)!$ICO_GPARTED!$(ltr ins_pmtip)":fbtn 'partitionmanager'
309c310
< --field=" $(ltr ins_blue_notes)!$ICO_TIPS!$(ltr ins_blue_notes_tip)":fbtn "$INSTALLER_BROWSER '$btdoc'"
---
> --field=" $(ltr ins_blue_notes)!$ICO_BLUETOOTH!$(ltr ins_blue_notes_tip)":fbtn "$INSTALLER_BROWSER '$btdoc'"
670c671
< --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'
---
> --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'
Binary file added livewall-galileo-devel.xcf
Binary file not shown.
3 changes: 2 additions & 1 deletion packages.x86_64
Original file line number Diff line number Diff line change
Expand Up @@ -269,8 +269,9 @@ welcome
yay

## Calamares EndeavourOS
#calamares
calamares-git
ckbcomp
os-prober

# VM SUPPORT

Expand Down
3 changes: 0 additions & 3 deletions prepare.sh
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,6 @@ wget -qN --show-progress -P "airootfs/etc/pacman.d/" "https://raw.githubusercont
# Get wallpaper for installed system
wget -qN --show-progress -P "airootfs/root/" "https://raw.githubusercontent.com/endeavouros-team/endeavouros-theming/master/backgrounds/endeavouros-wallpaper.png"

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

# Make sure build scripts are executable
chmod +x "./"{"mkarchiso","run_before_squashfs.sh"}
Expand Down
9 changes: 7 additions & 2 deletions run_before_squashfs.sh
Original file line number Diff line number Diff line change
Expand Up @@ -43,13 +43,16 @@ usermod -s /usr/bin/bash root
# Create liveuser
useradd -m -p "" -g 'liveuser' -G 'sys,rfkill,wheel,uucp,nopasswdlogin,adm,tty' -s /bin/bash liveuser
cp "/root/liveuser.png" "/var/lib/AccountsService/icons/liveuser"
rm "/root/liveuser.png"
# Remove liveuser skel to then install user skel
pacman -Rns --noconfirm -- "endeavouros-skel-liveuser"
rm -rf "/root/endeavouros-skel-liveuser"
# setup theming for root user
cp -a "/root/root-theme" "/root/.config"
rm -R "/root/root-theme"
# Add builddate to motd:
cat "/usr/lib/endeavouros-release" >> "/etc/motd"
Expand All @@ -71,11 +74,13 @@ patch "/etc/calamares/scripts/chrooted_cleaner_script.sh" "/root/chrooted_cleane
rm "/root/chrooted_cleaner_script.patch"
rm "/root/eos-install-mode-run-calamares.patch"
# patching welcome to not show community editions
# patching welcome to not show community editions and icon fix test
patch "/usr/share/endeavouros/scripts/welcome" "/root/welcome.patch"
patch "/usr/bin/arm-eos-welcome-installer" "/root/arm-eos-welcome-installer.patch"
rm "/root/welcome.patch"
patch "/usr/bin/arm-eos-welcome-installer" "/root/arm-eos-welcome-installer.patch"
rm "/root/arm-eos-welcome-installer.patch"
cp "/root/calamares.svg" "/usr/share/icons/Qogir/scalable/apps/calamares.svg"
rm "/root/calamares.svg"
# Set wallpaper for live-session and original for installed system
mv "endeavouros-wallpaper.png" "/etc/calamares/files/endeavouros-wallpaper.png"
Expand Down

0 comments on commit 36217a0

Please sign in to comment.