Include steam and discord in autostart target

_machines/ares.yml

@@ -36,6 +36,8 @@ environment:
   MACHINE_TYPE: "workstation"
   MACHINE_HAS_KEEPASSX: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
+  MACHINE_HAS_STEAM: "true"
+  MACHINE_HAS_DISCORD: "true"
   MACHINE_HAS_RESTIC_BACKUP: "false"
   MACHINE_DEFAULT_SCREENPROFILE: "ares"
   MACHINE_RESOLUTION_X: "2560"

autostart/services/autostart.target

@@ -1,5 +1,9 @@
 [Unit]
+BindsTo=windowmanager.target
+After=windowmanager.target
+
 Wants=blueman.service
+Wants=discord.service
 Wants=dpms.service
 Wants=dunst.service
 Wants=firefox.service
@@ -14,7 +18,9 @@ Wants=redshift.service
 Wants=restic.timer
 Wants=screencfg.service
 Wants=spotify.service
+Wants=steam.service
 Wants=touchpad.service
 Wants=wallpaper.timer
 Wants=xresources.service
 Wants=yubikey-touch-detector.service
+

autostart/services/blueman.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/blueman-applet

autostart/services/discord.service

@@ -0,0 +1,8 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+
+ConditionEnvironment=MACHINE_HAS_DISCORD=true
+
+[Service]
+ExecStart=/usr/bin/discord

autostart/services/dpms.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 Type=oneshot

autostart/services/dunst.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/dunst -config %h/.config/dunstrc

autostart/services/firefox.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/firefox --setDefaultBrowser -P default

autostart/services/gpg-agent.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 Type=forking

autostart/services/i3.service

@@ -0,0 +1,5 @@
+[Service]
+Type=exec
+ExecStart=i3 --config %h/.i3/config
+
+Restart=no

autostart/services/keepassx.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_HAS_KEEPASSX=true
 
 [Service]

autostart/services/keyboard.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 Type=oneshot

autostart/services/laptop-lid.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 ConditionEnvironment=MACHINE_TYPE=laptop
 

autostart/services/nextcloud.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true
 

autostart/services/nm-applet.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/nm-applet

autostart/services/pasystray.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/pasystray

autostart/services/redshift.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/redshift-gtk -c %h/.config/redshift.conf

autostart/services/restic.timer

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Timer]
 OnCalendar=Mon..Fri 09:00:00

autostart/services/screencfg.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE
 
 [Service]

autostart/services/spotify.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/spotify

autostart/services/steam.service

@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+After=i3.service
+
+ConditionEnvironment=MACHINE_HAS_STEAM=true
+
+[Service]
+ExecStart=/usr/bin/steam

autostart/services/touchpad.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_TYPE=laptop
 
 [Service]

autostart/services/wallpaper.timer

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Timer]
 OnActiveSec=0s

autostart/services/windowmanager.target

@@ -0,0 +1,3 @@
+[Unit]
+Requires=i3.service
+After=i3.service

autostart/services/xresources.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 Type=oneshot

autostart/services/yubikey-touch-detector.service

@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 
 [Service]
 ExecStart=/usr/bin/yubikey-touch-detector -libnotify

bin/kubectl-env

@@ -0,0 +1,11 @@
+#!/usr/bin/env bash
+
+case "$1" in
+mycloud)
+    shift
+    command kubectl --kubeconfig=<(pass show mycloud/kubeconfig) "${@}"
+    ;;
+*)
+    command kubectl "${@}"
+    ;;
+esac

packages.yml

@@ -196,7 +196,7 @@ packages:
     zathura:
       fedora: ["zathura-pdf-mupdf"]
       ubuntu: ["zathura", "zathura-pdf-poppler"]
-      archlinux: ["zathura", "zathura-pdf-mupdf"]
+      archlinux: ["zathura", "zathura-pdf-poppler"]
     pandoc:
       fedora: ["pandoc"]
       ubuntu: ["pandoc"]
@@ -493,6 +493,10 @@ packages:
       fedora: []
       ubuntu: []
       archlinux: ["imagemagick"]
+    mpv:
+      fedora: []
+      ubuntu: []
+      archlinux: ["mpv"]
 
   remove:
     mousepad:

user.yml

@@ -78,7 +78,6 @@
     - gpg-agent.socket
     - gpg-agent-browser.socket
     - gpg-agent-ssh.socket
-  tags: [test]
 
 - name: create directory for getty autologin
   file:

x/xinitrc

@@ -20,13 +20,15 @@ fi
 
 start_wm() {
     log "starting i3"
-    exec i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
+    systemctl --user start windowmanager.target
+    sleep 1
+    systemctl --user start autostart.target
+    sleep inf
     # exec systemd-run --user --unit i3_user --pty --setenv=DISPLAY=${DISPLAY} i3 -c "$HOME/.i3/config" >> "$LOGDIR/i3/i3.log"
 }
 
 autostart() {
     log "Starting systemd user target \"autostart.target\""
-    systemctl --user start autostart.target >>"${LOGFILE}" 2>&1
 }
 
 exec >> "$LOGFILE" 2>&1

zsh/zshrc.d/40_functions.sh

@@ -208,9 +208,9 @@ tmp() {
 }
 
 kubectl_pod() {
-    kubectl get -n "${1}" pods --field-selector=status.phase=Running --selector=${2} -o jsonpath='{.items[*].metadata.name}'
+    kubectl-env mycloud get -n "${1}" pods --field-selector=status.phase=Running --selector=${2} -o jsonpath='{.items[*].metadata.name}'
 }
 
 kubectl_deployment() {
-    kubectl get -n "${1}" deployment --selector=${2} -o jsonpath='{.items[*].metadata.name}'
+    kubectl-env mycloud get -n "${1}" deployment --selector=${2} -o jsonpath='{.items[*].metadata.name}'
 }