From 32ceb1262c4cf117f50d1e5c562c808e3f65274e Mon Sep 17 00:00:00 2001
From: notohh <github@notohh.dev>
Date: Sun, 21 May 2023 16:49:26 -0400
Subject: [PATCH] home: init gpg agent, move bat

---
 home/README.md       |  1 +
 home/bat/default.nix | 22 ++++++++++++++++++++++
 home/default.nix     | 27 +++++++++------------------
 3 files changed, 32 insertions(+), 18 deletions(-)
 create mode 100644 home/bat/default.nix

diff --git a/home/README.md b/home/README.md
index c47fdf2..afff47f 100644
--- a/home/README.md
+++ b/home/README.md
@@ -4,6 +4,7 @@ the home of my dotfiles, configured and managed by home-manager.
 
 name            | description
 --------------- | -----------
+`bat`           | cat replacement
 `btop`          | system monitor program
 `direnv`        | a shell extension, that loads environment variables in certain directories
 `default`       | used for commonly shared modules, for multiple home-manager configs
diff --git a/home/bat/default.nix b/home/bat/default.nix
new file mode 100644
index 0000000..e3ff93c
--- /dev/null
+++ b/home/bat/default.nix
@@ -0,0 +1,22 @@
+{
+  pkgs,
+  ...
+}: {
+  
+ programs.bat = {
+    enable = true;
+    config = {
+      theme = "catppuccin-mocha";
+    };
+    themes = {
+      catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
+          owner = "catppuccin";
+          repo = "bat";
+          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
+          sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
+        }
+        + "/Catppuccin-mocha.tmTheme");
+    };
+  };
+
+}
\ No newline at end of file
diff --git a/home/default.nix b/home/default.nix
index a9b9405..9b3f81f 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -9,6 +9,7 @@
     ./lf
     ./direnv
     ./btop
+    ./bat
   ];
 
   home.packages = with pkgs; [
@@ -18,9 +19,15 @@
     lazydocker
     yt-dlp
     nfs-utils
-    pinentry-curses
   ];
 
+  services.gpg-agent = {
+    enable = true;
+    defaultCacheTtl = 3600;
+    pinentryFlavor = "gtk2";
+    enableSshSupport = true;
+  };
+
   programs.ssh = {
     enable = true;
     extraConfig = ''
@@ -41,23 +48,7 @@
     '';
   };
 
-  programs.bat = {
-    enable = true;
-    config = {
-      theme = "catppuccin-mocha";
-    };
-    themes = {
-      catppuccin-mocha = builtins.readFile (pkgs.fetchFromGitHub {
-          owner = "catppuccin";
-          repo = "bat";
-          rev = "ba4d16880d63e656acced2b7d4e034e4a93f74b1";
-          sha256 = "sha256-6WVKQErGdaqb++oaXnY3i6/GuH2FhTgK0v4TN4Y0Wbw=";
-        }
-        + "/Catppuccin-mocha.tmTheme");
-    };
-  };
-
-  programs.zoxide = {
+   programs.zoxide = {
     enable = true;
     enableNushellIntegration = true;
     options = [