From 0f06a86b1eaa99ff21cdce8c5f1c54b688cbbcf6 Mon Sep 17 00:00:00 2001
From: Gregor Kleen <gkleen@yggdrasil.li>
Date: Thu, 1 Aug 2024 10:48:06 +0200
Subject: ...

---
 hosts/sif/default.nix | 110 ++++++++++++++++++++++++--------------------------
 1 file changed, 52 insertions(+), 58 deletions(-)

(limited to 'hosts/sif/default.nix')

diff --git a/hosts/sif/default.nix b/hosts/sif/default.nix
index 96cd66cc..610d990d 100644
--- a/hosts/sif/default.nix
+++ b/hosts/sif/default.nix
@@ -187,12 +187,10 @@ in {
             # FirewallMark = 1;
           };
           wireguardPeers = [
-            { wireguardPeerConfig = {
-                AllowedIPs = [ "10.200.116.1/32" "10.163.88.40/32" ] ++ mwnSubnetsPrivate ++ mwnSubnetsPublic;
-                PublicKey = "YlRFLc+rD2k2KXl7pIJbOKbcPgdJCl8ZTsv0xlK4VEI=";
-                PersistentKeepalive = 25;
-                Endpoint = "wg.math.lmu.de:51820";
-              };
+            { AllowedIPs = [ "10.200.116.1/32" "10.163.88.40/32" ] ++ mwnSubnetsPrivate ++ mwnSubnetsPublic;
+              PublicKey = "YlRFLc+rD2k2KXl7pIJbOKbcPgdJCl8ZTsv0xlK4VEI=";
+              PersistentKeepalive = 25;
+              Endpoint = "wg.math.lmu.de:51820";
             }
           ];
         };
@@ -211,43 +209,34 @@ in {
             Name = "wgrz";
           };
           address = ["10.200.116.128/24"];
-          routes = map (Destination: { routeConfig = {
+          routes = map (Destination: {
             inherit Destination;
             Gateway = "10.200.116.1";
             GatewayOnLink = true;
             Table = "wgrz";
-          };}) (mwnSubnetsPrivate ++ mwnSubnetsPublic ++ ["10.163.88.40/32"]);
+          }) (mwnSubnetsPrivate ++ mwnSubnetsPublic ++ ["10.163.88.40/32"]);
           routingPolicyRules = [
-            { routingPolicyRuleConfig = {
-                Table = "main";
-                # FirewallMark = 1;
-                To = "129.187.111.225";
-                Priority = 100;
-              };
+            { Table = "main";
+              # FirewallMark = 1;
+              To = "129.187.111.225";
+              Priority = 100;
             }
-            { routingPolicyRuleConfig = {
-                Table = "main";
-                To = "10.153.91.204";
-                Priority = 100;
-              };
+            { Table = "main";
+              To = "10.153.91.204";
+              Priority = 100;
             }
-            { routingPolicyRuleConfig = {
-                Table = "wgrz";
-                From = "10.200.116.128";
-                Priority = 200;
-              };
+            { Table = "wgrz";
+              From = "10.200.116.128";
+              Priority = 200;
             }
-            { routingPolicyRuleConfig = {
-                Table = "wgrz";
-                To = "10.163.88.40";
-                Priority = 200;
-              };
+            { Table = "wgrz";
+              To = "10.163.88.40";
+              Priority = 200;
             }
-          ] ++ map (To: { routingPolicyRuleConfig = {
-                            Table = "wgrz";
-                            inherit To;
-                            Priority = 200;
-                          };}) (mwnSubnetsPrivate ++ mwnSubnetsPublic);
+          ] ++ map (To: { Table = "wgrz";
+                          inherit To;
+                          Priority = 200;
+                        }) (mwnSubnetsPrivate ++ mwnSubnetsPublic);
           linkConfig = {
             RequiredForOnline = false;
           };
@@ -328,7 +317,7 @@ in {
     };
 
     environment.systemPackages = with pkgs; [
-      nvtop brightnessctl config.boot.kernelPackages.v4l2loopback s-tui uhk-agent
+      nvtopPackages.full brightnessctl config.boot.kernelPackages.v4l2loopback s-tui uhk-agent
     ];
 
     services = {
@@ -375,9 +364,27 @@ in {
       xserver = {
         enable = true;
 
-        layout = "us";
-        xkbVariant = "dvp";
-        xkbOptions = "compose:caps";
+        xkb = {
+          layout = "us";
+          variant = "dvp";
+          options = "compose:caps";
+        };
+
+        wacom.enable = true;
+
+        dpi = 282;
+
+        videoDrivers = [ "nvidia" ];
+
+        screenSection = ''
+          Option "metamodes" "nvidia-auto-select +0+0 { ForceCompositionPipeline = On }"
+        '';
+
+        deviceSection = ''
+          Option "TearFree" "True"
+        '';
+
+        exportConfiguration = true;
 
         displayManager.lightdm = {
           enable = true;
@@ -403,24 +410,8 @@ in {
             '';
           };
         };
-
-        wacom.enable = true;
-        libinput.enable = true;
-
-        dpi = 282;
-
-        videoDrivers = [ "nvidia" ];
-
-        screenSection = ''
-          Option "metamodes" "nvidia-auto-select +0+0 { ForceCompositionPipeline = On }"
-        '';
-
-        deviceSection = ''
-          Option "TearFree" "True"
-        '';
-
-        exportConfiguration = true;
       };
+      libinput.enable = true;
     };
 
     systemd.tmpfiles.rules = [
@@ -549,9 +540,9 @@ in {
         };
       };
 
-      opengl = {
+      graphics = {
         enable = true;
-        driSupport32Bit = true;
+        enable32Bit = true;
         # setLdLibraryPath = true;
       };
 
@@ -647,7 +638,10 @@ in {
       group = "users";
     };
 
-    i18n.inputMethod.enabled = "ibus";
+    i18n.inputMethod = {
+      enable = true;
+      type = "ibus";
+    };
 
     environment.sessionVariables."GTK_USE_PORTAL" = "1";
     xdg.portal = {
-- 
cgit v1.2.3