2 files changed, 36 insertions, 39 deletions

diff --git a/accounts/gkleen@skadhi/default.nix b/accounts/gkleen@skadhi/default.nix
index 6d8195aa..67d249c5 100644
--- a/accounts/gkleen@skadhi/default.nix
+++ b/accounts/gkleen@skadhi/default.nix
@@ -3,7 +3,7 @@ let
   user = config.users.users.${userName};
 in {
   imports = [
-    ./greetd.nix ./rzm ./email
+    ./greetd.nix ./rzm ./email ./keepassxc.nix
   ] ++ (with flake.nixosModules.userProfiles.${userName}; [
     zsh mpv yt-dlp
   ]) ++ (with flake.nixosModules.systemProfiles; [
@@ -62,7 +62,7 @@ in {
     home-manager.users.${userName} = { sysConfig, config, ... }: {
       imports = [
         flakeInputs.nix-index-database.homeModules.nix-index
-        ./niri.nix ./shell ./emacs ./zsh ./ssh ./keepassxc.nix ./firefox
+        ./niri.nix ./shell ./emacs ./zsh ./ssh ./firefox
       ];
 
       home.stateVersion = "26.05";
diff --git a/accounts/gkleen@skadhi/keepassxc.nix b/accounts/gkleen@skadhi/keepassxc.nix
index 7b7d60ef..c399450d 100644
--- a/accounts/gkleen@skadhi/keepassxc.nix
+++ b/accounts/gkleen@skadhi/keepassxc.nix
@@ -1,53 +1,50 @@
 { pkgs, lib, ... }:
-let
-  wrappedKeepassxc = pkgs.symlinkJoin {
-    inherit (pkgs.keepassxc) name;
-    paths = with pkgs; [
-      keepassxc
-      (pkgs.writeTextFile {
-        name = "org.keepassxc.KeePassXC";
-        destination = "/share/dbus-1/services/org.keepassxc.KeePassXC.MainWindow.service";
-        text = ''
+{
+  config = {
+    environment.systemPackages = [ pkgs.keepassxc ];
+
+    home-manager.users.gkleen = { ... }: {
+      xdg.dataFile = {
+        "dbus-1/services/org.keepassxc.KeePassXC.MainWindow.service".text = ''
           [D-BUS Service]
           Name=org.keepassxc.KeePassXC.MainWindow
           Exec=${lib.getExe' pkgs.coreutils "false"}
           SystemdService=keepassxc.service
         '';
-      })
-      (pkgs.writeTextFile {
-        name = "org.freedesktop.secrets";
-        destination = "/share/dbus-1/services/org.freedesktop.secrets.service";
-        text = ''
+        "dbus-1/services/org.freedesktop.secrets.service".text = ''
           [D-BUS Service]
           Name=org.freedesktop.secrets
           Exec=${lib.getExe' pkgs.coreutils "false"}
           SystemdService=keepassxc.service
         '';
-      })
-    ];
-  };
-in {
-  config = {
-    home.packages = [
-      wrappedKeepassxc
-    ];
+        "dbus-1/services/org.kde.kwalletd6.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd6.service";
+        "dbus-1/services/org.kde.kwalletd5.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd5.service";
+      };
 
-    xdg.dataFile = {
-      "dbus-1/services/org.keepassxc.KeePassXC.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.keepassxc.KeePassXC.service";
-      "dbus-1/services/org.freedesktop.secrets.service".source = "${wrappedKeepassxc}/share/dbus-1/services/org.freedesktop.secrets.service";
-      "dbus-1/services/org.kde.kwalletd6.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd6.service";
-      "dbus-1/services/org.kde.kwalletd5.service".source = "${pkgs.kdePackages.kwallet}/share/dbus-1/services/org.kde.kwalletd5.service";
-    };
+      home.persistence."/persistent" = {
+        directories = [
+          ".config/keepassxc"
+        ];
+        files = [
+          "store.kdbx"
+        ];
+      };
 
-    home.persistence."/persistent" = {
-      directories = [
-        ".config/keepassxc"
-      ];
-      files = [
-        "store.kdbx"
-      ];
-    };
+      services.gnome-keyring.enable = lib.mkForce false;
 
-    services.gnome-keyring.enable = lib.mkForce false;
+      systemd.user.services.keepassxc = {
+        Service = {
+          Type = "dbus";
+          BusName = "org.keepassxc.KeePassXC.MainWindow";
+          WorkingDirectory = "~";
+          ExecStart = lib.getExe pkgs.keepassxc;
+          Environment = [ "QT_QPA_PLATFORM=wayland" ];
+        };
+        Unit = {
+          After = [ "graphical-session.target" ];
+          BindsTo = [ "graphical-session.target" ];
+        };
+      };
+    };
   };
 }