diff --git a/modules/hardware/nvidia.nix b/modules/hardware/nvidia.nix
index a103c7c..858e67a 100644
--- a/modules/hardware/nvidia.nix
+++ b/modules/hardware/nvidia.nix
@@ -1,4 +1,4 @@
-{
+{ lib, config, ... }: {
   hardware.nvidia = lib.mkIf (config.networking.hostName == "nerv") {
     modesetting.enable = true;
     open = true;
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 1349cd3..c420d4f 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, lib, ... }: {
   imports = [
     ./tlp.nix
     ./easyroam.nix
@@ -6,11 +6,11 @@
     ./pipewire.nix
   ];
   services = {
-    xserver.videoDrivers = lib.mkIf (hostname == "nerv") [ "nvidia" ]; 
+    xserver.videoDrivers = lib.mkIf (config.networking.hostName == "nerv") [ "nvidia" ]; 
     blueman.enable = true;
     printing.enable = true;
     emacs.enable = false;
-    xserver.xcb = {
+    xserver.xkb = {
       layout = "eu";
       variant = "";
     };
diff --git a/modules/services/easyroam.nix b/modules/services/easyroam.nix
index af1e2ac..1aa5782 100644
--- a/modules/services/easyroam.nix
+++ b/modules/services/easyroam.nix
@@ -1,4 +1,4 @@
-{
+{ config, ... }: {
   services.easyroam = {
     enable = true;
     pkcsFile = config.age.secrets.easyroam.path;