From 9f775f5e6d40db1385971946c8a0215e8f4f4a2d Mon Sep 17 00:00:00 2001
From: Brian Zalewski <brian@megabyte.space>
Date: Mon, 30 Jan 2023 08:06:59 +0000
Subject: [PATCH] Update 6 files

- /home/.chezmoiscripts/universal/run_onchange_after_07-docker-plugins.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_14-timeshift.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_14-keybase.tmpl
- /home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.tmpl
- /software.yml
- /docs/TODO.md
---
 docs/TODO.md                                        |  4 ++++
 .../run_onchange_after_07-docker-plugins.tmpl       |  2 --
 .../universal/run_onchange_after_14-keybase.tmpl    |  4 +++-
 .../universal/run_onchange_after_14-timeshift.tmpl  | 13 ++++++-------
 .../universal/run_onchange_after_24-vpn-linux.tmpl  |  2 +-
 software.yml                                        |  1 -
 6 files changed, 14 insertions(+), 12 deletions(-)

diff --git a/docs/TODO.md b/docs/TODO.md
index ec5db33c..c488043a 100644
--- a/docs/TODO.md
+++ b/docs/TODO.md
@@ -9,6 +9,10 @@ https://github.com/cloudflare/boringtun
     GCE_CREDENTIALS_FILE: "{{ joinPath .chezmoi.homeDir ".config" "gcp.json" }}"
     GCE_SERVICE_ACCOUNT_EMAIL: "molecule@megabyte-labs.iam.gserviceaccount.com"
 
+✖  ERROR  Gsettings Failed to apply gsetting
+Error: Command failed: gsettings set org.gnome.desktop.interface color-scheme prefer-dark
+No such key “color-scheme”
+
 GITLAB_READ_TOKEN
 GITHUB_READ_TOKEN
 GITHUB_GIST_TOKEN
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_07-docker-plugins.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_07-docker-plugins.tmpl
index 31662a10..19df8920 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_07-docker-plugins.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_07-docker-plugins.tmpl
@@ -1,8 +1,6 @@
 {{- if (eq .host.distro.family "linux") -}}
 #!/usr/bin/env bash
 
-# Docker plugins.json hash: {{ include (joinPath .chezmoi.homeDir ".config" "docker" "plugins.json") | sha256sum }}
-
 {{ includeTemplate "universal/profile" }}
 {{ includeTemplate "universal/logg" }}
 
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_14-keybase.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_14-keybase.tmpl
index f3b46dea..59c7f0b3 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_14-keybase.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_14-keybase.tmpl
@@ -1,7 +1,7 @@
 {{- if eq .host.distro.family "linux" -}}
 #!/usr/bin/env bash
 
-# timeshift.json hash: {{ include (joinPath .chezmoi.homeDir ".config" "keybase" "config.json") | sha256sum }}
+# Keybase config hash: {{ include (joinPath .chezmoi.homeDir ".config" "keybase" "config.json") | sha256sum }}
 
 {{ includeTemplate "universal/profile" }}
 {{ includeTemplate "universal/logg" }}
@@ -16,3 +16,5 @@ if command -v keybase > /dev/null; then
 else
     logg info 'The `keybase` executable is not available'
 fi
+
+{{ end -}}
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_14-timeshift.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_14-timeshift.tmpl
index 9513fc03..573be55f 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_14-timeshift.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_14-timeshift.tmpl
@@ -7,13 +7,12 @@
 {{ includeTemplate "universal/logg" }}
 
 if command -v timeshift > /dev/null; then
-    if [ -d /etc/timeshift ]; then
-        TIMESHIFT_CONFIG="${XDG_CONFIG_HOME}:-$HOME/.config}/timeshift/timeshift.json"
-        logg info "Copying $TIMESHIFT_CONFIG to /etc/timeshift/timeshift.json"
-        sudo cp -f "$TIMESHIFT_CONFIG" /etc/timeshift/timeshift.json
-    else
-        logg info '`/etc/timeshift` is not a directory'
-    fi
+    logg info 'Ensuring /etc/timeshift is a directory'
+    sudo mkdir -p /etc/timeshift
+    
+    TIMESHIFT_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/timeshift/timeshift.json"
+    logg info "Copying $TIMESHIFT_CONFIG to /etc/timeshift/timeshift.json"
+    sudo cp -f "$TIMESHIFT_CONFIG" /etc/timeshift/timeshift.json
 else
     logg info 'The `timeshift` executable is not available'
 fi
diff --git a/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.tmpl b/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.tmpl
index b8333788..5983813e 100644
--- a/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.tmpl
+++ b/home/.chezmoiscripts/universal/run_onchange_after_24-vpn-linux.tmpl
@@ -41,7 +41,7 @@ if command -v nmcli > /dev/null; then
             ### Add the profile
             logg info "Adding $OVPN_FILE to NetworkManager OpenVPN profiles"
             OVPN_NAME="$(basename "$OVPN_FILE" | sed 's/.ovpn$//')"
-            nmcli connection import type openvpn file '{{ vpn_connection.file }}'
+            nmcli connection import type openvpn file "$OVPN_FILE"
             nmcli connection modify "$OVPN_NAME" +vpn.data 'username={{- $ovpnUsername }}'
             nmcli connection modify "$OVPN_NAME" vpn.secrets 'password={{- $ovpnPassword }}'
             nmcli connection modify "$OVPN_NAME" +vpn.data password-flags=0
diff --git a/software.yml b/software.yml
index 5c97be71..c6de9627 100644
--- a/software.yml
+++ b/software.yml
@@ -5129,7 +5129,6 @@ softwarePackages:
     pacman: netdata
     port: netdata
     script: curl https://my-netdata.io/kickstart.sh > /tmp/netdata-kickstart.sh && sh /tmp/netdata-kickstart.sh
-    _service: true
     _type: webapp
   newman:
     _bin: newman