playbooks/desktop.yml

@@ -31,8 +31,6 @@
       tags: [ desktop, zerotier ]
 - hosts: lap-s76-lemp9-0.desu.ltd
   roles:
-    - role: docker
-      tags: [ desktop, docker, skip-pull ]
     - role: desktop
       vars:
         desktop_apt_keys_url_extra:
@@ -69,10 +67,6 @@
       tags: [ desktop, grub ]
 - hosts: dsk-ryzen-0.desu.ltd
   roles:
-    - role: docker
-      vars:
-        docker_apt_repository: "deb https://download.docker.com/linux/ubuntu focal stable"
-      tags: [ desktop, docker, skip-pull ]
     - role: desktop
       tags: [ desktop ]
 #    - role: grub

roles/desktop/defaults/main.yml

@@ -22,6 +22,7 @@ desktop_apt_keys_url:
   - "https://packages.riot.im/debian/riot-im-archive-keyring.gpg" # Element
   - "https://download.spotify.com/debian/pubkey_0D811D58.gpg" # Spotify 2
   - "https://packages.cloud.google.com/apt/doc/apt-key.gpg" # kubectl https://kubernetes.io/docs/tasks/tools/install-kubectl/
+  - "https://download.docker.com/linux/ubuntu/gpg" # Docker
   - "https://baltocdn.com/helm/signing.asc" # Helm
 desktop_apt_keys_url_extra: []
 
@@ -30,6 +31,7 @@ desktop_apt_repos:
   - "deb https://apt.syncthing.net/ syncthing stable" # Syncthing
   - "deb https://packages.riot.im/debian/ default main" # Element
   - "deb https://apt.kubernetes.io/ kubernetes-xenial main" # Kubernetes
+  - "deb https://download.docker.com/linux/ubuntu focal stable" # Docker
   - "deb https://baltocdn.com/helm/stable/debian/ all main" # Helm
     # First-party PPAs
   - "ppa:phoerious/keepassxc" # KeepassXC
@@ -48,6 +50,8 @@ desktop_apt_packages:
   - apt                                 # Useful for Android debugging, and also for pinephone shenanigans
   - build-essential                     # Used in numerous build ventures, just all-around important
   - cmake                               # Also useful for building from source
+  - docker-ce                           # soy
+  - docker-compose
   - fastboot                            # Also used for phone debugging
   - ffmpeg                              # Fantastic tool, used on the daily
   - git                                 # Just ensuring it's installed, probably already in build-essential
@@ -126,6 +130,7 @@ desktop_apt_packages:
   - spotify-client                      # Moosucc
   - steam-installer                     # Steam is an important part of one's life
   - syncthing-gtk                       # Also pulls in syncthing and is very neato burrito
+  - telegram-desktop                    # Gotta talk to that one guy
   - torbrowser-launcher                 # Useful utility
   - virt-manager                        # Important to manage VMs
   - vulkan-tools                        # Pulls in Vulkan support for things like DXVK