diff --git a/base/gui-programs.nix b/base/gui-programs.nix
index a3d86ab..0b129fd 100644
--- a/base/gui-programs.nix
+++ b/base/gui-programs.nix
@@ -47,7 +47,7 @@ in {
         };
       };
 
-      logind.settings.Login.HandleLidSwitch = "suspend";
+      logind.lidSwitch = "suspend";
 
       printing = {
         enable = true;
diff --git a/home/git.nix b/home/git.nix
index a70301c..11a57ae 100644
--- a/home/git.nix
+++ b/home/git.nix
@@ -17,18 +17,19 @@ in {
   config = mkIf cfg.enable {
     programs.git = {
       enable = true;
+
+      delta = {
+        enable = true;
+        options = {
+          syntax-theme = "Solarized (light)";
+        };
+      };
       lfs.enable = true;
 
-      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";
-        };
+      userEmail = "antoine@alarsyo.net";
+      userName = "Antoine Martin";
+
+      extraConfig = {
         commit = {verbose = true;};
         core = {editor = "vim";};
         init = {defaultBranch = "main";};
@@ -37,6 +38,12 @@ 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/";
@@ -57,13 +64,5 @@ in {
         "/.envrc"
       ];
     };
-
-    programs.delta = {
-      enable = true;
-      enableGitIntegration = true;
-      options = {
-        syntax-theme = "Solarized (light)";
-      };
-    };
   };
 }
diff --git a/home/ssh.nix b/home/ssh.nix
index 5182bbf..12e11a2 100644
--- a/home/ssh.nix
+++ b/home/ssh.nix
@@ -18,7 +18,6 @@ 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 ae73edc..7327495 100644
--- a/hosts/talos/home.nix
+++ b/hosts/talos/home.nix
@@ -207,9 +207,9 @@ in {
   # FIXME: belongs elsewhere
   services = {
     logind = {
+      lidSwitch = "suspend";
+      lidSwitchExternalPower = "ignore";
       settings.Login = {
-        HandleLidSwitch = "suspend";
-        HandleLidSwitchExternalPower = "ignore";
         IdleAction = "suspend";
         IdleActionSec = "10min";
       };
diff --git a/services/transmission.nix b/services/transmission.nix
index 05d8821..8f29018 100644
--- a/services/transmission.nix
+++ b/services/transmission.nix
@@ -1,7 +1,6 @@
 {
   config,
   lib,
-  pkgs,
   ...
 }: let
   inherit
@@ -48,7 +47,6 @@ in {
     services.transmission =
       {
         enable = true;
-        package = pkgs.transmission_4;
         group = "media";
 
         settings = {