Update flatpak-management.nix
This commit is contained in:
@@ -1,9 +1,7 @@
|
|||||||
{ config, pkgs, lib, ... }:
|
{ config, pkgs, lib, ... }:
|
||||||
|
|
||||||
let
|
let
|
||||||
desiredFlatpaks = [
|
desiredFlatpaks = [];
|
||||||
"ch.threema.threema-web-desktop"
|
|
||||||
];
|
|
||||||
|
|
||||||
flatpakScript = pkgs.writeScript "nix-flatpak-management" ''
|
flatpakScript = pkgs.writeScript "nix-flatpak-management" ''
|
||||||
#!${pkgs.runtimeShell} -e
|
#!${pkgs.runtimeShell} -e
|
||||||
@@ -16,13 +14,13 @@ let
|
|||||||
installedFlatpaks=$(${pkgs.flatpak}/bin/flatpak list --app --columns=application)
|
installedFlatpaks=$(${pkgs.flatpak}/bin/flatpak list --app --columns=application)
|
||||||
|
|
||||||
# Users can decide what flatpaks they want to install so this is disabled
|
# Users can decide what flatpaks they want to install so this is disabled
|
||||||
# Remove Flatpaks not in the desired list
|
Remove Flatpaks not in the desired list
|
||||||
# for installed in $installedFlatpaks; do
|
for installed in $installedFlatpaks; do
|
||||||
# if ! echo ${lib.concatStringsSep " " desiredFlatpaks} | grep -q "$installed"; then
|
if ! echo ${lib.concatStringsSep " " desiredFlatpaks} | grep -q "$installed"; then
|
||||||
# echo "Removing $installed because it's not in the desiredFlatpaks list."
|
echo "Removing $installed because it's not in the desiredFlatpaks list."
|
||||||
# ${pkgs.flatpak}/bin/flatpak uninstall -y --noninteractive "$installed"
|
${pkgs.flatpak}/bin/flatpak uninstall -y --noninteractive "$installed"
|
||||||
# fi
|
fi
|
||||||
# done
|
done
|
||||||
|
|
||||||
# Install or re-install desired Flatpaks
|
# Install or re-install desired Flatpaks
|
||||||
for app in ${lib.concatStringsSep " " desiredFlatpaks}; do
|
for app in ${lib.concatStringsSep " " desiredFlatpaks}; do
|
||||||
@@ -30,6 +28,9 @@ let
|
|||||||
${pkgs.flatpak}/bin/flatpak install -y --noninteractive flathub "$app"
|
${pkgs.flatpak}/bin/flatpak install -y --noninteractive flathub "$app"
|
||||||
done
|
done
|
||||||
|
|
||||||
|
# Hardcoded Threema install because the beta is not on Flathub yet
|
||||||
|
${pkgs.flatpak}/bin/flatpak install -y --from https://releases.threema.ch/flatpak/threema-desktop/ch.threema.threema-desktop.flatpakref --noninteractive flathub "$app"
|
||||||
|
|
||||||
# Remove unused Flatpaks
|
# Remove unused Flatpaks
|
||||||
${pkgs.flatpak}/bin/flatpak uninstall --unused -y --noninteractive
|
${pkgs.flatpak}/bin/flatpak uninstall --unused -y --noninteractive
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user