about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--home/pass/default.nix24
-rw-r--r--home/pass/git-pass-mapping.ini9
2 files changed, 5 insertions, 28 deletions
diff --git a/home/pass/default.nix b/home/pass/default.nix
index 043ff6c..eb43c3a 100644
--- a/home/pass/default.nix
+++ b/home/pass/default.nix
@@ -3,18 +3,13 @@ let cfg = config.my.home.pass;
 in
 {
   options.my.home.pass = with lib; {
-    enable = mkEnableOption "pass configuration";
+    enable = mkEnableOption "passage configuration";
   };
   config = lib.mkIf cfg.enable {
-    programs.password-store = {
-      enable = true;
-      settings = {
-        PASSWORD_STORE_DIR = "${config.xdg.dataHome}/password-store";
-        PASSWORD_STORE_GENERATED_LENGTH = "30";
-        PASSWORD_STORE_CHARACTER_SET = "a-zA-Z0-9~!@#$%^&*()-_=+[]{};:,.<>?";
-        PASSWORD_STORE_KEY = config.programs.gpg.settings.default-key;
-      };
-    };
+    home.packages = with pkgs; [
+      passage
+      tree
+    ];
 
     home.sessionVariables = {
       PASSAGE_DIR = "${config.xdg.dataHome}/passage/store";
@@ -25,14 +20,5 @@ in
       PASSAGE_AGE = "${pkgs.rage}/bin/rage";
     };
 
-    home.packages = with pkgs; [
-      passage
-      tree
-    ];
-
-    services.password-store-sync.enable = false;
-
-    # Ensure the password store things are in the systemd session
-    systemd.user.sessionVariables = config.programs.password-store.settings;
   };
 }
diff --git a/home/pass/git-pass-mapping.ini b/home/pass/git-pass-mapping.ini
deleted file mode 100644
index 497801a..0000000
--- a/home/pass/git-pass-mapping.ini
+++ /dev/null
@@ -1,9 +0,0 @@
-[DEFAULT]
-line_username=1
-skip_username=10
-
-[github.com/*]
-target=git/github.com
-
-[git.fcuny.net/*]
-target=git/git.fcuny.net