diff --git a/modules/cli/direnv.nix b/modules/cli/direnv.nix
index 5853c4a..75231cd 100644
--- a/modules/cli/direnv.nix
+++ b/modules/cli/direnv.nix
@@ -4,6 +4,6 @@
   home-manager.users.moritz.programs.direnv = {
     enable = true;
     enableZshIntegration = true;
-    nix-direnv = { enable = true; };
+    nix-direnv.enable = true;
   };
 }
diff --git a/modules/cli/git.nix b/modules/cli/git.nix
index bb7df1b..b2eb65d 100644
--- a/modules/cli/git.nix
+++ b/modules/cli/git.nix
@@ -6,7 +6,7 @@
       enable = true;
       userName = "MoritzBoehme";
       userEmail = "mr.x@moritzboeh.me";
-      extraConfig = { init.defaultBranch = "main"; };
+      extraConfig.init.defaultBranch = "main";
       delta.enable = true;
     };
   };
diff --git a/modules/services/default.nix b/modules/services/default.nix
index 01139b6..d6fc2a4 100644
--- a/modules/services/default.nix
+++ b/modules/services/default.nix
@@ -11,9 +11,11 @@
   ];
 
   services = {
-    printing.enable = true;
-    printing.drivers = with pkgs; [ epson-escpr2 epson-escpr ];
     avahi = {
+    printing = {
+      enable = true;
+      drivers = with pkgs; [ epson-escpr2 epson-escpr ];
+    };
       enable = true;
       nssmdns = true;
     };
@@ -22,7 +24,7 @@
       alsa.enable = true;
       pulse.enable = true;
     };
-    redshift = { enable = true; };
+    redshift.enable = true;
   };
   location = {
     latitude = 52.3;
diff --git a/modules/services/kdeconnect.nix b/modules/services/kdeconnect.nix
index d8e9df7..4177e77 100644
--- a/modules/services/kdeconnect.nix
+++ b/modules/services/kdeconnect.nix
@@ -4,9 +4,8 @@ let
     from = 1714;
     to = 1764;
   };
-in
-{
-  home-manager.users.moritz.services = { kdeconnect.enable = true; };
+in {
+  home-manager.users.moritz.services.kdeconnect.enable = true;
   networking.firewall = {
     allowedTCPPortRanges = [ ports ];
     allowedUDPPortRanges = [ ports ];