From 848be91b17dfbfb4fc1e6866b993e635b66668e1 Mon Sep 17 00:00:00 2001
From: Sridhar Ratnakumar <srid@srid.ca>
Date: Tue, 6 Apr 2021 22:03:48 -0400
Subject: [PATCH] Create modules/

---
 bin/format                    |  3 +++
 flake.nix                     |  9 +++------
 modules/passwordstore.nix     | 13 +++++++++++++
 modules/protonmail-bridge.nix |  4 ++++
 4 files changed, 23 insertions(+), 6 deletions(-)
 create mode 100755 bin/format
 create mode 100644 modules/passwordstore.nix
 create mode 100644 modules/protonmail-bridge.nix

diff --git a/bin/format b/bin/format
new file mode 100755
index 0000000..57fbf22
--- /dev/null
+++ b/bin/format
@@ -0,0 +1,3 @@
+#!/usr/bin/env bash
+set -xe
+nix shell nixpkgs#nixpkgs-fmt --command nixpkgs-fmt *.nix */*.nix
\ No newline at end of file
diff --git a/flake.nix b/flake.nix
index 0c66e8d..b3212de 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,12 +12,9 @@
       modules = [
         # System configuration
         ./configuration.nix
-        # ProtonMail Bridge
-        ({ pkgs, ...}: {
-            environment.systemPackages = [ pkgs.protonmail-bridge ];
-            services.gnome3.gnome-keyring.enable = true; 
-          }
-        )
+        ./modules/passwordstore.nix
+        ./modules/protonmail-bridge.nix
+
         # home-manager configuration
         home-manager.nixosModules.home-manager
         {
diff --git a/modules/passwordstore.nix b/modules/passwordstore.nix
new file mode 100644
index 0000000..f9b2ff8
--- /dev/null
+++ b/modules/passwordstore.nix
@@ -0,0 +1,13 @@
+{ pkgs, ... }: {
+  programs.gnupg = {
+    # Enabling the agent requires a system restart.
+    agent = {
+      enable = true;
+      enableExtraSocket = true;
+      # pinentryFlavor = "curses";
+    };
+  };
+  environment.systemPackages = with pkgs; [
+    pass
+  ];
+}
diff --git a/modules/protonmail-bridge.nix b/modules/protonmail-bridge.nix
new file mode 100644
index 0000000..7a51038
--- /dev/null
+++ b/modules/protonmail-bridge.nix
@@ -0,0 +1,4 @@
+{ pkgs, ... }: {
+  environment.systemPackages = [ pkgs.protonmail-bridge ];
+  services.gnome3.gnome-keyring.enable = true;
+}