From 104259a58b1e01c5f7f23523bf884fb57d5fbf1d Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Hannes=20K=C3=B6rber?= Date: Sat, 2 Oct 2021 13:05:51 +0200 Subject: [PATCH] Decommission tb-hak machine --- _machines/tb-hak.yml | 69 ------------------------------ screencfg/tb-hak/default.yml | 14 ------ screencfg/tb-hak/three-screens.yml | 18 -------- test-in-docker.sh | 15 ------- 4 files changed, 116 deletions(-) delete mode 100644 _machines/tb-hak.yml delete mode 100644 screencfg/tb-hak/default.yml delete mode 100644 screencfg/tb-hak/three-screens.yml diff --git a/_machines/tb-hak.yml b/_machines/tb-hak.yml deleted file mode 100644 index 7458571..0000000 --- a/_machines/tb-hak.yml +++ /dev/null @@ -1,69 +0,0 @@ -font_size: 11 -letter_space: 0 -terminal_binary: alacritty - -users: -- name: hannes-work - group: hak - vt: 1 - firefox_profiles: - - name: 3wmp9hdb.default-1565075150057 - manage_css: true - mail: hannes.koerber@tradebyte.com - git_gpg_sign: false - gpg_agent: false - gpg_agent_for_ssh: false - environment: - MACHINE_HAS_NEXTCLOUD: "false" - MACHINE_HAS_RESTIC_BACKUP: "true" - MACHINE_HAS_ELEMENT: "false" - has_yubikey: false -- name: hannes-private - group: tpp - vt: 2 - mail: hannes@hkoerber.de - git_gpg_sign: false - gpg_agent: true - gpg_agent_for_ssh: true - gpg_key: - email: hannes@hkoerber.de - id: "0xB5C002530C6A2053" - fingerprint: "973AE48D71B76735C4712B5BB5C002530C6A2053" - enable_passwordstore: true - environment: - MACHINE_HAS_NEXTCLOUD: "true" - MACHINE_HAS_RESTIC_BACKUP: "false" - MACHINE_HAS_ELEMENT: "true" - has_yubikey: true - -screen: - 1: DP-1-1 - 2: DP-1-1 - 3: DP-1-2 - 4: DP-1-2 - 5: DP-1-2 - 6: DP-1-2 - 7: eDP-1 - 8: eDP-1 - 9: eDP-1 - 0: eDP-1 - -workspace: - 1: www - 2: www - 3: term-local - 4: term-remote - 7: comm - 8: pass - 9: music - 10: pim - -screencfgs: - - name: three-screens - key: F3 - -environment: - MACHINE_TYPE: "laptop" - MACHINE_HAS_KEEPASSX: "true" - MACHINE_RESOLUTION_X: "1920" - MACHINE_RESOLUTION_Y: "1080" diff --git a/screencfg/tb-hak/default.yml b/screencfg/tb-hak/default.yml deleted file mode 100644 index 91d3674..0000000 --- a/screencfg/tb-hak/default.yml +++ /dev/null @@ -1,14 +0,0 @@ -reset: false -outputs: - - name: eDP-1 - primary: True - opts: - mode: 1920x1080 - scale: 1x1 - pos: "0x0" # beware of hex - - name: DP-1-1 - disable: true - - name: DP-1-2 - disable: true - - name: DP-1-3 - disable: true diff --git a/screencfg/tb-hak/three-screens.yml b/screencfg/tb-hak/three-screens.yml deleted file mode 100644 index 953dbbd..0000000 --- a/screencfg/tb-hak/three-screens.yml +++ /dev/null @@ -1,18 +0,0 @@ -reset: true -outputs: - - name: eDP-1 - opts: - mode: 1920x1080 - scale: 0.7x0.7 - pos: "0x0" # beware of hex - - name: DP-1-1 - primary: True - opts: - mode: 1920x1080 - right-of: eDP-1 - reset: true - - name: DP-1-2 - opts: - mode: 1920x1080 - right-of: DP-1-1 - reset: true diff --git a/test-in-docker.sh b/test-in-docker.sh index 48d63db..cd8c88a 100755 --- a/test-in-docker.sh +++ b/test-in-docker.sh @@ -48,17 +48,6 @@ test_ares() { ' } -test_tb_hak() { - docker pull docker.io/library/ubuntu:18.04 - docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname tb-hak docker.io/library/ubuntu:18.04 sh -c ' - set -o errexit - - cd $(mktemp -d) - tar xf /tmp/dotfiles.tar.gz -C . - ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh - ' -} - test_neptune() { docker pull docker.io/library/ubuntu:20.04 docker run -ti --rm -v ${tmpdir}/dotfiles.tar.gz:/tmp/dotfiles.tar.gz:ro --hostname neptune docker.io/library/ubuntu:20.04 sh -c ' @@ -74,15 +63,11 @@ case "${1:-all}" in ares) test_ares ;; - tb_hak) - test_tb_hak - ;; neptune) test_neptune ;; all) test_ares - test_tb_hak test_neptune ;; esac