From 7a647287bbee00772317eef504d4577251b01e97 Mon Sep 17 00:00:00 2001
From: Asmir A <asmir.abdulahovic@gmail.com>
Date: Sat, 11 May 2024 09:26:49 +0200
Subject: [PATCH] nixy: cleanup config

---
 nixy/configuration.nix | 46 +++++++++++++++++++++++-------------------
 1 file changed, 25 insertions(+), 21 deletions(-)

diff --git a/nixy/configuration.nix b/nixy/configuration.nix
index ec82f97..fc3ea04 100644
--- a/nixy/configuration.nix
+++ b/nixy/configuration.nix
@@ -13,30 +13,34 @@
   system.stateVersion = "23.05";
   system.autoUpgrade.enable = false;
 
-  sops.age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
-  sops.secrets."peerix/private" = {
-    sopsFile = ./secrets/peerix.yaml;
-    mode = "0400";
-    owner = config.users.users.nobody.name;
-    group = config.users.users.nobody.group;
-  };
+  sops = {
+    age.sshKeyPaths = ["/etc/ssh/ssh_host_ed25519_key"];
+    secrets = {
+      "peerix/private" = {
+        sopsFile = ./secrets/peerix.yaml;
+        mode = "0400";
+        owner = config.users.users.nobody.name;
+        group = config.users.users.nobody.group;
+      };
 
-  sops.secrets."wg_privkey" = {
-    sopsFile = ./secrets/wg_privkey.yaml;
-  };
+      "wg_privkey" = {
+        sopsFile = ./secrets/wg_privkey.yaml;
+      };
 
-  sops.secrets."wg_preshared/nixy" = {
-    sopsFile = ../common/secrets/wg_preshared.yaml;
-  };
+      "wg_preshared/nixy" = {
+        sopsFile = ../common/secrets/wg_preshared.yaml;
+      };
 
-  sops.secrets."borgbase_enc_key" = {
-    sopsFile = ./secrets/borgbase_enc_key.yaml;
-    owner = config.users.users.akill.name;
-  };
+      "borgbase_enc_key" = {
+        sopsFile = ./secrets/borgbase_enc_key.yaml;
+        owner = config.users.users.akill.name;
+      };
 
-  sops.secrets."borgbase_ssh_key" = {
-    sopsFile = ./secrets/borgbase_ssh_key.yaml;
-    owner = config.users.users.akill.name;
+      "borgbase_ssh_key" = {
+        sopsFile = ./secrets/borgbase_ssh_key.yaml;
+        owner = config.users.users.akill.name;
+      };
+    };
   };
 
   nix = {
@@ -412,7 +416,7 @@
       enable = true;
       driSupport = true;
       driSupport32Bit = true;
-      extraPackages = with pkgs; [];
+      extraPackages = [];
     };
     rtl-sdr.enable = true;
   };