diff --git a/configurations/laptop/home.nix b/configurations/laptop/home.nix
index 776375fe..c8a46e26 100644
--- a/configurations/laptop/home.nix
+++ b/configurations/laptop/home.nix
@@ -13,7 +13,7 @@
     ];
 
   # KDE Connect
-  services.kdeconnect.enable = true; 
+  # services.kdeconnect.enable = true; 
   services.kdeconnect.indicator = true; 
 
   # Custom Desktop Configurations
@@ -52,4 +52,8 @@
     nixos-rebuild-system-flake = "sudo nixos-rebuild switch --flake /etc/nixos#laptop";
   };
 
+  home.sessionVariables = {
+    EDITOR = "emacsclient -n";
+  };
+
 }
diff --git a/global-home.nix b/global-home.nix
index 4185c765..1cf734e6 100644
--- a/global-home.nix
+++ b/global-home.nix
@@ -314,8 +314,8 @@ fi
   ];
   
   home.sessionVariables = {
-    # EDITOR = "emacsclient -nw";
-    EDITOR = "nvim";
+    EDITOR = "emacsclient -n";
+    # EDITOR = "nvim";
 
     # Dotnet path not found fix
     DOTNET_ROOT = "${pkgs.dotnet-sdk}";
diff --git a/global.nix b/global.nix
index b82e0f64..1a1eb0f8 100644
--- a/global.nix
+++ b/global.nix
@@ -201,7 +201,8 @@
     DOTNET_ROOT = "${pkgs.dotnet-sdk}";
 
     # Set neovim to be used instead of less for viewing manpages
-    MANPAGER = "nvim +Man!";
+    # MANPAGER = "nvim +Man!";
+    MANPAGER = "emacsclient -n";
 
     # Nicer terminal prompt
     PS1="\[\e[0;36m\]\u\[\e[0m\]@\[\e[0;33m\]\h\[\e[0m\]:\[\e[0;35m\]\w\[\e[0m\] \$ ";
diff --git a/modules/nixos/cspark-desktop-exwm/module.nix b/modules/nixos/cspark-desktop-exwm/module.nix
index fc408073..49a06752 100644
--- a/modules/nixos/cspark-desktop-exwm/module.nix
+++ b/modules/nixos/cspark-desktop-exwm/module.nix
@@ -31,6 +31,7 @@ in
     };
 
     environment.systemPackages = with pkgs; [
+      xorg.libxcb
       gcr # For GNOME gpg pinentry
       pinentry-qt
 
@@ -81,6 +82,9 @@ in
     # For udiskie
     services.udisks2.enable = true;
 
+    # KDE Connect
+    programs.kdeconnect.enable = true; 
+
     # Whether to enable GNOME Keyring daemon, a service designed to take care of the user’s security credentials, such as user names and passwords.
     services.gnome.gnome-keyring.enable = true;
 
@@ -127,6 +131,7 @@ in
     };
 
     environment.sessionVariables = {
+      EDITOR="emacsclient -n";
       QT_QPA_PLATFORMTHEME = "qt6ct";
       SDL_VIDEODRIVER = "x11,windows";
       _JAVA_AWT_WM_NONREPARENTING = "1";
@@ -134,6 +139,7 @@ in
       SSH_ASKPASS = "/run/current-system/sw/bin/lxqt-openssh-askpass";
     };
     environment.variables = {
+      EDITOR="emacsclient -n";
       QT_QPA_PLATFORMTHEME = "qt6ct";
       SDL_VIDEODRIVER = "x11,windows";
       _JAVA_AWT_WM_NONREPARENTING = "1";