From 3d59481c9d4003b3e836aee5f68c02314e2de67f Mon Sep 17 00:00:00 2001
From: Julian Mutter <julian.mutter@comumail.de>
Date: Wed, 12 Jun 2024 22:49:51 +0200
Subject: [PATCH] Deactivate sops to make aspi installation work

---
 modules/nixos/sops/default.nix        | 12 ++++++------
 systems/x86_64-linux/aspi/default.nix |  5 ++---
 2 files changed, 8 insertions(+), 9 deletions(-)

diff --git a/modules/nixos/sops/default.nix b/modules/nixos/sops/default.nix
index cfdbe6f..08436dc 100644
--- a/modules/nixos/sops/default.nix
+++ b/modules/nixos/sops/default.nix
@@ -29,14 +29,14 @@ in
   options.modules.sops = { };
 
   config = {
-    sops.defaultSopsFile = ../../../secrets/secrets.yaml;
-    sops.defaultSopsFormat = "yaml";
-    sops.age.keyFile = "/home/julian/.config/sops/age/keys.txt";
+    #sops.defaultSopsFile = ../../../secrets/secrets.yaml;
+    #sops.defaultSopsFormat = "yaml";
+    #sops.age.keyFile = "/home/julian/.config/sops/age/keys.txt";
 
     # List of defined secrets
-    sops.secrets."aspi/password" = {
-      neededForUsers = true;
-    };
+    #sops.secrets."aspi/password" = {
+    #  neededForUsers = true;
+    #};
 
     # sops.secrets."aspi/syncthing/key" = {
     #   neededForUsers = true;
diff --git a/systems/x86_64-linux/aspi/default.nix b/systems/x86_64-linux/aspi/default.nix
index 7ef12b4..0957b96 100644
--- a/systems/x86_64-linux/aspi/default.nix
+++ b/systems/x86_64-linux/aspi/default.nix
@@ -49,7 +49,6 @@
   # Use this for simple nix boot menu, if no dual boot required
   boot.loader.systemd-boot.enable = true;
   boot.loader.efi.canTouchEfiVariables = true;
-  boot.loader.efi.efiSysMountPoint = "/boot/efi";
 
   boot.supportedFilesystems = [
     "btrfs"
@@ -168,8 +167,8 @@
   services.syncthing.enable = true;
   services.syncthing.user = "julian";
   services.syncthing.group = "julian";
-  services.syncthing.key = config.sops.secrets."aspi/syncthing/key".path;
-  services.syncthing.cert = config.sops.secrets."aspi/syncthing/cert".path;
+  #services.syncthing.key = config.sops.secrets."aspi/syncthing/key".path;
+  #services.syncthing.cert = config.sops.secrets."aspi/syncthing/cert".path;
   # overrideDevices = true; # overrides any devices added or deleted through the WebUI
   # overrideFolders = true; # overrides any folders added or deleted through the WebUI
   # settings = {