Decommission tb-hak machine

_machines/tb-hak.yml

@@ -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"

install.sh

@@ -11,7 +11,7 @@ set -o nounset
 DOTDIR="/var/lib/dotfiles"
 _SCRIPT_DIR="$( cd "$( dirname "${BASH_SOURCE[0]}" )" >/dev/null 2>&1 && pwd )"
 
-git submodule update --init
+[[ -e './.git' ]] && git submodule update --init
 
 if [[ "$(readlink "${_SCRIPT_DIR}")" != "${DOTDIR}" ]] && [[ "${_SCRIPT_DIR}" != "${DOTDIR}" ]] ; then
     if [[ -e "${DOTDIR}" ]] ; then
@@ -47,9 +47,14 @@ sudowrap() {
     fi
 }
 
+cache_updated=0
 _install() {
     _package="$1" ; shift
     if [[ $NAME == "Ubuntu" ]] ; then
+        if ! (( cache_updated )) ; then
+            apt-get update
+            cache_updated=1
+        fi
         sudowrap apt-get install --assume-yes "${_package}"
     elif [[ $NAME == "Arch Linux" ]] ; then
         sudowrap pacman -S --noconfirm "${_package}"

packages.yml

@@ -238,7 +238,7 @@ packages:
       archlinux: ["lsof"]
     iptables:
       ubuntu: ["iptables"]
-      archlinux: ["iptables"]
+      archlinux: ["iptables-nft"]
     pwgen:
       ubuntu: ["pwgen"]
       archlinux: ["pwgen"]
@@ -326,9 +326,6 @@ packages:
     rofi:
       ubuntu: ["rofi"]
       archlinux: ["rofi"]
-    anki:
-      ubuntu: ["anki"]
-      archlinux: ["anki"]
     imv:
       ubuntu: ["imv"]
       archlinux: ["imv"]

playbook.yml

@@ -149,12 +149,9 @@
         include_vars:
           file: packages.yml
 
-      - name: enable neovim ppa
-        apt_repository:
-          repo: 'ppa:neovim-ppa/stable'
-          update_cache: true
-        become: true
-        when: distro == 'ubuntu'
+      - name: force-update iptables to iptables-nft on arch
+        shell: pacman -Q iptables-nft || yes | pacman -S iptables-nft
+        changed_when: false
 
       - set_fact:
           defined_packages: "{{ packages|json_query('keys(list)') }}"

screencfg/tb-hak/default.yml

@@ -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

screencfg/tb-hak/three-screens.yml

@@ -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

test-in-docker.sh

@@ -41,24 +41,13 @@ test_ares() {
             sed -i '"'"'s/^#\?\(CacheDir.*\)/\1\nCacheDir = \/var\/cache\/pacman\/pkg_host\//'"'"' /etc/pacman.conf
 
             pacman -Syu --noconfirm python3
+            mkdir /var/cache/pacman/pkg_host/
             cd $(mktemp -d)
             tar xf /tmp/dotfiles.tar.gz -C .
             ANSIBLE_EXTRA_ARGS="-e manage_services=false" ./install.sh
-            read -p "Done, [return] to continue "
         '
 }
 
-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 '
@@ -70,6 +59,15 @@ test_neptune() {
     '
 }
 
-test_ares
-test_tb_hak
-test_neptune
+case "${1:-all}" in
+    ares)
+        test_ares
+        ;;
+    neptune)
+        test_neptune
+        ;;
+    all)
+        test_ares
+        test_neptune
+        ;;
+esac

user.yml

@@ -20,8 +20,6 @@
       - sudo
       - dip
       - plugdev
-      - lpadmin
-      - sambashare
       - docker
       - libvirt
   when: distro == 'ubuntu'
@@ -390,7 +388,7 @@
 
     - name: clean up temp directory
       file:
-        path: "{{ tempdir.path }"
+        path: "{{ tempdir.path }}"
         state: absent
 
     - name: install portfolio performance