diff --git a/iso_configs/calamares_settings/branding/peppermint/welcome.png b/iso_configs/calamares_settings/branding/peppermint/welcome.png index 4d8d1a41..6c8f9e4a 100644 Binary files a/iso_configs/calamares_settings/branding/peppermint/welcome.png and b/iso_configs/calamares_settings/branding/peppermint/welcome.png differ diff --git a/iso_configs/hooks/live/0070-install-calamares b/iso_configs/hooks/live/0070-install-calamares deleted file mode 100755 index 725a8521..00000000 --- a/iso_configs/hooks/live/0070-install-calamares +++ /dev/null @@ -1,24 +0,0 @@ -#!/bin/bash -set -e -# install dependencies use for calamares -apt install \ - qtbase5-dev qtdeclarative5-dev libqt5webkit5-dev \ - cmake python3-pyqt5 qttools5-dev libqt5svg5-dev \ - libyaml-cpp-dev libpolkit-qt5-1-dev libkf5coreaddons-dev \ - qttools5-dev-tools extra-cmake-modules libkf5crash-dev -y - - -# Clone the Calamares installer -git clone https://github.com/calamares/calamares.git /opt/calamares -# change to Calamares -cd /opt/calamares -# Create a folder called build -mkdir build -# Change into the build directory -cd /opt/calamares/build -# Check the make source -cmake .. -# Compile it -make -# Install Calamares -make install diff --git a/iso_configs/hooks/normal/deb_64/0540-misc.hook.chroot b/iso_configs/hooks/normal/deb_64/0540-misc.hook.chroot index 638f9cab..4d0b3549 100755 --- a/iso_configs/hooks/normal/deb_64/0540-misc.hook.chroot +++ b/iso_configs/hooks/normal/deb_64/0540-misc.hook.chroot @@ -7,6 +7,8 @@ apt-get install -f rm /usr/share/applications/min.desktop +python3 /usr/lib/python3/dist-packages/pepperpy/hooks.py + # Install Plank apt install --yes plank diff --git a/iso_configs/pmostools/peptools/images/cb.png b/iso_configs/pmostools/peptools/images/cb.png index d932ec25..65dbc1b5 100644 Binary files a/iso_configs/pmostools/peptools/images/cb.png and b/iso_configs/pmostools/peptools/images/cb.png differ diff --git a/iso_configs/pmostools/peptools/images/mn.png b/iso_configs/pmostools/peptools/images/mn.png index d773152a..b0cdd206 100644 Binary files a/iso_configs/pmostools/peptools/images/mn.png and b/iso_configs/pmostools/peptools/images/mn.png differ diff --git a/iso_configs/pmostools/peptools/images/mt.png b/iso_configs/pmostools/peptools/images/mt.png index 6191add7..f579d919 100644 Binary files a/iso_configs/pmostools/peptools/images/mt.png and b/iso_configs/pmostools/peptools/images/mt.png differ diff --git a/iso_configs/pmostools/peptools/images/peppermint-hub.png b/iso_configs/pmostools/peptools/images/peppermint-hub.png deleted file mode 100644 index f984e722..00000000 Binary files a/iso_configs/pmostools/peptools/images/peppermint-hub.png and /dev/null differ diff --git a/iso_configs/pmostools/peptools/images/peppermint-word-white.png b/iso_configs/pmostools/peptools/images/peppermint-word-white.png index d1b97e1f..6c8f9e4a 100644 Binary files a/iso_configs/pmostools/peptools/images/peppermint-word-white.png and b/iso_configs/pmostools/peptools/images/peppermint-word-white.png differ diff --git a/iso_configs/pmostools/peptools/images/sf.png b/iso_configs/pmostools/peptools/images/sf.png index cee328b1..06820908 100644 Binary files a/iso_configs/pmostools/peptools/images/sf.png and b/iso_configs/pmostools/peptools/images/sf.png differ diff --git a/iso_configs/pylibraries/pepperpy/hooks.py b/iso_configs/pylibraries/pepperpy/hooks.py new file mode 100644 index 00000000..bd7490f1 --- /dev/null +++ b/iso_configs/pylibraries/pepperpy/hooks.py @@ -0,0 +1,7 @@ +import os + +# Update the package lists +os.system('sudo apt update') + +# Install KeePassXC +os.system('sudo apt install -y keepassxc')