diff --git a/.config/shell/aliasrc b/.config/shell/aliasrc index 4f71a01..ad112b1 100644 --- a/.config/shell/aliasrc +++ b/.config/shell/aliasrc @@ -80,11 +80,6 @@ alias \ dtl="drawterm -u solomon -h 9front -a 9front" \ dtr="drawterm -u solomon -h inkletblot.com -a inkletbltot.com" -# calcurse alias \ - calcurse-caldav-personal="CALCURSE_CALDAV_PASSWORD=$(pass show calcurse) calcurse-caldav --config=$HOME/.config/calcurse-personal/caldav/config --syncdb=$HOME/.local/share/calcurse-personal/caldav/sync.db --datadir=$HOME/.local/share/calcurse-personal" \ - calcurse-personal="calcurse-caldav-personal && calcurse -C $HOME/.config/calcurse-personal -D $HOME/.local/share/calcurse-personal" \ - calcurse-caldav-our="CALCURSE_CALDAV_PASSWORD=$(pass show calcurse) calcurse-caldav --config=$HOME/.config/calcurse-our/caldav/config --syncdb=$HOME/.local/share/calcurse-our/caldav/sync.db --datadir=$HOME/.local/share/calcurse-our" \ - calcurse-our="calcurse-caldav-our && calcurse -C $HOME/.config/calcurse-our -D $HOME/.local/share/calcurse-our" - + calcurse="calcurse-select" diff --git a/.local/bin/calcurse-caldav-our b/.local/bin/calcurse-caldav-our new file mode 100755 index 0000000..efb5620 --- /dev/null +++ b/.local/bin/calcurse-caldav-our @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +CALCURSE_CALDAV_PASSWORD=$(pass show calcurse) calcurse-caldav --config=$HOME/.config/calcurse-our/caldav/config --syncdb=$HOME/.local/share/calcurse-our/caldav/sync.db --datadir=$HOME/.local/share/calcurse-our diff --git a/.local/bin/calcurse-caldav-personal b/.local/bin/calcurse-caldav-personal new file mode 100755 index 0000000..6156231 --- /dev/null +++ b/.local/bin/calcurse-caldav-personal @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +CALCURSE_CALDAV_PASSWORD=$(pass show calcurse) calcurse-caldav --config=$HOME/.config/calcurse-personal/caldav/config --syncdb=$HOME/.local/share/calcurse-personal/caldav/sync.db --datadir=$HOME/.local/share/calcurse-personal diff --git a/.local/bin/calcurse-our b/.local/bin/calcurse-our new file mode 100755 index 0000000..1a539fa --- /dev/null +++ b/.local/bin/calcurse-our @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +calcurse-caldav-our && calcurse -C $HOME/.config/calcurse-our -D $HOME/.local/share/calcurse-our diff --git a/.local/bin/calcurse-personal b/.local/bin/calcurse-personal new file mode 100755 index 0000000..c455dfa --- /dev/null +++ b/.local/bin/calcurse-personal @@ -0,0 +1,3 @@ +#!/usr/bin/env bash + +calcurse-caldav-personal && calcurse -C $HOME/.config/calcurse-personal -D $HOME/.local/share/calcurse-personal diff --git a/.local/bin/calcurse-select b/.local/bin/calcurse-select new file mode 100755 index 0000000..cb029c3 --- /dev/null +++ b/.local/bin/calcurse-select @@ -0,0 +1,11 @@ +#!/usr/bin/env bash + +selection=$(echo -e "personal\nour" | dmenu) + +if [[ "$selection" = "our" ]]; then + calcurse-our +fi + +if [[ "$selection" = "personal" ]]; then + calcurse-personal +fi diff --git a/.local/bin/status-clock b/.local/bin/status-clock index 585565c..93bc8e1 100755 --- a/.local/bin/status-clock +++ b/.local/bin/status-clock @@ -2,7 +2,7 @@ case $BUTTON in 1) notify-send "This Month" "$(cal --color=always | sed "s/..7m//;s|..0m||")" && notify-send "Appointments" "$(calcurse -d3)" ;; - 2) setsid -f "$TERMINAL" -e calcurse ;; + 2) setsid -f "$TERMINAL" -e calcurse-personal ;; 3) notify-send "Time/date module" "Shows calendar and appointments - Left click to show upcoming appointments for the next three days via \`calcurse -d3\` and show the month via \`cal\` - Middle click opens calcurse if installed" ;;