diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index 0b129fd..a3d86ab 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -47,7 +47,7 @@ in {
         };
       };
 
-      logind.lidSwitch = "suspend";
+      logind.settings.Login.HandleLidSwitch = "suspend";
 
       printing = {
         enable = true;
diff --git a/home/git.nix b/home/git.nix
index 11a57ae..a70301c 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -17,19 +17,18 @@ in {
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
-
-      delta = {
-        enable = true;
-        options = {
-          syntax-theme = "Solarized (light)";
-        };
-      };
       lfs.enable = true;
 
-      userEmail = "antoine@alarsyo.net";
-      userName = "Antoine Martin";
-
-      extraConfig = {
+      settings = {
+        user = {
+          name = "Antoine Martin";
+          email = "antoine@alarsyo.net";
+        };
+        alias = {
+          push-wip = "push -o ci.skip";
+          push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
+          push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
+        };
         commit = {verbose = true;};
         core = {editor = "vim";};
         init = {defaultBranch = "main";};
@@ -38,12 +37,6 @@ in {
         maintenance.prefetch.enabled = false;
       };
 
-      aliases = {
-        push-wip = "push -o ci.skip";
-        push-merge = "push -o merge_request.create -o merge_request.merge_when_pipeline_succeeds -o merge_request.remove_source_branch";
-        push-mr = "push -o merge_request.create -o merge_request.remove_source_branch";
-      };
-
       includes = [
         {
           condition = "gitdir:~/work/lrde/";
@@ -64,5 +57,13 @@ in {
         "/.envrc"
       ];
     };
+
+    programs.delta = {
+      enable = true;
+      enableGitIntegration = true;
+      options = {
+        syntax-theme = "Solarized (light)";
+      };
+    };
   };
 }
diff --git a/home/ssh.nix b/home/ssh.nix
index 12e11a2..5182bbf 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -18,6 +18,7 @@ in {
   config = mkIf cfg.enable {
     programs.ssh = {
       enable = true;
+      enableDefaultConfig = false;
 
       matchBlocks = let
         addGPGAgentForwarding = hostConf:
diff --git a/hosts/talos/home.nix b/hosts/talos/home.nix
index 8a189d3..ae73edc 100644
--- a/hosts/talos/home.nix
+++ b/hosts/talos/home.nix
@@ -207,12 +207,12 @@ in {
   # FIXME: belongs elsewhere
   services = {
     logind = {
-      lidSwitch = "suspend";
-      lidSwitchExternalPower = "ignore";
-      extraConfig = ''
-        IdleAction=suspend
-        IdleActionSec=10min
-      '';
+      settings.Login = {
+        HandleLidSwitch = "suspend";
+        HandleLidSwitchExternalPower = "ignore";
+        IdleAction = "suspend";
+        IdleActionSec = "10min";
+      };
     };
     upower.enable = true;
   };
diff --git a/services/transmission.nix b/services/transmission.nix
index 8f29018..05d8821 100644
--- a/services/transmission.nix
+++ b/services/transmission.nix
@@ -1,6 +1,7 @@
 {
   config,
   lib,
+  pkgs,
   ...
 }: let
   inherit
@@ -47,6 +48,7 @@ in {
     services.transmission =
       {
         enable = true;
+        package = pkgs.transmission_4;
         group = "media";
 
         settings = {