From 2f557b27c316a841f7a48f71677b00535425d634 Mon Sep 17 00:00:00 2001 From: Brian Zalewski Date: Wed, 1 Feb 2023 06:02:56 +0000 Subject: [PATCH] Update 4 files - /home/Vagrantfile - /Vagrantfile - /software.yml - /home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl --- home/Vagrantfile => Vagrantfile | 0 .../universal/run_onchange_after_50-rclone.tmpl | 4 ++-- software.yml | 14 +++++++++++++- 3 files changed, 15 insertions(+), 3 deletions(-) rename home/Vagrantfile => Vagrantfile (100%) diff --git a/home/Vagrantfile b/Vagrantfile similarity index 100% rename from home/Vagrantfile rename to Vagrantfile diff --git a/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl index 8bfb5ea1..e79df726 100644 --- a/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl +++ b/home/.chezmoiscripts/universal/run_onchange_after_50-rclone.tmpl @@ -24,7 +24,7 @@ if command -v rclone > /dev/null; then sudo chmod 644 /etc/rcloneignore logg info 'Adding ~/.config/rclone/system-rclone.conf to /etc/rclone.conf' - sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/system-rclone.conf /etc/rclone.conf + sudo cp -f "${XDG_CONFIG_HOME:-$HOME/.config}/rclone/system-rclone.conf" /etc/rclone.conf ### Add / configure service files if [ -d /etc/systemd/system ]; then @@ -42,7 +42,7 @@ if command -v rclone > /dev/null; then sudo chown -Rf rclone:rclone "/mnt/$SERVICE_ID" ### Enable / restart the service - logg info "Enabling / restarting the $ S3 service" + logg info "Enabling / restarting the $SERVICE_ID S3 service" sudo systemctl enable "$SERVICE_ID" sudo systemctl restart "$SERVICE_ID" done diff --git a/software.yml b/software.yml index c385372b..e391a8a8 100644 --- a/software.yml +++ b/software.yml @@ -5966,12 +5966,24 @@ softwarePackages: _github: https://github.com/ProtonMail/WebClients _home: https://protonmail.com/ _name: ProtonVPN + _post:dnf: sudo dnf install -y python3-pip && pip3 install --user 'dnspython>=1.16.0' + _pre:apt: sudo apt-get install -y https://repo.protonvpn.com/debian/dists/stable/main/binary-all/protonvpn-stable-release_1.0.3_all.deb && sudo apt-get update + _pre:dnf: sudo dnf install -y https://repo.protonvpn.com/fedora-36-stable/release-packages/protonvpn-stable-release-1.0.1-1.noarch.rpm && sudo dnf update _when:cask: '! test -d /Applications/ProtonVPN.app' ansible: professormanhattan.proton + apt: + - gir1.2-appindicator3-0.1 + - gnome-shell-extension-appindicator + - protonvpn cask: protonvpn choco: protonvpn + dnf: + - gnome-extensions-app + - gnome-shell-extension-appindicator + - gnome-tweaks + - libappindicator-gtk3 + - protonvpn yay: protonvpn - _service: true _type: application protonvpn-cli: _bin: protonvpn-cli