From 2b9d974659d4f70fa805fc0d7fe6ab2b668a5025 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Mon, 1 Feb 2021 20:38:22 +0100 Subject: [PATCH] Add element autostart --- _machines/ares.yml | 1 + _machines/tb-hak.yml | 2 ++ autostart/services/autostart.target | 1 + autostart/services/element.service | 10 ++++++++++ packages.yml | 4 ++++ zsh/zprofile.j2 | 1 + 6 files changed, 19 insertions(+) create mode 100644 autostart/services/element.service diff --git a/_machines/ares.yml b/_machines/ares.yml index ba9068a..f75a8fb 100644 --- a/_machines/ares.yml +++ b/_machines/ares.yml @@ -42,5 +42,6 @@ environment: MACHINE_HAS_STEAM: "true" MACHINE_HAS_DISCORD: "true" MACHINE_HAS_RESTIC_BACKUP: "false" + MACHINE_HAS_ELEMENT: "true" MACHINE_RESOLUTION_X: "2560" MACHINE_RESOLUTION_Y: "1440" diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml index e0ffbeb..60d6d83 100644 --- a/_machines/tb-hak.yml +++ b/_machines/tb-hak.yml @@ -16,6 +16,7 @@ users: environment: MACHINE_HAS_NEXTCLOUD: "false" MACHINE_HAS_RESTIC_BACKUP: "true" + MACHINE_HAS_ELEMENT: "false" - name: hannes-private group: tpp vt: 2 @@ -28,6 +29,7 @@ users: environment: MACHINE_HAS_NEXTCLOUD: "true" MACHINE_HAS_RESTIC_BACKUP: "false" + MACHINE_HAS_ELEMENT: "true" screen: 1: DP-1-1 diff --git a/autostart/services/autostart.target b/autostart/services/autostart.target index 829513f..1c3c08e 100644 --- a/autostart/services/autostart.target +++ b/autostart/services/autostart.target @@ -6,6 +6,7 @@ Wants=blueman.service Wants=discord.service Wants=dpms.service Wants=dunst.service +Wants=element.service Wants=firefox.service Wants=gpg-agent.service Wants=gnome-keyring.service diff --git a/autostart/services/element.service b/autostart/services/element.service new file mode 100644 index 0000000..6a1cd78 --- /dev/null +++ b/autostart/services/element.service @@ -0,0 +1,10 @@ +[Unit] +BindsTo=autostart.target +After=windowmanager.target +After=i3.service + +ConditionPathExists=%h/.var/run/features/element + +[Service] +ExecStart=/usr/bin/env element-desktop +PassEnvironment=DISPLAY diff --git a/packages.yml b/packages.yml index c7a0aa3..20b3e3b 100644 --- a/packages.yml +++ b/packages.yml @@ -501,6 +501,10 @@ packages: fedora: [] ubuntu: ["gnome-keyring"] archlinux: ["gnome-keyring"] + element: + fedora: [] + ubuntu: [] + archlinux: ["element-desktop"] remove: mousepad: diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2 index 55d9433..aa480e2 100644 --- a/zsh/zprofile.j2 +++ b/zsh/zprofile.j2 @@ -63,6 +63,7 @@ mkdir -p "${FEATURE_DIR}" [[ $MACHINE_HAS_STEAM == "true" ]] && touch "${FEATURE_DIR}"/steam [[ $MACHINE_HAS_DISCORD == "true" ]] && touch "${FEATURE_DIR}"/discord [[ $MACHINE_HAS_RESTIC_BACKUP == "true" ]] && touch "${FEATURE_DIR}"/restic_backup +[[ $MACHINE_HAS_ELEMENT == "true" ]] && touch "${FEATURE_DIR}"/element [[ $MACHINE_TYPE == "laptop" ]] && touch "${FEATURE_DIR}"/matchine_is_laptop