Separate wallpaper and lockscreen by host

Signed-off-by: Severin Kaderli <severin@kaderli.dev>

system/.config/cron/crontab

@@ -19,8 +19,8 @@
 # Synchronize notes every 15 minutes
 */15 * * * * $HOME/.local/bin/sync-notes >> $HOME/.local/log/cron.log
 
-# Synchronize tasks every 15 minutes
-*/15 * * * * $HOME/.local/bin/sync-tasks >> $HOME/.local/log/cron.log
+# Synchronize tasks every 10 minutes
+*/10 * * * * $HOME/.local/bin/sync-tasks >> $HOME/.local/log/cron.log
 
 # Synchronize rss feeds every 15 minutes
 */15 * * * * $HOME/.local/bin/rss-sync >> $HOME/.local/log/cron.log

system/.config/custom/env

@@ -11,7 +11,17 @@
 #
 # USAGE:
 # This script is sourced by .bashrc
-. "${XDG_BIN_HOME}/utils"
+if [ -f "${XDG_BIN_HOME}/utils" ]; then
+    . "${XDG_BIN_HOME}/utils"
+fi
+
+# XDG_Base_Directories
+export XDG_CONFIG_HOME="${HOME}/.config"
+export XDG_CACHE_HOME="${HOME}/.cache"
+export XDG_DATA_HOME="${HOME}/.local/share"
+export XDG_BIN_HOME="${HOME}/.local/bin"
+export XDG_LOG_HOME="${HOME}/.local/log"
+export DOTFILES="${HOME}/dotfiles"
 
 # XDG Overrides for unsupported programs 
 export HTTPIE_CONFIG_DIR="${XDG_CONFIG_HOME}/httpie"
@@ -53,7 +63,10 @@ export SAVEHIST=1000
 export HISTSIZE=1000
 export HISTFILESIZE=2000
 mkdir -p "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
-compinit -d "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
+
+if [ -n "$(command -v compinit)" ]; then
+    compinit -d "${XDG_DATA_HOME}/zsh/zcompdump-${ZSH_VERSION}"
+fi
 
 # Setting applications
 export VISUAL=vim

system/.config/git/config

@@ -29,7 +29,7 @@
 	a = add --all
 
 	# Create a commit and sign it off
-	c = commit -s
+	c = commit -s -S
 
 	# Push to the master branch of the origin remote
 	p = push --follow-tags
@@ -50,9 +50,6 @@
 [push]
 	default = upstream
 
-[commit]
-	gpgsign = true
-
 [url "git@gitlab.com:severinkaderli/"]
 	insteadOf = gl:
 

system/.config/task/taskrc

@@ -15,7 +15,7 @@ data.location=/home/severin/Tasks
 verbose=blank,footnote,label,new-id,affected,edit,special,project,sync,unwait
 
 report.todo.description=Tasks with now due date, overdue or due in the next 7 days
-report.todo.columns=id,due,project,description.count
+report.todo.columns=id,due,project,description.desc
 report.todo.labels=ID,Due,Project,Description
 report.todo.sort=due+
 report.todo.filter=due.before:1wk and status:pending or due: and status:pending
@@ -30,3 +30,10 @@ color.due=
 color.due.today=
 dateformat=Y-M-D H:N
 
+# Synchronization
+taskd.certificate=/home/severin/Keys/taskwarrior/private.certificate.pem
+taskd.key=/home/severin/Keys/taskwarrior/private.key.pem
+taskd.ca=/home/severin/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

system/.config/zsh/.zshrc

@@ -40,16 +40,9 @@ zstyle ':completion:*' menu select
 # Persistent rehash
 zstyle ':completion:*' rehash true
 
-# XDG_Base_Directories
-export XDG_CONFIG_HOME="${HOME}/.config"
-export XDG_CACHE_HOME="${HOME}/.cache"
-export XDG_DATA_HOME="${HOME}/.local/share"
-export XDG_BIN_HOME="${HOME}/.local/bin"
-export XDG_LOG_HOME="${HOME}/.local/log"
-
 # Sourcing environment variables
-if [ -f "${XDG_CONFIG_HOME}/custom/env" ]; then
-    . "${XDG_CONFIG_HOME}/custom/env"
+if [ -f "${HOME}/.config/custom/env" ]; then
+    . "${HOME}/.config/custom/env"
 fi
 
 # Enable color support of ls

system/.local/bin/screenlock

@@ -12,4 +12,4 @@
 #
 # USAGE:
 # ./screenlock
-betterlockscreen -l blur -t "Welcome back, Severin!"
+betterlockscreen -l  -t "Welcome back, Severin!"

system/.local/bin/sync-tasks

@@ -13,8 +13,13 @@
 # ./sync-tasks
 . /home/severin/.local/bin/utils
 
+export TASKDATA="/home/severin/Tasks"
+export TASKRC="/home/severin/.config/task/taskrc"
+
 print_time_log "sync-tasks" "Synchronizing tasks"
 
+task sync 
+
 cd "/home/severin/Tasks" || exit
 git pull > /dev/null 2>&1
 git add --all > /dev/null 2>&1

system/.local/bin/wallpaper

@@ -13,7 +13,5 @@
 # ./wallpaper
 . /home/severin/.local/bin/utils
 
-print_time_log "wallpaper" "Changing wallpaper"
-
-# When run from a cronjob the DISPLAY environment variable is not set
-DISPLAY=:0 feh --randomize --bg-fill --no-fehbg "${HOME}/Pictures/01_Wallpaper/Desktop/"
+HOST="$(hostname)"
+feh  --bg-fill --no-fehbg "${DOTFILES}/assets/wallpaper.${HOST}.jpg"

system/etc/systemd/system/suspend.service

@@ -1,14 +1,15 @@
 
 [Unit]
-Description=User suspend actions
-Before=suspend.target
+Description=Lock screen when going to sleep or suspend.
+Before=sleep.target
 
 [Service]
 User=severin
-Type=forking
+Type=simple
 Environment=DISPLAY=:0
 ExecStart=/home/severin/.local/bin/screenlock
-ExecStartPost=/usr/bin/sleep 1
+TimeoutSec=infinity
 
 [Install]
-WantedBy=sleep.target
+WantedBy=sleep.target
+WantedBy=suspend.target