housekeeping

Author: sdstolworthy

.github/workflows/lint.yaml

@@ -13,9 +13,9 @@ jobs:
       - uses: actions/checkout@v4
 
       - name: Set up Python
-        uses: actions/setup-python@v4
+        uses: actions/setup-python@v5
         with:
-          python-version: "3.11"
+          python-version: "3.12"
 
       - name: Install dependencies
         run: |

inventory/remote.ini

@@ -13,7 +13,7 @@
   ansible.builtin.git:
     repo: "https://github.com/alacritty/alacritty-theme.git"
     dest: "{{ alacritty_config_dir }}/themes"
-    version: master
+    version: "{{ alacritty_theme_version }}"
     depth: 1
     update: true
 - name: Copy alacritty.toml

roles/alacritty/tasks/main.yaml

@@ -1,2 +1,3 @@
 ---
 alacritty_config_dir: "{{ home }}/.config/alacritty"
+alacritty_theme_version: "02ed0a1826d008885c0cd4589c9eff892773a62a"

roles/alacritty/vars/main.yaml

@@ -11,9 +11,9 @@
     dest: ~/.gnupg/gpg.conf
     mode: "0600"
 
-- name: Copy gpg-agent.conf
-  ansible.builtin.copy:
-    src: gpg-agent.conf
+- name: Template gpg-agent.conf
+  ansible.builtin.template:
+    src: gpg-agent.conf.j2
     dest: ~/.gnupg/gpg-agent.conf
     mode: "0600"
   notify: Reload gpg-agent

roles/gpg/tasks/main.yaml

@@ -1,3 +1,7 @@
 default-cache-ttl 3600
 max-cache-ttl 7200
+{% if is_mac %}
 pinentry-program /opt/homebrew/bin/pinentry-mac
+{% else %}
+pinentry-program /usr/bin/pinentry
+{% endif %}

roles/gpg/files/gpg-agent.conf roles/gpg/templates/gpg-agent.conf.j2roles/gpg/files/gpg-agent.conf renamed to roles/gpg/templates/gpg-agent.conf.j2

@@ -50,7 +50,7 @@
   failed_when: false
 
 - name: Warn about failed cargo installations
-  when: install_from_source
+  when: install_from_source and (item.rc | default(0)) != 0
   loop: "{{ install_software_cargo_result.results }}"
   ansible.builtin.debug:
     msg: "WARNING: Failed to install {{ item.item }}: {{ item.stderr | default('unknown error') }}"

roles/install_software/tasks/main.yaml

@@ -1,37 +1,18 @@
 {
-  "theme": {
-    "name": "Dev theme",
-    "url": "file:///Users/sstol/.logseq/plugins/logseq-dev-theme/custom.css",
-    "pid": "logseq-dev-theme"
-  },
+  "theme": null,
   "themes": {
     "mode": "dark",
-    "light": {
-      "name": "Atlas Theme: Light",
-      "url": "file:///Users/sstol/.logseq/plugins/logseq-atlas-theme/custom.css",
-      "mode": "light",
-      "pid": "logseq-atlas-theme"
-    },
+    "light": null,
     "dark": {
-<<<<<<< Updated upstream
       "name": "Dev theme - WITHOUT bullet threading",
-      "url": "file:///home/spencer/.logseq/plugins/logseq-dev-theme/no_bullet_threading.css",
+      "url": "file:///Users/sstol/.logseq/plugins/logseq-dev-theme/no_bullet_threading.css",
       "description": "Dev theme without bullet threading",
-=======
-      "name": "Dev theme",
-      "url": "file:///Users/sstol/.logseq/plugins/logseq-dev-theme/custom.css",
->>>>>>> Stashed changes
       "pid": "logseq-dev-theme",
-      "group-first": true,
-      "group-desc": "light & dark themes",
+      "group-first": false,
+      "group-desc": null,
       "mode": "dark",
       "selected": false
     }
   },
-  "externals": [],
-  "pinnedToolbarItems": [
-    "logseq-todo-plugin:logseq-plugin-todo",
-    "logseq-git:git",
-    "ollama-logseq:ollama-ui-open"
-  ]
+  "externals": []
 }

roles/logseq/files/preferences.json

@@ -1,6 +1,6 @@
 ---
 - name: Install sway
-  become: true
+  become: "{{ should_become }}"
   ansible.builtin.package:
     name: sway
     state: present