diff --git a/kat/gui/network.nix b/kat/gui/network.nix
new file mode 100644
index 00000000..f50b75e5
--- /dev/null
+++ b/kat/gui/network.nix
@@ -0,0 +1,8 @@
+
+_: {
+  xsession.preferStatusNotifierItems = true;
+  services = {
+    network-manager-applet.enable = true;
+    blueman-applet.enable = true;
+  };
+                            }
diff --git a/nixos/common/network.nix b/nixos/common/network.nix
index 94d3b25a..fc84ef59 100644
--- a/nixos/common/network.nix
+++ b/nixos/common/network.nix
@@ -1,3 +1,5 @@
 _: {
   networking.nftables.enable = true;
+
+  services.tailscale.enable = true;
 }
diff --git a/nixos/gui/network.nix b/nixos/gui/network.nix
new file mode 100644
index 00000000..a8b0854c
--- /dev/null
+++ b/nixos/gui/network.nix
@@ -0,0 +1,47 @@
+{ pkgs, ... }: {
+  systemd.services.NetworkManager-wait-online = {
+    serviceConfig.ExecStart = [ "" "${pkgs.networkmanager}/bin/nm-online -q" ];
+  };
+  hardware.bluetooth = {
+    enable = true;
+    package = pkgs.bluez5-experimental;
+    settings = {
+      General = {
+        Enable = "Source,Sink,Media,Socket";
+      };
+    };
+  };
+  services.blueman.enable = true;
+  services.pipewire.media-session.config.bluez-monitor = {
+    properties = { };
+    rules = [
+    {
+      actions = {
+        update-props = {
+          "bluez5.a2dp-source-role" = "input";
+          "bluez5.auto-connect"  = [ "hfp_hf" "hsp_hs" "a2dp_sink" "a2dp_source" "hsp_ag" "hfp_ag" ];
+        };
+      };
+      matches = [ { "device.name" = "~bluez_card.*"; } ];
+    }
+    {
+      actions = {
+        update-props = { "node.pause-on-idle" = false; };
+      };
+      matches = [ { "node.name" = "~bluez_input.*"; } { "node.name" = "~bluez_output.*"; } ];
+    }
+    ];
+  };
+  networking = {
+    firewall = {
+      allowedUDPPorts = [ 5353 ];
+      allowedUDPPortRanges = [ { from = "32768"; to="60999" } ];
+    };
+    networkmanager = {
+      enable = true;
+      connectionConfig = {
+        "ipv6.ip6-privacy" = lib.mkForce 0;
+      };
+    };
+  };
+}
diff --git a/systems/default.nix b/systems/default.nix
index 46e64d43..beab2a04 100644
--- a/systems/default.nix
+++ b/systems/default.nix
@@ -122,7 +122,7 @@
             path = inputs.deploy-rs.lib.x86_64-linux.activate.nixos inputs.self.nixosConfigurations.${name};
           };
           hostname = "${name}.inskip.me";
-          sshOpts = ["-p" "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
+          sshOpts = ["-p" "62954"]; # "${builtins.toString (builtins.head inputs.self.nixosConfigurations.${name}.config.services.openssh.ports)}"];
           sshUser = "kat";
           user = "root";
           autoRollback = true;
diff --git a/systems/koishi.nix b/systems/koishi.nix
index 507dabba..1fe70e5e 100644
--- a/systems/koishi.nix
+++ b/systems/koishi.nix
@@ -20,7 +20,35 @@ _: let
       {device = "/dev/disk/by-uuid/0d846453-95b4-46e1-8eaf-b910b4321ef0";}
     ];
 
+    home-manager.SharedModules = [
+      {
+        wayland.windowManager.sway.config.input."2:7:SynPS/2_Synaptics_TouchPad" = {
+          dwt = "enabled";
+          tap = "enabled";
+          natural_scroll = "enabled";
+          middle_emulation = "enabled";
+          click_method = "clickfinger";
+        };
+      }
+    ];
+
+    hardware = {
+      cpu.intel.updateMicrocode = true;
+      opengl = {
+        enable = true;
+        extraPackages = with pkgs; [
+          intel-media-driver
+          vaapiIntel
+          vaapiVdpau
+          libvdpau-va-gl
+        ];
+      };
+    };
+
     boot = {
+      initrd.availableKernelModules =
+        [ "xhci_pci" "nvme" "usb_storage" "sd_mod" "sr_mod" "rtsx_usb_sdmmc" ];
+      kernelModules = [ "kvm-intel" ];
       supportedFilesystems = ["xfs"];
       initrd.luks.devices."cryptroot".device = "/dev/disk/by-uuid/f0ea08b4-6af7-4d90-a2ad-edd5672a2105";
       loader = {
@@ -29,9 +57,9 @@ _: let
           efiSysMountPoint = "/boot";
         };
         grub = {
-          devices = ["nodev"];
-          efiSupport = true;
           enable = true;
+          efiSupport = true;
+          devices = ["nodev"];
           extraEntries = ''
             menuentry "Windows" {
               insmod part_gpt
@@ -47,6 +75,11 @@ _: let
       };
     };
 
+    networking = {
+      hostId = "dddbb888";
+      useDHCP = false;
+    };
+
     system.stateVersion = "21.11";
   };
 in {