Merge branch 'default' of git.spa5.dev:flexo/Dotfiles into default

bin/restic-backup

@@ -46,7 +46,16 @@ if [[ $1 == 'prune' ]]; then
   info "Pruning snapshots..."
   $HOME/.local/bin/restic --cache-dir ${CACHE_DIR} -r ${RESTIC_REPOSITORY} prune --max-unused 0
   info "Done"
+
+  info "Checking repository..."
+  $HOME/.local/bin/restic -r ${RESTIC_REPOSITORY} check
+  info "Done"
 else
+  if ! eval which snapper 2> /dev/null; then
+    # fallback
+    BACKUP_PATHS="/home/flexo"
+  fi
+
   info "Starting backup..."
   $HOME/.local/bin/restic --cache-dir ${CACHE_DIR} -r ${RESTIC_REPOSITORY} backup ${BACKUP_PATHS} \
     --exclude-file ${EXCLUDES_FILE}

flatpak/.config/systemd/user/flatpak-automatic.service

@@ -0,0 +1,8 @@
+[Unit]
+Description=flatpak Automatic Update
+Documentation=man:flatpak(1)
+
+[Service]
+Type=simple
+ExecStartPre=/bin/sh -c 'until ping -c1 google.com; do sleep 1; done;'
+ExecStart=/usr/bin/flatpak update -y

flatpak/.config/systemd/user/flatpak-automatic.timer

@@ -0,0 +1,10 @@
+[Unit]
+Description=flatpak Automatic Update Trigger
+Documentation=man:flatpak(1)
+
+[Timer]
+OnBootSec=1h
+OnUnitInactiveSec=1d
+
+[Install]
+WantedBy=timers.target

restic/.config/systemd/user/restic-backup.service

@@ -1,10 +1,8 @@
 [Unit]
-Description=restic backup
+Description=restic Backup
+Documentation=man:restic(1)
 
 [Service]
-Type=oneshot
+Type=simple
-ExecStartPre=/usr/bin/nm-online -q
+ExecStartPre=/bin/sh -c 'until ping -c1 google.com; do sleep 1; done;'
-ExecStart=%h/.bin/restic-backup
+ExecStart=%h/.dotfiles/bin/restic-backup
-
-[Install]
-WantedBy=multi-user.target

restic/.config/systemd/user/restic-backup.timer

@@ -1,5 +1,6 @@
 [Unit]
-Description=restic backup
+Description=restic Backup Trigger
+Documentation=man:restic(1)
 
 [Timer]
 Persistent=true

zsh/.zshenv

@@ -3,7 +3,9 @@ HISTSIZE=500000
 SAVEHIST=$HISTSIZE
 
 export GOPATH="$HOME/.go"
-export PATH="$HOME/.cargo/bin:$HOME/.gem/bin:$GOPATH/bin:$HOME/.local/bin:/opt/homebrew/bin:$PATH"
+export PATH="$HOME/.cargo/bin:$HOME/.gem/bin:$GOPATH/bin:$HOME/.dotfiles/bin:$HOME/.local/bin:$PATH"
+
+[[ "`uname`" == 'Darwin' ]] && PATH="/opt/homebrew/bin:$PATH"
 
 if [[ -x /usr/bin/nvim ]]; then
   export EDITOR=nvim