Migrate to keepassxc

_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"

_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
 

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

autostart/services/keepassx.service

@@ -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

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

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

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