From f5e2037cc27a7db8f5598edf7953deadada2fd8c Mon Sep 17 00:00:00 2001
From: Trevor Vallender <trevor@tsvallender.co.uk>
Date: Wed, 27 Sep 2023 13:30:41 +0100
Subject: [PATCH] Encrypting Syncthing password

---
 .gitattributes                          |   1 +
 system/kernighan/kernighan.nix          |   2 ++
 system/shared/desktop-configuration.nix |   6 ------
 system/shared/services/syncthing.nix    | Bin 0 -> 384 bytes
 system/shared/shared-configuration.nix  |   6 ++++++
 5 files changed, 9 insertions(+), 6 deletions(-)
 create mode 100644 system/shared/services/syncthing.nix

diff --git a/.gitattributes b/.gitattributes
index d09ab1b..31a3a38 100644
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +1,3 @@
 # Encrypt Mopidy config as it contains Spotify credentials
 system/shared/services/mopidy.nix filter=git-crypt diff=git-crypt
+system/shared/services/syncthing.nix filter=git-crypt diff=git-crypt
diff --git a/system/kernighan/kernighan.nix b/system/kernighan/kernighan.nix
index 32cc1f9..d83bf9d 100644
--- a/system/kernighan/kernighan.nix
+++ b/system/kernighan/kernighan.nix
@@ -28,6 +28,8 @@
   environment.systemPackages = with pkgs; [
     cifs-utils # To mount Storage Box
     git
+    git-crypt
+    gnupg
     vim
   ];
 }
diff --git a/system/shared/desktop-configuration.nix b/system/shared/desktop-configuration.nix
index e2104c4..06e797f 100644
--- a/system/shared/desktop-configuration.nix
+++ b/system/shared/desktop-configuration.nix
@@ -21,12 +21,6 @@
     openFirewall = true;
   };
 
-  services.pcscd.enable = true;
-  programs.gnupg.agent = {
-    enable = true;
-    pinentryFlavor = "curses";
-  };
-
   # Use the systemd-boot EFI boot loader.
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
diff --git a/system/shared/services/syncthing.nix b/system/shared/services/syncthing.nix
new file mode 100644
index 0000000000000000000000000000000000000000..18844da07b705d96ea5bf38a04b033c2e3419d05
GIT binary patch
literal 384
zcmV-`0e}7gM@dveQdv+`00W9Gpw?QZZ$|+i7LTj1B{{dI79D(3Nh<Lt1-OE1blUHy
z7kI8A;<Ro@6sqJeU|c~hH<KOne)tu1DbXGNS^8<G2BSz;qv+i*-CiR=Z>i?8yJP@T
zA(e}BnBR&@`I!w9Jc`fmEiqs-u^8u33k9gdVi}~3L*~{8-+4QG_#4ihj@weg*;3ZD
zMGM-j0U12(lXQ^Enf_h$g;bG|)RRUWny$m57F;4$#7USNL<ar9;<&vK`RazLyQeI0
z<Ppt+zC=_6U?kJ!H4iB%H4=UtdF^|(Ruv~+V>$OW-$8J1;H5oz@3a+mTJ|C`r_w%{
zWgidWnA@7>UueDyE$<<2o950+ZwL$Ce@gq=!g2c#YiwF)E}vkHOtqIEVl(O<3={dE
zi#0Ztq(R!zZ~Cy6l<#^hAYHcSsN$2?Q+<h7dzd5hl?;<5aJel*ry7RB&mAEy!uRPa
eIOXzz=BVE(2Q?`qllZL<y;w@HcgyQAhvA!*=C}O-

literal 0
HcmV?d00001

diff --git a/system/shared/shared-configuration.nix b/system/shared/shared-configuration.nix
index 0bb5fa9..c99c20a 100644
--- a/system/shared/shared-configuration.nix
+++ b/system/shared/shared-configuration.nix
@@ -33,6 +33,12 @@
     ];
   };
 
+  services.pcscd.enable = true;
+  programs.gnupg.agent = {
+    enable = true;
+    pinentryFlavor = "curses";
+  };
+
   nix = {
     extraOptions = "experimental-features = nix-command flakes";
     package = pkgs.nixFlakes;