From 317c7664d6be59d599071f56f15d9d87fed19ad6 Mon Sep 17 00:00:00 2001
From: willow <42willow@pm.me>
Date: Mon, 29 Jun 2026 20:53:03 +1000
Subject: [PATCH] treewide: avoid repeated keys in attribute sets

---
 hosts/earthy/default.nix                      | 42 +++++++++----------
 modules/darwin/desktop/aerospace.nix          | 10 +++--
 modules/shared/home/programs/cli/git.nix      |  8 ++--
 .../home/programs/tui/helix/default.nix       |  8 ++--
 4 files changed, 37 insertions(+), 31 deletions(-)

diff --git a/hosts/earthy/default.nix b/hosts/earthy/default.nix
index 13eba60..62d2b05 100644
--- a/hosts/earthy/default.nix
+++ b/hosts/earthy/default.nix
@@ -16,13 +16,6 @@
     };
   };
 
-  services.openssh = {
-    enable = true;
-    settings = {
-      PermitRootLogin = "yes";
-    };
-  };
-
   # samba
   environment.systemPackages = [pkgs.cifs-utils];
   fileSystems."/mnt/nas" = {
@@ -34,21 +27,28 @@
     in ["${automount_opts},credentials=${config.age.secrets.samba.path}"];
   };
 
-  # tlp
-  services.tlp = {
-    enable = true;
-    settings = {
-      CPU_ENERGY_PERF_POLICY_AC = "performance";
-      CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
-      PLATFORM_PROFILE_ON_AC = "performance";
-      PLATFORM_PROFILE_ON_BAT = "low-power";
-      WIFI_PWR_ON_AC = "off"; # default: off
-      WIFI_PWR_ON_BAT = "off"; # default: on  todo)) trying to resolve samba frozen unit session slice issue
+  services = {
+    openssh = {
+      enable = true;
+      settings = {
+        PermitRootLogin = "yes";
+      };
     };
-  };
 
-  # fwupd
-  services.fwupd = {
-    enable = true;
+    tlp = {
+      enable = true;
+      settings = {
+        CPU_ENERGY_PERF_POLICY_AC = "performance";
+        CPU_ENERGY_PERF_POLICY_ON_BAT = "balance_power";
+        PLATFORM_PROFILE_ON_AC = "performance";
+        PLATFORM_PROFILE_ON_BAT = "low-power";
+        WIFI_PWR_ON_AC = "off"; # default: off
+        WIFI_PWR_ON_BAT = "off"; # default: on  todo)) trying to resolve samba frozen unit session slice issue
+      };
+    };
+
+    fwupd = {
+      enable = true;
+    };
   };
 }
diff --git a/modules/darwin/desktop/aerospace.nix b/modules/darwin/desktop/aerospace.nix
index 3f53c09..996f86e 100644
--- a/modules/darwin/desktop/aerospace.nix
+++ b/modules/darwin/desktop/aerospace.nix
@@ -4,10 +4,12 @@
 
     settings = {
       gaps = {
-        outer.left = 8;
-        outer.bottom = 8;
-        outer.top = 8;
-        outer.right = 8;
+        outer = {
+          left = 8;
+          bottom = 8;
+          top = 8;
+          right = 8;
+        };
       };
       mode.main.binding =
         {
diff --git a/modules/shared/home/programs/cli/git.nix b/modules/shared/home/programs/cli/git.nix
index c305148..dcc29d2 100644
--- a/modules/shared/home/programs/cli/git.nix
+++ b/modules/shared/home/programs/cli/git.nix
@@ -13,8 +13,11 @@ in {
       lfs.enable = true;
 
       settings = {
-        user.name = "willow";
-        user.email = "42willow" + "@" + "pm.me";
+        user = {
+          name = "willow";
+          email = "42willow" + "@" + "pm.me";
+          signingkey = osConfig.age.secrets.gh.path;
+        };
 
         alias = {
           co = "checkout";
@@ -51,7 +54,6 @@ in {
         # commit signing
         commit.gpgsign = true;
         gpg.format = "ssh";
-        user.signingkey = osConfig.age.secrets.gh.path;
         gpg.ssh.allowedSignersFile = "${config.home.homeDirectory}/.ssh/allowed_signers";
       };
     };
diff --git a/modules/shared/home/programs/tui/helix/default.nix b/modules/shared/home/programs/tui/helix/default.nix
index 5bc45b4..c7c7115 100644
--- a/modules/shared/home/programs/tui/helix/default.nix
+++ b/modules/shared/home/programs/tui/helix/default.nix
@@ -9,9 +9,11 @@
 in {
   config = lib.mkIf (cfg.tui.enable
     && cfg.categories.core.enable) {
-    xdg.configFile.".prettierrc.json".text = builtins.toJSON (import ./prettier.nix {inherit pkgs;});
-    xdg.configFile.".dprint.jsonc".text = builtins.toJSON (import ./dprint.nix {inherit pkgs;});
-    xdg.configFile."moxide/settings.toml".source = ./moxide.toml;
+    xdg.configFile = {
+      ".prettierrc.json".text = builtins.toJSON (import ./prettier.nix {inherit pkgs;});
+      ".dprint.jsonc".text = builtins.toJSON (import ./dprint.nix {inherit pkgs;});
+      "moxide/settings.toml".source = ./moxide.toml;
+    };
 
     programs.helix = {
       enable = true;