diff --git a/nixos/base.nix b/nixos/base.nix
index f65955c6..8b86d6f8 100644
--- a/nixos/base.nix
+++ b/nixos/base.nix
@@ -72,6 +72,7 @@ makeEnable config "myModules.base" true {
   services.locate.enable = true;
 
   virtualisation.docker.enable = true;
+  services.orca.enable = false;
 
   virtualisation.podman = {
     enable = true;
diff --git a/nixos/home-manager.nix b/nixos/home-manager.nix
index 6e4e0dfb..a344deb2 100644
--- a/nixos/home-manager.nix
+++ b/nixos/home-manager.nix
@@ -11,7 +11,22 @@
   programs.home-manager.enable = true;
 
   programs.ssh = {
-    forwardAgent = true;
+    enable = true;
+    enableDefaultConfig = false;
+    matchBlocks = {
+      "*" = {
+        forwardAgent = true;
+        addKeysToAgent = "no";
+        compression = false;
+        serverAliveInterval = 0;
+        serverAliveCountMax = 3;
+        hashKnownHosts = false;
+        userKnownHostsFile = "~/.ssh/known_hosts";
+        controlMaster = "no";
+        controlPath = "~/.ssh/master-%r@%n:%p";
+        controlPersist = "no";
+      };
+    };
   };
 
   services.gpg-agent = {
diff --git a/nixos/laptop.nix b/nixos/laptop.nix
index e274afb1..fd0a7c70 100644
--- a/nixos/laptop.nix
+++ b/nixos/laptop.nix
@@ -1,6 +1,4 @@
 { makeEnable, config, ... }:
 makeEnable config "myModules.laptop" true {
-  services.logind = {
-    lidSwitchExternalPower = "ignore";
-  };
+  services.logind.settings.Login.HandleLidSwitchExternalPower = "ignore";
 }
diff --git a/nixos/plasma.nix b/nixos/plasma.nix
index 6393f791..e4fa84c8 100644
--- a/nixos/plasma.nix
+++ b/nixos/plasma.nix
@@ -16,7 +16,5 @@ makeEnable config "myModules.plasma" true {
       # sddm-astronaut
     ];
   };
-  services.xserver = {
-    desktopManager.plasma6.enable = true;
-  };
+  services.desktopManager.plasma6.enable = true;
 }