From da267e7f71eb24290813331c32fd4ccd0faeac43 Mon Sep 17 00:00:00 2001 From: Tulili Date: Mon, 18 Sep 2023 22:10:27 -0300 Subject: [PATCH] fix: justfiles and yaftifile integration --- config/files/usr/bin/just-malachite | 2 ++ config/files/usr/bin/yafti-malachite | 2 +- .../justfile} | 0 .../{yafti-malachite.yml => yaftifile.yml} | 23 +++++++++---------- config/scripts/99-bash-umask.sh | 6 ----- config/scripts/nodisplaylink.sh | 2 -- 6 files changed, 14 insertions(+), 21 deletions(-) create mode 100644 config/files/usr/bin/just-malachite rename config/files/usr/share/ublue-os/{just/custom-malachite.just => malachite/justfile} (100%) rename config/files/usr/share/ublue-os/malachite/{yafti-malachite.yml => yaftifile.yml} (95%) delete mode 100755 config/scripts/99-bash-umask.sh delete mode 100755 config/scripts/nodisplaylink.sh diff --git a/config/files/usr/bin/just-malachite b/config/files/usr/bin/just-malachite new file mode 100644 index 0000000000..10dc0bc0c3 --- /dev/null +++ b/config/files/usr/bin/just-malachite @@ -0,0 +1,2 @@ +#!/bin/sh +just -f /usr/share/ublue-os/malachite/justfile --unstable $@ \ No newline at end of file diff --git a/config/files/usr/bin/yafti-malachite b/config/files/usr/bin/yafti-malachite index 9a1379b391..61543b23df 100644 --- a/config/files/usr/bin/yafti-malachite +++ b/config/files/usr/bin/yafti-malachite @@ -1,3 +1,3 @@ #!/bin/sh rm -r "$HOME/.config/yafti" -yafti /usr/share/ublue-os/malachite/yafti-malachite.yml \ No newline at end of file +yafti /usr/share/ublue-os/malachite/yaftifile.yml \ No newline at end of file diff --git a/config/files/usr/share/ublue-os/just/custom-malachite.just b/config/files/usr/share/ublue-os/malachite/justfile similarity index 100% rename from config/files/usr/share/ublue-os/just/custom-malachite.just rename to config/files/usr/share/ublue-os/malachite/justfile diff --git a/config/files/usr/share/ublue-os/malachite/yafti-malachite.yml b/config/files/usr/share/ublue-os/malachite/yaftifile.yml similarity index 95% rename from config/files/usr/share/ublue-os/malachite/yafti-malachite.yml rename to config/files/usr/share/ublue-os/malachite/yaftifile.yml index 6a7362b42e..00208be387 100644 --- a/config/files/usr/share/ublue-os/malachite/yafti-malachite.yml +++ b/config/files/usr/share/ublue-os/malachite/yaftifile.yml @@ -9,7 +9,7 @@ screens: icon: "/path/to/icon" description: | This guided installer will help you get started with your new system. - configure-turquoise: + configure-system: source: yafti.screen.package values: title: Configure Malachite System @@ -22,40 +22,39 @@ screens: condition: run: distrobox list | grep -v nimbus packages: - - Setup Nimbus container: just --unstable setup nimbus + - Setup Nimbus container: just setup nimbus Nix Package Manager: description: Nix is a powerful package manager for Linux and other Unix systems that makes package management reliable and reproducible default: false packages: - - Install Nix Package Support: just --unstable setup nix + - Install Nix Package Support: just setup nix Waydroid: description: Android support with GApps, ARM translation, and Widevine out of the box default: false packages: - - Setup waydroid: just --unstable setup waydroid - - Setup waydroid-only session: just --unstable setup waydroid-session - - Setup shortcuts: just --unstable setup waydroid-shortcut + - Setup waydroid: just-malachite setup waydroid + - Setup waydroid-only session: just setup waydroid-session + - Setup shortcuts: just-malachite setup waydroid-shortcut Remote: description: Sets up proper remote access to this system! default: false packages: - - Setup Remotes: just --unstable setup remotes - - Setup Cockpit: just --unstable setup cockpit + - Setup Remotes: just-malachite setup remotes Dotfiles: description: Sets up my dotfiles and applies them directily to your system default: false packages: - - Setup: just --unstable setup dotfiles + - Setup: just-malachite setup dotfiles Webapp Manager: description: Sets up a webapp manager! default: false packages: - - Setup: just --unstable setup webapp-manager + - Setup: just-malachite setup webapp-manager Positivo Touch Screen: description: Adds udev rules for Positivo c464c-like laptops touchscreens default: false packages: - - Setup: just --unstable setup positivo-touchscreen + - Setup: just-malachite setup positivo-touchscreen can-we-modify-your-flatpaks: source: yafti.screen.consent values: @@ -163,7 +162,7 @@ screens: - KMail: org.kde.kmail - Jukebox (JuK): org.kde.juk - Kontrast: org.kde.kontrast - - Media Player (Haruna): org.kde.harun + - Media Player (Haruna): org.kde.haruna System Apps: description: System applications for all desktop environments. default: true diff --git a/config/scripts/99-bash-umask.sh b/config/scripts/99-bash-umask.sh deleted file mode 100755 index ab8a6037e1..0000000000 --- a/config/scripts/99-bash-umask.sh +++ /dev/null @@ -1,6 +0,0 @@ -#!/bin/sh -set -euo pipefail - -umask 077 -sed -i 's/umask 002/umask 077/g' /etc/bashrc -sed -i 's/umask 022/umask 077/g' /etc/bashrc diff --git a/config/scripts/nodisplaylink.sh b/config/scripts/nodisplaylink.sh deleted file mode 100755 index e97992685a..0000000000 --- a/config/scripts/nodisplaylink.sh +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/sh -systemctl disable displaylink.service