From c9e1cc6b99db64df54dc8ccc6d94d84bb73cd9d8 Mon Sep 17 00:00:00 2001 From: Adam Perkowski Date: Sat, 5 Oct 2024 12:48:53 +0200 Subject: [PATCH] =?UTF-8?q?=E2=9D=84=EF=B8=8F=20no=20flakes=20yet?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- core/tabs/applications-setup/alacritty-setup.sh | 3 +++ core/tabs/applications-setup/android-debloat.sh | 3 +++ core/tabs/applications-setup/setup-flatpak.sh | 3 +++ core/tabs/common-script.sh | 2 +- 4 files changed, 10 insertions(+), 1 deletion(-) diff --git a/core/tabs/applications-setup/alacritty-setup.sh b/core/tabs/applications-setup/alacritty-setup.sh index 25558fed..5afe6937 100755 --- a/core/tabs/applications-setup/alacritty-setup.sh +++ b/core/tabs/applications-setup/alacritty-setup.sh @@ -9,6 +9,9 @@ installAlacritty() { pacman) "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm alacritty ;; + nix-env) + "$PACKAGER" -iA nixpkgs.alacritty + ;; *) "$ESCALATION_TOOL" "$PACKAGER" install -y alacritty ;; diff --git a/core/tabs/applications-setup/android-debloat.sh b/core/tabs/applications-setup/android-debloat.sh index b4e1073a..5e24d44c 100644 --- a/core/tabs/applications-setup/android-debloat.sh +++ b/core/tabs/applications-setup/android-debloat.sh @@ -15,6 +15,9 @@ install_adb() { dnf|zypper) "$ESCALATION_TOOL" "$PACKAGER" install -y android-tools ;; + nix-env) + "$PACKAGER" -iA nixpkgs.android-tools + ;; *) printf "%b\n" "${RED}Unsupported package manager: "$PACKAGER"${RC}" exit 1 diff --git a/core/tabs/applications-setup/setup-flatpak.sh b/core/tabs/applications-setup/setup-flatpak.sh index 75da28af..440f65cf 100755 --- a/core/tabs/applications-setup/setup-flatpak.sh +++ b/core/tabs/applications-setup/setup-flatpak.sh @@ -25,6 +25,9 @@ setup_flatpak() { pacman) "$ESCALATION_TOOL" "$PACKAGER" -S --needed --noconfirm flatpak ;; + nix-env) + "$PACKAGER" -iA nixpkgs.flatpak + ;; *) "$ESCALATION_TOOL" "$PACKAGER" install -y flatpak ;; diff --git a/core/tabs/common-script.sh b/core/tabs/common-script.sh index 12ab1146..96df373a 100644 --- a/core/tabs/common-script.sh +++ b/core/tabs/common-script.sh @@ -127,7 +127,7 @@ checkDistro() { checkEnv() { checkEscalationTool checkCommandRequirements "curl groups $ESCALATION_TOOL" - checkPackageManager 'nala apt-get dnf pacman zypper' + checkPackageManager 'nala apt-get dnf pacman zypper nix-env' checkCurrentDirectoryWritable checkSuperUser checkDistro