From 5615b246b694cc54a68e9ce615e5dd632e974024 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 19 Jul 2024 11:45:24 +0200 Subject: [PATCH 1/2] feat: Modify keyboard layout in x86_64-linux hardware configuration The configuration update for the x86_64-linux t15 hardware adds a US layout variant to the existing German keyboard configuration. This change will allow switching between US and German keyboard layouts as per user requirements. --- systems/x86_64-linux/t15/hardware-configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/x86_64-linux/t15/hardware-configuration.nix b/systems/x86_64-linux/t15/hardware-configuration.nix index 784e841..3c0f827 100644 --- a/systems/x86_64-linux/t15/hardware-configuration.nix +++ b/systems/x86_64-linux/t15/hardware-configuration.nix @@ -94,7 +94,7 @@ console.keyMap = "de-latin1-nodeadkeys"; services.xserver.xkb = { - layout = "de"; + layout = "de,de+us"; variant = "nodeadkeys"; }; From d44ef254fa1d3ae89c242aa5cdac89cc671dfcb4 Mon Sep 17 00:00:00 2001 From: Harald Hoyer Date: Fri, 19 Jul 2024 11:45:38 +0200 Subject: [PATCH 2/2] feat: update allowed TCP port in sgx network configuration This commit updates the allowed TCP port for networking in the SGX configuration file. Instead of hardcoding the port number, it now uses the port specified in the netatalk configuration. This change enables more flexibility in port assignment and reduces potential conflicts. --- systems/x86_64-linux/sgx/network.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/systems/x86_64-linux/sgx/network.nix b/systems/x86_64-linux/sgx/network.nix index 3ad13c7..d19a01d 100644 --- a/systems/x86_64-linux/sgx/network.nix +++ b/systems/x86_64-linux/sgx/network.nix @@ -37,6 +37,6 @@ }; }; - networking.firewall.allowedTCPPorts = [ 548 ]; + networking.firewall.allowedTCPPorts = [ config.services.netatalk.port ]; networking.firewall.allowPing = true; }