diff --git a/backup/backup b/backup/backup index 26c74b9..0ee5ac9 100755 --- a/backup/backup +++ b/backup/backup @@ -1,4 +1,7 @@ -rsync --ignore-existing -azP ~/documents/ 192.168.1.250:backup/documents/ -rsync --ignore-existing -azP ~/pictures/ 192.168.1.250:backup/pictures/ -rsync --ignore-existing -azP ~/books/ 192.168.1.250:backup/books/ +rsync --ignore-existing -azP ~/documents/ 192.168.1.225:documents/ +rsync --ignore-existing -azP ~/pictures/ 192.168.1.225:pictures/ +rsync --ignore-existing -azP ~/books/ 192.168.1.225:books/ +rsync --ignore-existing -azP ~/recordings/ 192.168.1.225:recordings/ +rsync --ignore-existing -azP ~/misc/ 192.168.1.225:misc/ +rsync --ignore-existing -azP ~/git/ 192.168.1.225:git/ diff --git a/dmenu/dmenu_VPN b/dmenu/dmenu_VPN index d529ab8..6e730f8 100755 --- a/dmenu/dmenu_VPN +++ b/dmenu/dmenu_VPN @@ -3,13 +3,37 @@ # List each dmenu_ item in ~/.local/bin/dmenu # Execute when selected +#ls /etc/openvpn/*.ovpn | sed 's/.*\///' | dmenu -i -p "VPN:" + select_vpn() { - vpn=$(printf "umm" | dmenu -i -p "VPN:") + #vpn=$(ls /etc/openvpn/*.conf | sed 's/.*\/\(.*\.\).*/\1/' | dmenu -i -p "VPN:") + + #echo $vpn + #vpn="uk2167" + +#.*\/\(.*\.\).*(^\.)$/ +# (?=\.) +# (.*\.\):w + + SUDO_ASKPASS=~/.local/bin/dmenu/dmenu_pass\ + sudo -A\ + /home/nathan/git/scripts/misc/switchvpn\ + $(ls /etc/openvpn/*.conf | sed 's/\w{1,}(?=\.))/i/\1/' | dmenu -i -p "VPN:") + #$(ls /etc/openvpn/*.conf | sed 's/.*\/\(.*\.\).*/\1/' | dmenu -i -p "VPN:") + + #SUDO_ASKPASS=~/.local/bin/dmenu/dmenu_pass sudo -A $(echo "/home/nathan/git/scripts/misc/switchvpn $vpn" | dmenu -i -p "Ye:") + #echo $vpn > ~/vpn - case "$vpn" in - "umm") - record_both;; - esac + #echo "[$vpn]" > ~/vpn + #systemctl stop openvpn + #sudo systemctl start openvpn@$vpn + # start the vpn service + #case "$vpn" in + #"umm") + #record_both;; + #"*.ovpn") + #touch /etc/openvpn/$vpn.ovpn;; + #esac } select_vpn diff --git a/dmenu/dmenu_pass b/dmenu/dmenu_pass new file mode 100755 index 0000000..29ed926 --- /dev/null +++ b/dmenu/dmenu_pass @@ -0,0 +1,4 @@ +#!/bin/bash +dmenu -p "$1" <&- && echo + +# https://www.reddit.com/r/dmenu/comments/1xxszr/run_programs_as_root_through_dmenu/ diff --git a/dmenu/dmenu_ytd b/dmenu/dmenu_ytd index 8fb444c..3a7a204 100755 --- a/dmenu/dmenu_ytd +++ b/dmenu/dmenu_ytd @@ -11,3 +11,5 @@ select_script() { record_both;; esac } + +select_script diff --git a/misc/switchvpn b/misc/switchvpn new file mode 100755 index 0000000..f211548 --- /dev/null +++ b/misc/switchvpn @@ -0,0 +1,2 @@ +#!/bin/sh +$(systemctl stop openvpn@$(cat /home/nathan/vpn) && systemctl start openvpn@$1) || systemctl start openvpn@$1