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 73bc3a7a..00000000 Binary files a/hosts/con/secrets/keyfile.bin and /dev/null differ 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 bead2555..00000000 Binary files a/hosts/dumpyourvms/secrets/keyfile.bin and /dev/null differ 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 87d07293..00000000 Binary files a/hosts/ryzensun/secrets/keyfile.bin and /dev/null differ 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