From e772814eed34f62795588f6027a8add71b684397 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 7 Aug 2024 14:52:11 +0200
Subject: [PATCH] Clean up deprecated config

---
 modules/personal/u2f.nix            |  2 +-
 nki-home/configuration.nix          | 16 +++++++---------
 nki-home/hardware-configuration.nix |  4 ----
 nki-x1c1/hardware-configuration.nix |  2 --
 4 files changed, 8 insertions(+), 16 deletions(-)

diff --git a/modules/personal/u2f.nix b/modules/personal/u2f.nix
index df1272b..549c59a 100644
--- a/modules/personal/u2f.nix
+++ b/modules/personal/u2f.nix
@@ -16,7 +16,7 @@ in
     security.pam = mkIf pkgs.stdenv.isLinux {
       u2f = {
         enable = true;
-        cue = true;
+        settings.cue = true;
       };
 
       # Services
diff --git a/nki-home/configuration.nix b/nki-home/configuration.nix
index a0d071a..3c37eeb 100644
--- a/nki-home/configuration.nix
+++ b/nki-home/configuration.nix
@@ -61,13 +61,11 @@ with lib;
       PrivateKeyFile = config.sops.secrets."dtth-wg/private-key".path;
     };
     wireguardPeers = [{
-      wireguardPeerConfig = {
-        PublicKey = "+7iI4jwmM1Qr+/DKB1Hv8JgFkGu7lSV0PAoo+O5d3yQ=";
-        PresharedKeyFile = config.sops.secrets."dtth-wg/preshared-key".path;
-        AllowedIPs = [ "100.64.0.0/10" "fd00::/106" ];
-        Endpoint = "vpn.dtth.ch:51820";
-        PersistentKeepalive = 25;
-      };
+      PublicKey = "+7iI4jwmM1Qr+/DKB1Hv8JgFkGu7lSV0PAoo+O5d3yQ=";
+      PresharedKeyFile = config.sops.secrets."dtth-wg/preshared-key".path;
+      AllowedIPs = [ "100.64.0.0/10" "fd00::/106" ];
+      Endpoint = "vpn.dtth.ch:51820";
+      PersistentKeepalive = 25;
     }];
   };
   systemd.network.networks."dtth-wg" = {
@@ -75,8 +73,8 @@ with lib;
     address = [ "100.73.146.80/32" "fd00::33:105b/128" ];
     DHCP = "no";
     routes = [
-      { routeConfig = { Destination = "100.64.0.0/10"; Scope = "link"; }; }
-      { routeConfig.Destination = "fd00::/106"; }
+      { Destination = "100.64.0.0/10"; Scope = "link"; }
+      { Destination = "fd00::/106"; }
     ];
   };
 
diff --git a/nki-home/hardware-configuration.nix b/nki-home/hardware-configuration.nix
index 72a263d..7b695ed 100644
--- a/nki-home/hardware-configuration.nix
+++ b/nki-home/hardware-configuration.nix
@@ -36,10 +36,6 @@
   swapDevices =
     [{ device = "/dev/disk/by-uuid/561f6441-1915-4059-a5e1-76a449b0c9bf"; }];
 
-  # GPU options
-  services.xserver.videoDrivers = [ "amdgpu" ];
-  hardware.opengl.enable = true;
-
   # bluetooth usb
   hardware.firmware = [ pkgs.rtl8761b-firmware ];
 }
diff --git a/nki-x1c1/hardware-configuration.nix b/nki-x1c1/hardware-configuration.nix
index d20fa3c..d710fdc 100644
--- a/nki-x1c1/hardware-configuration.nix
+++ b/nki-x1c1/hardware-configuration.nix
@@ -36,6 +36,4 @@
     [{ device = "/dev/disk/by-uuid/2694d189-2ff6-4719-a449-367c52ed3ad6"; }];
 
   hardware.cpu.intel.updateMicrocode = lib.mkDefault config.hardware.enableRedistributableFirmware;
-
-  hardware.opengl.enable = true;
 }