diff --git a/modules/user/emacs/init.el b/modules/user/emacs/init.el
index f415df6c..83272277 100644
--- a/modules/user/emacs/init.el
+++ b/modules/user/emacs/init.el
@@ -333,11 +333,14 @@
   :after (treemacs))
 
 (use-package lsp-mode
-  :custom
-  (lsp-keymap-prefix (kbd "SPC l"))
+  :config
+  (setq lsp-keymap-prefix "SPC l")
+  (evil-define-key 'normal lsp-mode-map (kbd "SPC l") lsp-command-map)
   (setq lsp-completion-provider :none)
-  :hook ((gdscript-mode . lsp-deferred)
-         (gdscript-ts-mode . lsp-deferred))
+  :hook
+  (lsp-mode . evil-normalize-keymaps)
+  (gdscript-mode . lsp-deferred)
+  (gdscript-ts-mode . lsp-deferred)
   :commands lsp-deferred)
 
 (use-package lsp-ui :commands lsp-ui-mode)
diff --git a/modules/user/hyprland/default.nix b/modules/user/hyprland/default.nix
index 1f1cfcfd..4690aea9 100644
--- a/modules/user/hyprland/default.nix
+++ b/modules/user/hyprland/default.nix
@@ -36,6 +36,7 @@ in
       CLUTTER_BACKEND = "wayland";
       GDK_PIXBUF_MODULE_FILE = "${pkgs.librsvg}/lib/gdk-pixbuf-2.0/2.10.0/loaders.cache";
       GSK_RENDERER = "gl";
+      XCURSOR_THEME = config.gtk.cursorTheme.name;
     };
 
     gtk.cursorTheme = {