Fix task synchronization
Signed-off-by: Severin Kaderli <severin@kaderli.dev>
This commit is contained in:
parent
ee2af96dfd
commit
cd607f0c79
4 changed files with 15 additions and 21 deletions
2
.gitignore
vendored
2
.gitignore
vendored
|
@ -21,6 +21,8 @@ system/.config/polybar/scripts/gmail/credentials.json
|
||||||
system/.config/i3/config
|
system/.config/i3/config
|
||||||
system/.config/gtk-2.0/gtkfilechooser.ini
|
system/.config/gtk-2.0/gtkfilechooser.ini
|
||||||
|
|
||||||
|
system/.config/task/localrc
|
||||||
|
|
||||||
# PhpStorm Configuration
|
# PhpStorm Configuration
|
||||||
system/.config/phpstorm/config/port.lock
|
system/.config/phpstorm/config/port.lock
|
||||||
system/.config/phpstorm/config/port
|
system/.config/phpstorm/config/port
|
||||||
|
|
|
@ -16,10 +16,10 @@ xset s off
|
||||||
xset s noblank
|
xset s noblank
|
||||||
xset -dpms
|
xset -dpms
|
||||||
|
|
||||||
|
|
||||||
# Set keyboard layout
|
# Set keyboard layout
|
||||||
setxkbmap -model pc105 -layout ch
|
setxkbmap -model pc105 -layout ch
|
||||||
|
|
||||||
|
# Start applications
|
||||||
nm-applet &
|
nm-applet &
|
||||||
redshift-gtk &
|
redshift-gtk &
|
||||||
sxhkd &
|
sxhkd &
|
||||||
|
@ -27,10 +27,12 @@ sxhkd &
|
||||||
# Merge .Xresources on boot
|
# Merge .Xresources on boot
|
||||||
xrdb -merge "${XDG_CONFIG_HOME}/X11/xresources"
|
xrdb -merge "${XDG_CONFIG_HOME}/X11/xresources"
|
||||||
|
|
||||||
# Start ibus
|
# Add local configuration for taskwarrior
|
||||||
#ibus-daemon -drx
|
if [ "${IS_WORK}" = "1" ]; then
|
||||||
|
echo "recurrence=off" > "${XDG_CONFIG_HOME}/task/localrc"
|
||||||
. "${XDG_BIN_HOME}/resolution"
|
else
|
||||||
|
echo "" > "${XDG_CONFIG_HOME}/task/localrc"
|
||||||
|
fi
|
||||||
|
|
||||||
dbus-update-activation-environment --systemd DISPLAY
|
dbus-update-activation-environment --systemd DISPLAY
|
||||||
eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)"
|
eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)"
|
||||||
|
|
|
@ -29,10 +29,4 @@ color.due=
|
||||||
color.due.today=
|
color.due.today=
|
||||||
dateformat=Y-M-D H:N
|
dateformat=Y-M-D H:N
|
||||||
|
|
||||||
# Synchronization
|
include ~/.config/task/localrc
|
||||||
taskd.certificate=/home/severin/.local/keys/taskwarrior/private.certificate.pem
|
|
||||||
taskd.key=/home/severin/.local/keys/taskwarrior/private.key.pem
|
|
||||||
taskd.ca=/home/severin/.local/keys/taskwarrior/ca.cert.pem
|
|
||||||
taskd.server=taskwarrior.inthe.am:53589
|
|
||||||
taskd.credentials=inthe_am/severin.kaderli/0a28cfd9-a503-4518-8e62-25eef00f6e00
|
|
||||||
taskd.trust=ignore hostname
|
|
|
@ -26,12 +26,8 @@ if [ "${IS_WORK}" = "1" ]; then
|
||||||
export GIT_SSH_COMMAND="ssh -i /home/severin/.ssh/severin_id_rsa"
|
export GIT_SSH_COMMAND="ssh -i /home/severin/.ssh/severin_id_rsa"
|
||||||
fi
|
fi
|
||||||
|
|
||||||
task sync
|
cd "/home/severin/tasks" || exit
|
||||||
|
git pull
|
||||||
if [ "${IS_WORK}" = "0" ]; then
|
git add --all
|
||||||
cd "/home/severin/tasks" || exit
|
git commit -s -m "Update tasks"
|
||||||
git pull
|
git push origin master
|
||||||
git add --all
|
|
||||||
git commit -s -m "Update tasks"
|
|
||||||
git push origin master
|
|
||||||
fi
|
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue