2 files changed, 8 insertions, 13 deletions
diff --git a/home/common/modules/git.nix b/home/common/modules/git.nix
index 3f8a98e..077ee1d 100644
--- a/home/common/modules/git.nix
+++ b/home/common/modules/git.nix
@@ -1,15 +1,16 @@
 { config, ... }:
 let
-  userName = config.global.userdata.nameFq;
-  userEmail = config.global.userdata.email;
+  name = config.global.userdata.nameFq;
+  email = config.global.userdata.email;
 in
 {
   programs.git = {
     enable = true;
-    inherit userName;
-    inherit userEmail;
-
-    extraConfig = {
+    settings = {
+      user = {
+        inherit name;
+        inherit email;
+      };
       color.ui = "auto";
       init.defaultBranch = "master";
     };
diff --git a/home/wayland/modules/sway/swayidle.nix b/home/wayland/modules/sway/swayidle.nix
index d9ff473..b7d7d26 100644
--- a/home/wayland/modules/sway/swayidle.nix
+++ b/home/wayland/modules/sway/swayidle.nix
@@ -57,13 +57,7 @@ in
   services.swayidle = {
     enable = true;
     systemdTarget = "sway-session.target";
-
-    events = [
-      {
-        event = "before-sleep";
-        command = swaylock;
-      }
-    ];
+    events."before-sleep" = swaylock;
 
     timeouts = [
       {