From fd079fbed22b31aceec22525e92970e8379b7a99 Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman+06301990@puppet.com>
Date: Fri, 8 Jul 2022 21:29:58 -0400
Subject: [PATCH 1/2] add Pulumi to the PATH

---
 link/nix/zshrc | 6 ++++++
 1 file changed, 6 insertions(+)

diff --git a/link/nix/zshrc b/link/nix/zshrc
index 2b8bbea..14be05d 100644
--- a/link/nix/zshrc
+++ b/link/nix/zshrc
@@ -246,6 +246,11 @@ if [[ `uname` == 'Darwin' ]]; then
 elif [[ `uname` == 'Linux' ]]; then
   PATH="$HOME/.local/bin:$PATH"
 
+  # add Pulumi to the PATH
+  if [ -d "$HOME/.pulumi/bin" ] ; then
+    PATH=$PATH:$HOME/.pulumi/bin
+  fi
+ 
   if [ -d "$HOME/.local/share/gem/ruby/3.0.0/bin" ] ; then
     PATH="$HOME/.local/share/gem/ruby/3.0.0/bin:$PATH"
   fi
@@ -263,3 +268,4 @@ fi
 # default kube-ps1 to off
 kubeoff
 
+

From 0ba4423ab74643959c7e307b9e48ba457f3d509a Mon Sep 17 00:00:00 2001
From: Gene Liverman <gene.liverman+06301990@puppet.com>
Date: Fri, 8 Jul 2022 21:32:16 -0400
Subject: [PATCH 2/2] Change some packages around, disable britty

This commit uses the sudoers module from community.general, switches to
the deb version of Slack provided by Pop OS, and disables britty so that
it doesn't keep me from flashing ESP devices
---
 ansible/carbonbean.yaml | 27 +++++++++++++++++++++++----
 1 file changed, 23 insertions(+), 4 deletions(-)

diff --git a/ansible/carbonbean.yaml b/ansible/carbonbean.yaml
index 6e4f168..1eff3c2 100644
--- a/ansible/carbonbean.yaml
+++ b/ansible/carbonbean.yaml
@@ -119,7 +119,7 @@
           - boinctui
           - bundler
           - cmake
-          - code
+          - code # provided by Pop OS repos
           - dconf-editor
           - dos2unix
           - exa
@@ -129,6 +129,7 @@
           - gnupg
           - google-cloud-cli
           - google-cloud-cli-gke-gcloud-auth-plugin
+          - gthumb
           - htop
           - httpie
           - hub
@@ -149,6 +150,7 @@
           - scdaemon
           - scaleft-client-tools
           - scaleft-url-handler
+          - slack-desktop # provided by Pop OS repos
           - snapd
           - tailscale
           - terraform
@@ -226,7 +228,6 @@
       community.general.snap:
         name:
           - cctv-viewer # only available here
-          - slack # official version
 
     - name: Snaps requiring classic mode
       become: true
@@ -309,10 +310,28 @@
 
     - name: Add passwordless sudo entries
       become: true
-      jonellis.sudoers.sudoers:
+      community.general.sudoers:
         name: "{{ lookup('env', 'USER') }}-no-password"
         user: "{{ lookup('env', 'USER') }}"
         nopassword: true
-        command:
+        commands:
           - /usr/bin/systemctl restart pcscd
           - /usr/bin/pkill -9 gpg-agent
+
+    - name: Disable britty so ESPHome flashing works
+      become: true
+      ansible.builtin.shell:
+        cmd: |
+          for f in /usr/lib/udev/rules.d/*brltty*.rules; do
+            if [ ! -L "/etc/udev/rules.d/$(basename "$f")" ]; then
+              ln -s /dev/null "/etc/udev/rules.d/$(basename "$f")"
+              udevadm control --reload-rules
+            fi
+          done
+
+    - name: Disable brltty service
+      become: true
+      ansible.builtin.service:
+        name: brltty.service
+        enabled: false
+        state: stopped