Move password-store configuration

hosts/PW05CH3L/configuration.nix

@@ -1,4 +1,4 @@
-{ inputs, pkgs, ... }:
+{ inputs, ... }:
 
 {
   imports = [
@@ -11,15 +11,6 @@
     ../../users/opdavies.nix
   ];
 
-  features = {
-    cli = {
-      password-store.enable = true;
-      password-store.extensions = with pkgs.passExtensions; [
-        pass-otp
-      ];
-    };
-  };
-
   wsl = {
     enable = true;
     defaultUser = "opdavies";

hosts/t480/configuration.nix

@@ -25,13 +25,6 @@
       kanata.devices = [
         "/dev/input/by-path/platform-i8042-serio-0-event-kbd"
       ];
-
-      password-store.enable = true;
-      password-store.extensions = with pkgs.passExtensions; [
-        pass-audit
-        pass-otp
-        pass-update
-      ];
     };
 
     core = {

modules/nixos/default.nix

@@ -11,7 +11,6 @@
     ./nix-index.nix
     ./nixpad
     ./openssh.nix
-    ./password-store.nix
     ./pipewire.nix
     ./podman.nix
     ./st.nix

modules/nixos/password-store.nix

@@ -1,29 +0,0 @@
-{
-  config,
-  lib,
-  pkgs,
-  ...
-}:
-
-with lib;
-
-let
-  cfg = config.features.cli.password-store;
-in
-{
-  options.features.cli.password-store = {
-    enable = mkEnableOption "Enable pass";
-
-    extensions = mkOption {
-      default = [ ];
-      type = types.listOf types.package;
-      description = "pass extensions to install.";
-    };
-  };
-
-  config = mkIf cfg.enable {
-    environment.systemPackages = with pkgs; [
-      (pass.withExtensions (e: with e; cfg.extensions))
-    ];
-  };
-}

modules2/hosts/t480/password-store.nix

@@ -0,0 +1,11 @@
+{
+  flake.modules.homeManager.base =
+    { pkgs, ... }:
+    {
+      programs.password-store.extensions = with pkgs.passExtensions; [
+        pass-audit
+        pass-otp
+        pass-update
+      ];
+    };
+}

modules2/password-store/enable.nix

@@ -0,0 +1,3 @@
+{
+  flake.modules.homeManager.base.programs.password-store.enable = true;
+}

modules2/password-store/package.nix

@@ -0,0 +1,17 @@
+{ lib, ... }:
+
+{
+  flake.modules.homeManager.base =
+    { config, pkgs, ... }:
+    {
+      options.programs.password-store.extensions = lib.mkOption {
+        default = [ ];
+        type = lib.types.listOf lib.types.package;
+        description = "pass extensions to install.";
+      };
+
+      config.programs.password-store.package = pkgs.pass.withExtensions (
+        e: with e; config.programs.password-store.extensions
+      );
+    };
+}

modules2/password-store/settings.nix

@@ -0,0 +1,7 @@
+{
+  flake.modules.homeManager.base =
+    { config, ... }:
+    {
+      programs.password-store.settings.PASSWORD_STORE_DIR = "${config.xdg.dataHome}/pass";
+    };
+}