users/infinidoge(refactor): nest more definitions

users/infinidoge/default.nix

@@ -27,13 +27,11 @@ in
       ])
     ];
 
-
-    programs.git = {
+    programs = {
+      git = {
         userEmail = "infinidoge@doge-inc.net";
         userName = "Infinidoge";
       };
-
-    programs = {
       firefox = {
         enable = true;
       };
@@ -78,9 +76,8 @@ in
     shellAliases = {
       lsdisk = "lsblk -o name,size,mountpoint,fstype,label,uuid,fsavail,fsuse%";
     };
-  };
 
-  environment.variables.EDITOR =
+    variables.EDITOR =
       let
         editorScript = pkgs.writeScriptBin "emacseditor" ''
           #!${pkgs.runtimeShell}
@@ -92,6 +89,7 @@ in
         '';
       in
       (lib.mkOverride 900 "${editorScript}/bin/emacseditor");
+  };
 
   programs = {
     dconf.enable = true;