Skip to content

Commit 2e838bc

Browse files
committed
fix(home/oama): use gpg instead of pass secret service
1 parent ffdbe5e commit 2e838bc

File tree

6 files changed

+4
-207
lines changed

6 files changed

+4
-207
lines changed

home/gabriel/features/pass/default.nix

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,6 +1,5 @@
11
{
22
pkgs,
3-
config,
43
...
54
}: {
65
programs.password-store = {
@@ -11,11 +10,6 @@
1110
package = pkgs.pass.withExtensions (p: [p.pass-otp]);
1211
};
1312

14-
services.pass-secret-service = {
15-
enable = true;
16-
extraArgs = ["-e${config.programs.password-store.package}/bin/pass"];
17-
};
18-
1913
home.persistence = {
2014
"/persist".directories = [".password-store"];
2115
};

home/gabriel/features/productivity/oama.nix

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,10 @@ in {
44
programs.oama = {
55
enable = true;
66
settings = {
7-
encryption.tag = "KEYRING";
7+
encryption = {
8+
tag = "GPG";
9+
contents = "hi@m7.rs";
10+
};
811
services.google = {
912
client_id_cmd = "${pass} oama/google_client_id | head -1";
1013
client_secret_cmd = "${pass} oama/google_client_secret | head -1";

modules/home-manager/default.nix

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -2,7 +2,6 @@
22
fonts = import ./fonts.nix;
33
monitors = import ./monitors.nix;
44
oama = import ./oama.nix;
5-
pass-secret-service = import ./pass-secret-service.nix;
65
wallpaper = import ./wallpaper.nix;
76
xpo = import ./xpo.nix;
87
colors = import ./colors.nix;

modules/home-manager/pass-secret-service.nix

Lines changed: 0 additions & 59 deletions
This file was deleted.

overlays/default.nix

Lines changed: 0 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -46,9 +46,6 @@ in {
4646
];
4747
};
4848

49-
# https://github.com/mdellweg/pass_secret_service/pull/37
50-
pass-secret-service = addPatches prev.pass-secret-service [./pass-secret-service-native.diff];
51-
5249
qutebrowser = prev.qutebrowser.overrideAttrs (oldAttrs: {
5350
preFixup =
5451
oldAttrs.preFixup

overlays/pass-secret-service-native.diff

Lines changed: 0 additions & 137 deletions
This file was deleted.

0 commit comments

Comments
 (0)