modularized deployments

demilich/configuration.nix

@@ -12,9 +12,9 @@
 {
   imports = [
     ./hardware-configuration.nix
-    ../services.nix
-    ../packages.nix
-    ../security.nix
+    ./services.nix
+    ./packages.nix
+    ./security.nix
   ];
 
   # Enable flakes and nix-command
@@ -30,7 +30,6 @@
     "electron-39.8.10"
   ];
 
-  # Use the systemd-boot EFI boot loader.
   boot = {
     loader = {
       limine = {
@@ -47,7 +46,20 @@
 
   networking = {
     hostName = "demilich";
-    networkmanager.enable = true;
+
+    networkmanager = {
+      enable = true;
+    };
+
+    nftables = {
+      enable = true;
+    };
+
+    firewall = {
+      enable = true;
+      trustedInterfaces = [ config.services.tailscale.interfaceName ];
+      allowedUDPPorts = [ config.services.tailscale.port ];
+    };
   };
 
   # Set your time zone.
@@ -56,7 +68,7 @@
   # Select internationalisation properties.
   i18n.defaultLocale = "en_CA.UTF-8";
   console = {
-    # keyMap = "us";
+    keyMap = "us";
     useXkbConfig = true;
   };