modules/darwin/karabiner.nix

@@ -68,8 +68,7 @@ let
     ]) numbers
   );
 
-  # Swap Fn/Globe and left Control only on the built-in keyboard.
-  builtinKeyboardSimpleModifications = [
+  simple_modifications = [
     {
       from.apple_vendor_top_case_key_code = "keyboard_fn";
       to = [ { key_code = "left_control"; } ];
@@ -86,7 +85,6 @@ let
     is_keyboard = true;
   };
 
-  # Swap the G213's Windows/Alt modifiers.
   logitechG213SimpleModifications = [
     {
       from.key_code = "left_command";
@@ -98,38 +96,6 @@ let
     }
   ];
 
-  logitechMouseIdentifiers = {
-    vendor_id = 1133;
-    product_id = 50503;
-    is_pointing_device = true;
-  };
-
-  # Middle click sends Fn; side buttons navigate back and forward.
-  logitechMouseSimpleModifications = [
-    {
-      from.pointing_button = "button3";
-      to = [ { apple_vendor_top_case_key_code = "keyboard_fn"; } ];
-    }
-    {
-      from.pointing_button = "button4";
-      to = [
-        {
-          key_code = "open_bracket";
-          modifiers = [ "left_command" ];
-        }
-      ];
-    }
-    {
-      from.pointing_button = "button5";
-      to = [
-        {
-          key_code = "close_bracket";
-          modifiers = [ "left_command" ];
-        }
-      ];
-    }
-  ];
-
   complex_modifications = {
     name = "Complex Modifications";
     rules = [
@@ -353,24 +319,16 @@ let
         name = "default";
         selected = true;
         virtual_hid_keyboard.keyboard_type_v2 = "ansi";
+        inherit simple_modifications;
         inherit complex_modifications;
 
         devices = [
-          {
-            identifiers = {
-              is_keyboard = true;
-              is_built_in_keyboard = true;
-            };
-            simple_modifications = builtinKeyboardSimpleModifications;
-          }
           {
             identifiers = logitechG213Identifiers;
             simple_modifications = logitechG213SimpleModifications;
           }
           {
-            identifiers = logitechMouseIdentifiers;
-            ignore = false;
-            simple_modifications = logitechMouseSimpleModifications;
+            identifiers.is_keyboard = true;
           }
         ];
       }

modules/linux/dns.nix

@@ -1,13 +1,14 @@
 { config, lib, ... }: let
-  inherit (lib) mkIf;
+  inherit (lib) mkIf concatStringsSep;
 in {
   services.resolved = mkIf (!config.isServer) {
     enable = true;
 
-    settings.Resolve = {
-      DNS = config.dnsServers;
-      DNSSEC = true;
-      DNSOverTLS = true;
-    };
+    extraConfig = config.dnsServers
+      |> map (server: "DNS=${server}")
+      |> concatStringsSep "\n";
+
+    dnssec     = "true";
+    dnsovertls = "true";
   };
 }