Include steam and discord in autostart target

Do autostart explicitly on startup
Install mpv on arch
2020-12-30 22:41:00 +01:00 · 2020-12-30 22:37:09 +01:00 · 2020-12-30 22:36:51 +01:00 · 2020-12-30 22:36:45 +01:00 · 2020-12-26 13:01:57 +01:00 · 2020-12-26 13:01:34 +01:00
30 changed files with 74 additions and 6 deletions
--- a/_machines/ares.yml
+++ b/_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"
--- a/autostart/services/autostart.target
+++ b/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
+
--- a/autostart/services/blueman.service
+++ b/autostart/services/blueman.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/blueman-applet
--- a/autostart/services/discord.service
+++ b/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
--- a/autostart/services/dpms.service
+++ b/autostart/services/dpms.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=oneshot
--- a/autostart/services/dunst.service
+++ b/autostart/services/dunst.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

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

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

 [Service]
 Type=forking
--- a/autostart/services/i3.service
+++ b/autostart/services/i3.service
@@ -0,0 +1,5 @@
+[Service]
+Type=exec
+ExecStart=i3 --config %h/.i3/config
+
+Restart=no
--- a/autostart/services/keepassx.service
+++ b/autostart/services/keepassx.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_HAS_KEEPASSX=true

 [Service]
--- a/autostart/services/keyboard.service
+++ b/autostart/services/keyboard.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=oneshot
--- a/autostart/services/laptop-lid.service
+++ b/autostart/services/laptop-lid.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 ConditionEnvironment=MACHINE_TYPE=laptop

--- a/autostart/services/nextcloud.service
+++ b/autostart/services/nextcloud.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 ConditionEnvironment=MACHINE_HAS_NEXTCLOUD=true

--- a/autostart/services/nm-applet.service
+++ b/autostart/services/nm-applet.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

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

 [Service]
 ExecStart=/usr/bin/pasystray
--- a/autostart/services/redshift.service
+++ b/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
--- a/autostart/services/restic.timer
+++ b/autostart/services/restic.timer
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Timer]
 OnCalendar=Mon..Fri 09:00:00
--- a/autostart/services/screencfg.service
+++ b/autostart/services/screencfg.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_DEFAULT_SCREENPROFILE

 [Service]
--- a/autostart/services/spotify.service
+++ b/autostart/services/spotify.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 ExecStart=/usr/bin/spotify
--- a/autostart/services/steam.service
+++ b/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
--- a/autostart/services/touchpad.service
+++ b/autostart/services/touchpad.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target
 ConditionEnvironment=MACHINE_TYPE=laptop

 [Service]
--- a/autostart/services/wallpaper.timer
+++ b/autostart/services/wallpaper.timer
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Timer]
 OnActiveSec=0s
--- a/autostart/services/windowmanager.target
+++ b/autostart/services/windowmanager.target
@@ -0,0 +1,3 @@
+[Unit]
+Requires=i3.service
+After=i3.service
--- a/autostart/services/xresources.service
+++ b/autostart/services/xresources.service
@@ -1,5 +1,6 @@
 [Unit]
 BindsTo=autostart.target
+After=windowmanager.target

 [Service]
 Type=oneshot
--- a/autostart/services/yubikey-touch-detector.service
+++ b/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
--- a/bin/kubectl-env
+++ b/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
--- a/packages.yml
+++ b/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:
--- a/user.yml
+++ b/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:
--- a/x/xinitrc
+++ b/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
--- a/zsh/zshrc.d/40_functions.sh
+++ b/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}'
 }
Author	SHA1	Message	Date
Hannes Körber	6c3e9d7469	Include steam and discord in autostart target	2020-12-30 22:41:00 +01:00
Hannes Körber	610edcc72d	Do autostart explicitly on startup	2020-12-30 22:37:09 +01:00
Hannes Körber	66bb04ee9a	Install mpv on arch	2020-12-30 22:36:51 +01:00
Hannes Körber	0043122f62	Add wrappers for env-based kubectl calls	2020-12-30 22:36:45 +01:00
Hannes Körber	afdd8fb34c	Remove debug tag from user playbook	2020-12-26 13:01:57 +01:00
Hannes Körber	4e1f071240	Use poppler for zathura on arch	2020-12-26 13:01:34 +01:00
Hannes Körber	39ef8a418e	autostart: Add steam and discord	2020-12-26 13:01:12 +01:00
Hannes Körber	ab15b22832	Run i3 as a systemd user unit	2020-12-26 12:59:03 +01:00