From dfd2ad05dc6b8cb8f80866491c246ad62607bf90 Mon Sep 17 00:00:00 2001
From: Gabriel Fontes <eu@misterio.me>
Date: Wed, 20 Jul 2022 02:17:43 -0300
Subject: [PATCH] home: remove trusted, make pass and sign global

---
 flake.nix                                          | 4 ++--
 home/misterio/cli/default.nix                      | 1 +
 home/misterio/cli/git.nix                          | 4 ++++
 home/misterio/cli/gpg.nix                          | 2 +-
 home/misterio/{trusted => cli}/pass.nix            | 0
 home/misterio/desktop/common/wayland-wm/waybar.nix | 5 ++---
 home/misterio/desktop/common/wayland-wm/wofi.nix   | 6 +++---
 home/misterio/desktop/hyprland/default.nix         | 6 ++----
 home/misterio/desktop/sway/default.nix             | 9 ++++-----
 home/misterio/{trusted => email}/default.nix       | 2 --
 home/misterio/{trusted => email}/khal.nix          | 0
 home/misterio/{trusted => email}/khard.nix         | 0
 home/misterio/{trusted => email}/mail.nix          | 2 +-
 home/misterio/{trusted => email}/neomutt.nix       | 0
 home/misterio/{trusted => email}/todoman.nix       | 0
 home/misterio/{trusted => email}/vdirsyncer.nix    | 2 +-
 home/misterio/{trusted => }/keyring.nix            | 0
 home/misterio/trusted/git-sign.nix                 | 8 --------
 18 files changed, 21 insertions(+), 30 deletions(-)
 rename home/misterio/{trusted => cli}/pass.nix (100%)
 rename home/misterio/{trusted => email}/default.nix (78%)
 rename home/misterio/{trusted => email}/khal.nix (100%)
 rename home/misterio/{trusted => email}/khard.nix (100%)
 rename home/misterio/{trusted => email}/mail.nix (96%)
 rename home/misterio/{trusted => email}/neomutt.nix (100%)
 rename home/misterio/{trusted => email}/todoman.nix (100%)
 rename home/misterio/{trusted => email}/vdirsyncer.nix (96%)
 rename home/misterio/{trusted => }/keyring.nix (100%)
 delete mode 100644 home/misterio/trusted/git-sign.nix

diff --git a/flake.nix b/flake.nix
index e79ea763..0ee621b4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -114,7 +114,7 @@
           features = [
             "desktop/hyprland"
             "desktop/sway"
-            "trusted"
+            "email"
             "rgb"
             "games"
           ];
@@ -128,7 +128,7 @@
 
           features = [
             "desktop/hyprland"
-            "trusted"
+            "email"
             "laptop"
             "games"
           ];
diff --git a/home/misterio/cli/default.nix b/home/misterio/cli/default.nix
index 8a17151c..2117a0b1 100644
--- a/home/misterio/cli/default.nix
+++ b/home/misterio/cli/default.nix
@@ -7,6 +7,7 @@
     ./gpg.nix
     ./nix-index.nix
     ./nvim
+    ./pass.nix
     ./pfetch.nix
     ./ranger.nix
     ./screen.nix
diff --git a/home/misterio/cli/git.nix b/home/misterio/cli/git.nix
index eeb08ba3..6b881b81 100644
--- a/home/misterio/cli/git.nix
+++ b/home/misterio/cli/git.nix
@@ -14,5 +14,9 @@
     };
     lfs = { enable = true; };
     ignores = [ ".direnv" "result" ];
+    signing = {
+      signByDefault = true;
+      key = "CE707A2C17FAAC97907FF8EF2E54EA7BFE630916";
+    };
   };
 }
diff --git a/home/misterio/cli/gpg.nix b/home/misterio/cli/gpg.nix
index 3820c316..dda8c20e 100644
--- a/home/misterio/cli/gpg.nix
+++ b/home/misterio/cli/gpg.nix
@@ -33,7 +33,7 @@ in
   };
 
   home.persistence = lib.mkIf persistence {
-    "/persist/home/misterio".directories = [ ".gnupg/private-keys-v1.d" ];
+    "/persist/home/misterio".directories = [ ".gnupg" ];
   };
 
   programs.gpg = {
diff --git a/home/misterio/trusted/pass.nix b/home/misterio/cli/pass.nix
similarity index 100%
rename from home/misterio/trusted/pass.nix
rename to home/misterio/cli/pass.nix
diff --git a/home/misterio/desktop/common/wayland-wm/waybar.nix b/home/misterio/desktop/common/wayland-wm/waybar.nix
index d86777bc..695d9c2b 100644
--- a/home/misterio/desktop/common/wayland-wm/waybar.nix
+++ b/home/misterio/desktop/common/wayland-wm/waybar.nix
@@ -189,12 +189,11 @@ in
             "unread" = "";
           };
         };
-        "custom/gpg-agent" = lib.mkIf config.programs.password-store.enable {
+        "custom/gpg-agent" = {
           interval = 2;
           return-type = "json";
           exec =
-            let
-              keyring = import ../../../trusted/keyring.nix { inherit pkgs; };
+            let keyring = import ../../../keyring.nix { inherit pkgs; };
             in
             jsonOutput {
               pre = ''status=$(${keyring.isUnlocked} && echo "unlocked" || echo "locked")'';
diff --git a/home/misterio/desktop/common/wayland-wm/wofi.nix b/home/misterio/desktop/common/wayland-wm/wofi.nix
index 3f844f24..73bc7e19 100644
--- a/home/misterio/desktop/common/wayland-wm/wofi.nix
+++ b/home/misterio/desktop/common/wayland-wm/wofi.nix
@@ -3,19 +3,19 @@ let
   pass-wofi = pkgs.pass-wofi.override {
     pass = config.programs.password-store.package;
   };
-  hasPass = config.programs.password-store.enable;
 in
 {
   home = {
     packages = with pkgs; [
       wofi
-    ] ++ (lib.optional hasPass pass-wofi);
+      pass-wofi
+    ];
 
     preferredApps.menu = {
       run-cmd = "wofi -S run";
       drun-cmd = "wofi -S drun -x 10 -y 10 -W 25% -H 60%";
       dmenu-cmd = "wofi -S dmenu";
-      password-cmd = lib.mkIf hasPass "pass-wofi";
+      password-cmd = "pass-wofi";
     };
   };
 
diff --git a/home/misterio/desktop/hyprland/default.nix b/home/misterio/desktop/hyprland/default.nix
index e135027d..000c6622 100644
--- a/home/misterio/desktop/hyprland/default.nix
+++ b/home/misterio/desktop/hyprland/default.nix
@@ -95,10 +95,8 @@
 
           bind=SUPER,x,exec,${menu.drun-cmd}
           bind=SUPER,d,exec,${menu.run-cmd}
-          ${lib.optionalString config.programs.password-store.enable ''
-            bind=,Scroll_Lock,exec,${menu.password-cmd} # fn+k
-            bind=,XF86Calculator,exec,${menu.password-cmd} # fn+f12
-          ''}
+          bind=,Scroll_Lock,exec,${menu.password-cmd} # fn+k
+          bind=,XF86Calculator,exec,${menu.password-cmd} # fn+f12
 
           # Toggle waybar
           bind=,XF86Tools,exec,${pkgs.procps}/bin/pkill -USR1 waybar # profile button
diff --git a/home/misterio/desktop/sway/default.nix b/home/misterio/desktop/sway/default.nix
index fb0baaf8..92c9d2c8 100644
--- a/home/misterio/desktop/sway/default.nix
+++ b/home/misterio/desktop/sway/default.nix
@@ -205,14 +205,13 @@
             # Application menu
             "${modifier}+x" = "exec ${menu.drun-cmd}";
 
-            # Full screen across monitors
-            "${modifier}+shift+f" = "fullscreen toggle global";
-          } // (lib.optionalAttrs config.programs.password-store.enable
-          {
             # Pass menu
             "Scroll_Lock" = "exec ${menu.password-cmd}"; # fn+k
             "XF86Calculator" = "exec ${menu.password-cmd}"; # fn+f12
-          });
+
+            # Full screen across monitors
+            "${modifier}+shift+f" = "fullscreen toggle global";
+          };
       };
     };
 }
diff --git a/home/misterio/trusted/default.nix b/home/misterio/email/default.nix
similarity index 78%
rename from home/misterio/trusted/default.nix
rename to home/misterio/email/default.nix
index 79d36d58..503548a0 100644
--- a/home/misterio/trusted/default.nix
+++ b/home/misterio/email/default.nix
@@ -1,11 +1,9 @@
 {
   imports = [
-    ./git-sign.nix
     ./khal.nix
     ./khard.nix
     ./mail.nix
     ./neomutt.nix
-    ./pass.nix
     ./todoman.nix
     ./vdirsyncer.nix
   ];
diff --git a/home/misterio/trusted/khal.nix b/home/misterio/email/khal.nix
similarity index 100%
rename from home/misterio/trusted/khal.nix
rename to home/misterio/email/khal.nix
diff --git a/home/misterio/trusted/khard.nix b/home/misterio/email/khard.nix
similarity index 100%
rename from home/misterio/trusted/khard.nix
rename to home/misterio/email/khard.nix
diff --git a/home/misterio/trusted/mail.nix b/home/misterio/email/mail.nix
similarity index 96%
rename from home/misterio/trusted/mail.nix
rename to home/misterio/email/mail.nix
index 63a21a45..a656ba0c 100644
--- a/home/misterio/trusted/mail.nix
+++ b/home/misterio/email/mail.nix
@@ -65,7 +65,7 @@ in {
   programs.msmtp.enable = true;
   systemd.user.services.mbsync = {
     Unit = { Description = "mbsync synchronization"; };
-    Service = let keyring = import ./keyring.nix { inherit pkgs; };
+    Service = let keyring = import ../keyring.nix { inherit pkgs; };
     in {
       Type = "oneshot";
       ExecCondition = ''
diff --git a/home/misterio/trusted/neomutt.nix b/home/misterio/email/neomutt.nix
similarity index 100%
rename from home/misterio/trusted/neomutt.nix
rename to home/misterio/email/neomutt.nix
diff --git a/home/misterio/trusted/todoman.nix b/home/misterio/email/todoman.nix
similarity index 100%
rename from home/misterio/trusted/todoman.nix
rename to home/misterio/email/todoman.nix
diff --git a/home/misterio/trusted/vdirsyncer.nix b/home/misterio/email/vdirsyncer.nix
similarity index 96%
rename from home/misterio/trusted/vdirsyncer.nix
rename to home/misterio/email/vdirsyncer.nix
index 68a1282e..a581038b 100644
--- a/home/misterio/trusted/vdirsyncer.nix
+++ b/home/misterio/email/vdirsyncer.nix
@@ -48,7 +48,7 @@
 
   systemd.user.services.vdirsyncer = {
     Unit = { Description = "vdirsyncer synchronization"; };
-    Service = let keyring = import ./keyring.nix { inherit pkgs; };
+    Service = let keyring = import ../keyring.nix { inherit pkgs; };
     in {
       Type = "oneshot";
       ExecCondition = ''
diff --git a/home/misterio/trusted/keyring.nix b/home/misterio/keyring.nix
similarity index 100%
rename from home/misterio/trusted/keyring.nix
rename to home/misterio/keyring.nix
diff --git a/home/misterio/trusted/git-sign.nix b/home/misterio/trusted/git-sign.nix
deleted file mode 100644
index 1fe86436..00000000
--- a/home/misterio/trusted/git-sign.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{
-  programs.git = {
-    signing = {
-      signByDefault = true;
-      key = "CE707A2C17FAAC97907FF8EF2E54EA7BFE630916";
-    };
-  };
-}