From f2c651da7cfa8a1063a101c5e84c688d11d290c6 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Hannes=20K=C3=B6rber?= <hannes@hkoerber.de>
Date: Wed, 14 Aug 2024 17:40:25 +0200
Subject: [PATCH] Migrate to keepassxc

---
 _machines/ares.yml                   | 2 +-
 _machines/neptune.yml                | 4 ++--
 autostart/autostart.target.j2        | 2 +-
 autostart/services/keepassx.service  | 9 ---------
 autostart/services/keepassxc.service | 9 +++++++++
 i3/config.j2                         | 2 +-
 zsh/zprofile.j2                      | 2 +-
 7 files changed, 15 insertions(+), 15 deletions(-)
 delete mode 100644 autostart/services/keepassx.service
 create mode 100644 autostart/services/keepassxc.service

diff --git a/_machines/ares.yml b/_machines/ares.yml
index 179a1a2..5629df0 100644
--- a/_machines/ares.yml
+++ b/_machines/ares.yml
@@ -59,7 +59,7 @@ workspace:
 
 environment:
   MACHINE_TYPE: "workstation"
-  MACHINE_HAS_KEEPASSX: "false"
+  MACHINE_HAS_KEEPASSXC: "false"
   MACHINE_HAS_NEXTCLOUD: "true"
   MACHINE_HAS_STEAM: "true"
   MACHINE_RESOLUTION_X: "2560"
diff --git a/_machines/neptune.yml b/_machines/neptune.yml
index 8238fbd..9428031 100644
--- a/_machines/neptune.yml
+++ b/_machines/neptune.yml
@@ -25,7 +25,7 @@ users:
   gpg_agent_for_ssh: false
   environment:
     MACHINE_HAS_NEXTCLOUD: "false"
-    MACHINE_HAS_KEEPASSX: "false"
+    MACHINE_HAS_KEEPASSXC: "true"
   repositories: []
 
 - name: hannes-private
@@ -52,7 +52,7 @@ users:
   enable_passwordstore: true
   environment:
     MACHINE_HAS_NEXTCLOUD: "true"
-    MACHINE_HAS_KEEPASSX: "false"
+    MACHINE_HAS_KEEPASSXC: "false"
   repositories:
     - personal_projects
 
diff --git a/autostart/autostart.target.j2 b/autostart/autostart.target.j2
index 6b3affd..9a1aeae 100644
--- a/autostart/autostart.target.j2
+++ b/autostart/autostart.target.j2
@@ -16,7 +16,7 @@ Wants=firefox-gtk-override-bigger-font@{{ profile }}.service
 {% endfor %}
 Wants=gpg-agent.service
 Wants=gnome-keyring.service
-Wants=keepassx.service
+Wants=keepassxc.service
 Wants=keyboard.service
 Wants=laptop-lid.service
 Wants=nextcloud.service
diff --git a/autostart/services/keepassx.service b/autostart/services/keepassx.service
deleted file mode 100644
index b55e80d..0000000
--- a/autostart/services/keepassx.service
+++ /dev/null
@@ -1,9 +0,0 @@
-[Unit]
-BindsTo=autostart.target
-After=windowmanager.target
-ConditionPathExists=%t/features/keepassx
-
-[Service]
-ExecStart=/usr/bin/env keepassx --keyfile %h/.secret/main.key %h/.secret/main.kdbx
-PassEnvironment=DISPLAY
-Restart=always
diff --git a/autostart/services/keepassxc.service b/autostart/services/keepassxc.service
new file mode 100644
index 0000000..2a85a08
--- /dev/null
+++ b/autostart/services/keepassxc.service
@@ -0,0 +1,9 @@
+[Unit]
+BindsTo=autostart.target
+After=windowmanager.target
+ConditionPathExists=%t/features/keepassxc
+
+[Service]
+ExecStart=/usr/bin/env keepassxc --keyfile %h/.secrets/main.keyx %h/.secrets/main.kdbx
+PassEnvironment=DISPLAY
+Restart=always
diff --git a/i3/config.j2 b/i3/config.j2
index 3edf9fe..da9ed1d 100644
--- a/i3/config.j2
+++ b/i3/config.j2
@@ -112,7 +112,7 @@ workspace $workspace9 output {{ machine.screen.9 }}
 workspace $workspace10 output {{ machine.screen.0 }}
 
 
-assign [class="^Keepassx$"] $workspace8
+assign [class="^KeePassXC$"] $workspace8
 
 # See https://github.com/i3/i3/issues/2060
 for_window [class="^Spotify$"] move to workspace $workspace9
diff --git a/zsh/zprofile.j2 b/zsh/zprofile.j2
index 21f4e1b..cf0ed05 100644
--- a/zsh/zprofile.j2
+++ b/zsh/zprofile.j2
@@ -76,7 +76,7 @@ rm -rf "${feature_dir}"/
 mkdir -p "${feature_dir}"
 
 [[ $MACHINE_HAS_NEXTCLOUD     == "true" ]] && touch "${feature_dir}"/nextcloud
-[[ $MACHINE_HAS_KEEPASSX      == "true" ]] && touch "${feature_dir}"/keepassx
+[[ $MACHINE_HAS_KEEPASSXC     == "true" ]] && touch "${feature_dir}"/keepassxc
 [[ $MACHINE_HAS_STEAM         == "true" ]] && touch "${feature_dir}"/steam
 
 [[ $MACHINE_TYPE == "laptop" ]] && touch "${feature_dir}"/machine_is_laptop