From df123f8f1f9ac2307b5bcc7efcfbc13a0cd63b5b Mon Sep 17 00:00:00 2001
From: Lillian-Violet <git@lillianviolet.dev>
Date: Mon, 5 Feb 2024 18:23:09 +0100
Subject: [PATCH] Update configs to fix updates, and some minor tweaks

---
 nixos/hosts/shodan/configuration.nix                     | 4 ++--
 nixos/server/package-configs/aria2/configuration.nix     | 6 ++++++
 nixos/server/package-configs/nextcloud/configuration.nix | 2 +-
 3 files changed, 9 insertions(+), 3 deletions(-)

diff --git a/nixos/hosts/shodan/configuration.nix b/nixos/hosts/shodan/configuration.nix
index 75fad57..82d82c1 100644
--- a/nixos/hosts/shodan/configuration.nix
+++ b/nixos/hosts/shodan/configuration.nix
@@ -158,8 +158,8 @@
 
   # Configure keymap in X11
   services.xserver = {
-    layout = "us";
-    xkbVariant = "";
+    xkb.layout = "us";
+    xkb.variant = "";
   };
 
   # Enable networking
diff --git a/nixos/server/package-configs/aria2/configuration.nix b/nixos/server/package-configs/aria2/configuration.nix
index 6cf7791..f2a075c 100644
--- a/nixos/server/package-configs/aria2/configuration.nix
+++ b/nixos/server/package-configs/aria2/configuration.nix
@@ -1,4 +1,6 @@
 {
+  inputs,
+  outputs,
   config,
   pkgs,
   ...
@@ -7,9 +9,13 @@
   users.groups.aria2 = {};
   users.users.aria2.isSystemUser = true;
 
+  sops.secrets."rpcSecret".mode = "0440";
+  sops.secrets."rpcSecret".owner = config.users.users.aria2.name;
+
   services.aria2 = {
     enable = true;
     downloadDir = "/var/lib/media";
     rpcListenPort = 6969;
+    rpcSecretFile = config.sops.secrets."rpcSecret".path;
   };
 }
diff --git a/nixos/server/package-configs/nextcloud/configuration.nix b/nixos/server/package-configs/nextcloud/configuration.nix
index 4767bd5..2485eca 100644
--- a/nixos/server/package-configs/nextcloud/configuration.nix
+++ b/nixos/server/package-configs/nextcloud/configuration.nix
@@ -64,7 +64,7 @@
     #Increase opcache string buffer
     phpOptions."opcache.interned_strings_buffer" = "23";
     # Further forces Nextcloud to use HTTPS
-    extraOptions = {
+    settings = {
       overwriteprotocol = "https";
       default_phone_region = "NL";
     };