diff --git a/hardware/nvidia.nix b/hardware/nvidia.nix
index b678825..8e8d923 100644
--- a/hardware/nvidia.nix
+++ b/hardware/nvidia.nix
@@ -8,8 +8,6 @@
   options.hardware.nvidia.enable = lib.mkEnableOption "Nvidia drivers";
 
   config = lib.mkIf config.hardware.nvidia.enable {
-    services.xserver.videoDrivers = [ "nvidia" ];
-
     hardware = {
       nvidia = {
         powerManagement.enable = true;
diff --git a/hosts/kg/configuration.nix b/hosts/kg/configuration.nix
index 7dac322..9760f79 100644
--- a/hosts/kg/configuration.nix
+++ b/hosts/kg/configuration.nix
@@ -205,19 +205,13 @@
       physicalConnections = [ (topology.mkConnectionRev "router" "wifi") ];
     };
 
-  services = {
-    ai.ollama = {
-      enable = true;
-      acceleration = "cuda";
-      models = [
-        "llama3.2"
-        "llama3.1:8b"
-      ];
-    };
-    xserver.xkb = {
-      layout = "de";
-      variant = "";
-    };
+  services.ai.ollama = {
+    enable = true;
+    acceleration = "cuda";
+    models = [
+      "llama3.2"
+      "llama3.1:8b"
+    ];
   };
 
   time.timeZone = "Europe/Berlin";
diff --git a/hosts/tp/configuration.nix b/hosts/tp/configuration.nix
index 254200b..36341fd 100644
--- a/hosts/tp/configuration.nix
+++ b/hosts/tp/configuration.nix
@@ -51,10 +51,9 @@
       uutils-coreutils.enable = true;
       polkit.enable = true;
       tpm.enable = true;
-      secure-boot.enable = true;
       sudo-rs.enable = true;
     };
-    services.ssh.enable = false;
+    services.ssh.enable = true;
     style.catppuccin.enable = true;
   };
 
@@ -194,31 +193,34 @@
       };
     };
 
-  services.xserver.xkb = {
-    layout = "de";
-    variant = "";
-  };
-
   time.timeZone = "Europe/Berlin";
 
   nixpkgs.config.allowUnfree = true;
 
-  users.users.${username} = {
-    hashedPasswordFile = config.sops.secrets.hashed_password.path;
-    openssh.authorizedKeys.keys = [
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHYe+2EqTg5Uh0/PZXhnuznFE84uiEzBtgd8qz9sUWS ed25519"
-      "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAD+mYDOwD6lR89dpPCprEDTBIBNKgjzb6sqoGCHOYl7 kg@LapT"
-    ];
-    extraGroups = [
-      "networkmanager"
-      "wheel"
-      "input"
-      "docker"
-      "kvm"
-      "libvirtd"
-      "audio"
-      "video"
-      "tss"
-    ];
-  };
+  users.users =
+    let
+      keys = [
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAICHYe+2EqTg5Uh0/PZXhnuznFE84uiEzBtgd8qz9sUWS ed25519"
+        "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIAD+mYDOwD6lR89dpPCprEDTBIBNKgjzb6sqoGCHOYl7 kg@LapT"
+      ];
+    in
+    {
+      root.openssh.authorizedKeys = { inherit keys; };
+
+      ${username} = {
+        hashedPasswordFile = config.sops.secrets.hashed_password.path;
+        openssh.authorizedKeys = { inherit keys; };
+        extraGroups = [
+          "networkmanager"
+          "wheel"
+          "input"
+          "docker"
+          "kvm"
+          "libvirtd"
+          "audio"
+          "video"
+          "tss"
+        ];
+      };
+    };
 }
diff --git a/hosts/ws/configuration.nix b/hosts/ws/configuration.nix
index 11bdca6..33ccb0b 100644
--- a/hosts/ws/configuration.nix
+++ b/hosts/ws/configuration.nix
@@ -53,11 +53,6 @@
 
   networking.hostName = username;
 
-  services.xserver.xkb = {
-    layout = "en";
-    variant = "";
-  };
-
   time.timeZone = "Europe/Berlin";
 
   nixpkgs.config.allowUnfree = true;