diff --git a/hosts/froidmpa-laptop/default.nix b/hosts/froidmpa-laptop/default.nix
index e746bab..ac04f3c 100644
--- a/hosts/froidmpa-laptop/default.nix
+++ b/hosts/froidmpa-laptop/default.nix
@@ -80,6 +80,7 @@
       }
     ];
   };
+  services.logind.settings.Login.HandleLidSwitch = "ignore";
   users.users.${config.user.name} = {
     openssh.authorizedKeys.keyFiles = [
       ../../ssh_keys/phfroidmont-desktop.pub
diff --git a/hosts/froidmpa-laptop/hardware-configuration.nix b/hosts/froidmpa-laptop/hardware-configuration.nix
index c895068..06c9403 100644
--- a/hosts/froidmpa-laptop/hardware-configuration.nix
+++ b/hosts/froidmpa-laptop/hardware-configuration.nix
@@ -55,6 +55,4 @@
 
   services.blueman.enable = true;
 
-  services.logind.lidSwitch = "ignore";
-
 }
diff --git a/hosts/stellaris/default.nix b/hosts/stellaris/default.nix
index fa8fa4b..d918c1a 100644
--- a/hosts/stellaris/default.nix
+++ b/hosts/stellaris/default.nix
@@ -53,7 +53,7 @@
 
   services.blueman.enable = true;
 
-  services.logind.lidSwitch = "ignore";
+  services.logind.settings.Login.HandleLidSwitch = "ignore";
 
   user.name = "phfroidmont";
 
diff --git a/modules/desktop/default.nix b/modules/desktop/default.nix
index da0d443..238a041 100644
--- a/modules/desktop/default.nix
+++ b/modules/desktop/default.nix
@@ -79,6 +79,19 @@ in
         };
         ssh = {
           enable = true;
+          enableDefaultConfig = false;
+          matchBlocks."*" = {
+            forwardAgent = false;
+            addKeysToAgent = "no";
+            compression = false;
+            serverAliveInterval = 0;
+            serverAliveCountMax = 3;
+            hashKnownHosts = false;
+            userKnownHostsFile = "~/.ssh/known_hosts";
+            controlMaster = "no";
+            controlPath = "~/.ssh/master-%r@%n:%p";
+            controlPersist = "no";
+          };
           extraConfig = ''
             # Force IPv4 otherwise git will try to use IPv6 which doesn't play well through a VPN
             AddressFamily inet
diff --git a/modules/desktop/wm.nix b/modules/desktop/wm.nix
index e339563..c04fae6 100644
--- a/modules/desktop/wm.nix
+++ b/modules/desktop/wm.nix
@@ -163,10 +163,9 @@ in
             };
           };
 
-          gestures = {
-            workspace_swipe = true;
-            workspace_swipe_fingers = 3;
-          };
+          gesture = [
+            "3, horizontal, workspace"
+          ];
 
           animations = {
             enabled = true;
diff --git a/modules/editor/vim/lua/plugins/treesitter.lua b/modules/editor/vim/lua/plugins/treesitter.lua
index 924a8a6..563b468 100644
--- a/modules/editor/vim/lua/plugins/treesitter.lua
+++ b/modules/editor/vim/lua/plugins/treesitter.lua
@@ -3,6 +3,7 @@ return {
     "nvim-treesitter/nvim-treesitter",
     opts = {
       auto_install = false,
+      sync_install = false,
       ensure_installed = {},
       parser_install_dir = vim.fs.joinpath(vim.fn.stdpath('data'), 'site'),
     },