diff --git a/home/lilith/hyprland/hyprgrass.nix b/home/lilith/hyprland/hyprgrass.nix
index db0e5de..1b3e1c7 100644
--- a/home/lilith/hyprland/hyprgrass.nix
+++ b/home/lilith/hyprland/hyprgrass.nix
@@ -8,38 +8,38 @@
 {
   options.desktop.touchSupport = lib.mkEnableOption "Enables touch-related features";
   config.wayland.windowManager.hyprland = lib.mkIf config.desktop.touchSupport {
-    plugins = [ hyprgrass.packages.${pkgs.stdenv.hostPlatform.system}.default ];
+    # plugins = [ hyprgrass.packages.${pkgs.stdenv.hostPlatform.system}.default ];
 
-    settings.plugin.touch_gestures = {
-      sensitivity = 4.0;
-      workspace_swipe = true;
-      workspace_swipe_fingers = 3;
-      workspace_swipe_cancel_ratio = 0.9;
+    # settings.plugin.touch_gestures = {
+    #   sensitivity = 4.0;
+    #   workspace_swipe = true;
+    #   workspace_swipe_fingers = 3;
+    #   workspace_swipe_cancel_ratio = 0.9;
 
-      long_press_delay = 400;
-      resize_on_border_long_press = true;
-      edge_margin = 30;
+    #   long_press_delay = 400;
+    #   resize_on_border_long_press = true;
+    #   edge_margin = 30;
 
-      experimental.send_cancel = true;
+    #   experimental.send_cancel = true;
 
-      hyprgrass-bind = [
-        # weird hack, because there is no explicit way to only show or hide special workplaces
-        ", swipe:3:u, togglespecialworkspace, _tmp"
-        ", swipe:3:u, togglespecialworkspace, keepass"
-        ", swipe:3:u, exec, if (( $(pgrep keepassxc -c) < 2 )); then keepassxc; fi"
+    #   hyprgrass-bind = [
+    #     # weird hack, because there is no explicit way to only show or hide special workplaces
+    #     ", swipe:3:u, togglespecialworkspace, _tmp"
+    #     ", swipe:3:u, togglespecialworkspace, keepass"
+    #     ", swipe:3:u, exec, if (( $(pgrep keepassxc -c) < 2 )); then keepassxc; fi"
 
-        ", swipe:3:d, togglespecialworkspace, _tmp"
-        ", swipe:3:d, togglespecialworkspace, _tmp"
+    #     ", swipe:3:d, togglespecialworkspace, _tmp"
+    #     ", swipe:3:d, togglespecialworkspace, _tmp"
 
-        ", swipe:3:ru, sendshortcut, CONTROL, C,"
-        ", swipe:3:rd, sendshortcut, CONTROL, V,"
+    #     ", swipe:3:ru, sendshortcut, CONTROL, C,"
+    #     ", swipe:3:rd, sendshortcut, CONTROL, V,"
 
-        ", longpress:4, killactive"
+    #     ", longpress:4, killactive"
 
-        ", longpress:3, sendshortcut, , F,"
-      ];
+    #     ", longpress:3, sendshortcut, , F,"
+    #   ];
 
-      hyprgrass-bindm = [ ", longpress:2, movewindow" ];
-    };
+    #   hyprgrass-bindm = [ ", longpress:2, movewindow" ];
+    # };
   };
 }
diff --git a/system/core/nix.nix b/system/core/nix.nix
index 7a7abe5..ed5cc9c 100644
--- a/system/core/nix.nix
+++ b/system/core/nix.nix
@@ -30,6 +30,8 @@
     buildMachines = [
       {
         hostName = "lilith-server-builder";
+        sshUser = "nixremote";
+        sshKey = "/root/.ssh/nixremote";
         system = "x86_64-linux";
         protocol = "ssh-ng";
 
@@ -43,6 +45,8 @@
       }
       {
         hostName = "lilith-pc-builder";
+        sshUser = "nixremote";
+        sshKey = "/root/.ssh/nixremote";
         system = "x86_64-linux";
         protocol = "ssh-ng";
 
@@ -56,6 +60,8 @@
       }
       {
         hostName = "lilith-pad-builder";
+        sshUser = "nixremote";
+        sshKey = "/root/.ssh/nixremote";
         system = "x86_64-linux";
         protocol = "ssh-ng";