From 5f552149ea1d44381bb386361dc33fa10771569a Mon Sep 17 00:00:00 2001
From: teutat3s <teutates@mailbox.org>
Date: Sun, 24 Oct 2021 23:42:36 +0200
Subject: [PATCH] Clean up unused git-crypt dirs/files

---
 hosts/con/.gitattributes                  |   1 -
 hosts/con/secrets/keyfile.bin             | Bin 2070 -> 0 bytes
 hosts/dumpyourvms/.gitattributes          |   1 -
 hosts/dumpyourvms/secrets/keyfile.bin     | Bin 2070 -> 0 bytes
 hosts/ryzensun/.gitattributes             |   1 -
 hosts/ryzensun/hardware-configuration.nix |   2 +-
 hosts/ryzensun/ryzensun.nix               |   1 -
 hosts/ryzensun/secrets/keyfile.bin        | Bin 2070 -> 0 bytes
 secrets/.gitattributes                    |   4 ----
 9 files changed, 1 insertion(+), 9 deletions(-)
 delete mode 100644 hosts/con/.gitattributes
 delete mode 100644 hosts/con/secrets/keyfile.bin
 delete mode 100644 hosts/dumpyourvms/.gitattributes
 delete mode 100644 hosts/dumpyourvms/secrets/keyfile.bin
 delete mode 100644 hosts/ryzensun/.gitattributes
 delete mode 100644 hosts/ryzensun/secrets/keyfile.bin
 delete mode 100644 secrets/.gitattributes

diff --git a/hosts/con/.gitattributes b/hosts/con/.gitattributes
deleted file mode 100644
index 5a37d556..00000000
--- a/hosts/con/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-secrets/** filter=git-crypt-18DAE600A6BBE705 diff=git-crypt-18DAE600A6BBE705
diff --git a/hosts/con/secrets/keyfile.bin b/hosts/con/secrets/keyfile.bin
deleted file mode 100644
index 73bc3a7a373efb61eae46b5c7f6b9bbf16e3da75..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2070
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
AkN^Mx

diff --git a/hosts/dumpyourvms/.gitattributes b/hosts/dumpyourvms/.gitattributes
deleted file mode 100644
index 5a37d556..00000000
--- a/hosts/dumpyourvms/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-secrets/** filter=git-crypt-18DAE600A6BBE705 diff=git-crypt-18DAE600A6BBE705
diff --git a/hosts/dumpyourvms/secrets/keyfile.bin b/hosts/dumpyourvms/secrets/keyfile.bin
deleted file mode 100644
index bead2555001b28b3b6430feaf265c452072eeb13..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2070
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
AmH+?%

diff --git a/hosts/ryzensun/.gitattributes b/hosts/ryzensun/.gitattributes
deleted file mode 100644
index 5a37d556..00000000
--- a/hosts/ryzensun/.gitattributes
+++ /dev/null
@@ -1 +0,0 @@
-secrets/** filter=git-crypt-18DAE600A6BBE705 diff=git-crypt-18DAE600A6BBE705
diff --git a/hosts/ryzensun/hardware-configuration.nix b/hosts/ryzensun/hardware-configuration.nix
index 53490312..0348756a 100644
--- a/hosts/ryzensun/hardware-configuration.nix
+++ b/hosts/ryzensun/hardware-configuration.nix
@@ -22,7 +22,7 @@
 
   boot.initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/ef6c5bb0-0bcf-4af4-bbc9-02c849999e54";
 
-  fileSystems."/boot/efi" =
+  fileSystems."/boot" =
     {
       device = "/dev/disk/by-uuid/2C62-C8B5";
       fsType = "vfat";
diff --git a/hosts/ryzensun/ryzensun.nix b/hosts/ryzensun/ryzensun.nix
index cbdbc59a..a9af3b27 100644
--- a/hosts/ryzensun/ryzensun.nix
+++ b/hosts/ryzensun/ryzensun.nix
@@ -10,7 +10,6 @@ in
   ];
 
   config = {
-    pub-solar.x-os.keyfile = "/etc/nixos/hosts/ryzensun/secrets/keyfile.bin";
     pub-solar.nextcloud.enable = mkForce false;
     pub-solar.docker.enable = mkForce false;
     pub-solar.virtualisation.enable = true;
diff --git a/hosts/ryzensun/secrets/keyfile.bin b/hosts/ryzensun/secrets/keyfile.bin
deleted file mode 100644
index 87d07293e536b1a8b7b634d5c3b988b4c2dd320e..0000000000000000000000000000000000000000
GIT binary patch
literal 0
HcmV?d00001

literal 2070
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
A1^@s6

diff --git a/secrets/.gitattributes b/secrets/.gitattributes
deleted file mode 100644
index 901863e3..00000000
--- a/secrets/.gitattributes
+++ /dev/null
@@ -1,4 +0,0 @@
-* filter=git-crypt diff=git-crypt
-.gitattributes !filter !diff
-secrets.nix !filter !diff
-README.md !filter !diff