diff --git a/nixos/environment.nix b/nixos/environment.nix
index ef633be6..144441e9 100644
--- a/nixos/environment.nix
+++ b/nixos/environment.nix
@@ -34,6 +34,7 @@ with lib;
       homeBinInPath = true;
       localBinInPath = true;
       extraInit = ''
+        export ROFI_SYSTEMD_TERM="alacritty -e"
         export PATH="${libDir}/bin:$PATH"
         export PATH="${libDir}/functions:$PATH"
       '';
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index d6f338e0..03c3751b 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -3,13 +3,9 @@
     enable = true;
     preferStatusNotifierItems = true;
     importedVariables = [ "GDK_PIXBUF_ICON_LOADER" ];
-    profileExtra = ''
-      export ROFI_SYSTEMD_TERM="alacritty -e"
-      . "$HOME/.lib/login.sh"
-      load_xkb_map.sh
-    '';
   };
 
+  home.keyboard = null;
   home.emptyActivationPath = false;
   programs.home-manager.enable = true;
 
@@ -89,6 +85,23 @@
     ];
   };
 
+  systemd.user.services.setxkbmap = {
+    Unit = {
+      Description = "Set up keyboard in X";
+      After = [ "graphical-session-pre.target" ];
+      PartOf = [ "graphical-session.target" ];
+    };
+
+    Install = { WantedBy = [ "graphical-session.target" ]; };
+
+    Service = {
+      Type = "oneshot";
+      RemainAfterExit = true;
+      ExecStart = "/usr/bin/env load_xkb_map";
+    };
+  };
+
+
   systemd.user.services.picom = {
     Unit = {
       Description = "Picom X11 compositor";