coalescing code for imports

platforms/home-manager/modules/nmasur/presets/programs/git-work.nix

@@ -27,10 +27,12 @@ in
       name = lib.mkOption {
         type = lib.types.str;
         description = "Name to use for personal git commits";
+        default = config.nmasur.presets.programs.git.name;
       };
       email = lib.mkOption {
         type = lib.types.str;
         description = "Email to use for personal git commits";
+        default = config.nmasur.presets.programs.git.email;
       };
     };
   };

platforms/home-manager/modules/nmasur/presets/services/mbsync/mbsync.nix

@@ -6,7 +6,7 @@
 }:
 
 let
-  inherit (config.nmasur.settings) fullName hostnames;
+  inherit (config.nmasur.settings) username fullName hostnames;
   cfg = config.nmasur.presets.services.mbsync;
 in
 
@@ -17,10 +17,12 @@ in
     user = lib.mkOption {
       type = lib.types.str;
       description = "User name for the email address.";
+      default = username;
     };
     server = lib.mkOption {
       type = lib.types.str;
       description = "Server name for the email address.";
+      default = hostnames.mail;
     };
     imapHost = lib.mkOption {
       type = lib.types.str;

platforms/home-manager/theme.nix

@@ -1,4 +1,4 @@
-{ lib, ... }:
+{ lib, colorscheme, ... }:
 
 {
 
@@ -11,7 +11,7 @@
     colors = lib.mkOption {
       type = lib.types.attrs;
       description = "Base16 color scheme.";
-      default = (import ../../colorscheme/gruvbox).dark;
+      default = colorscheme.gruvbox.dark;
     };
     mode = lib.mkOption {
       type = lib.types.enum [

platforms/nixos/modules/nmasur/presets/services/audiobookshelf.nix

@@ -1,7 +1,7 @@
 {
   config,
   lib,
-  globals,
+  hostnames,
   ...
 }:
 
@@ -30,7 +30,7 @@ in
     # Allow web traffic to Caddy
     nmasur.presets.services.caddy.routes = [
       {
-        match = [ { host = [ globals.hostnames.audiobooks ]; } ];
+        match = [ { host = [ hostnames.audiobooks ]; } ];
         handle = [
           {
             handler = "reverse_proxy";
@@ -41,7 +41,7 @@ in
     ];
 
     # Configure Cloudflare DNS to point to this machine
-    services.cloudflare-dyndns.domains = [ globals.hostnames.audiobooks ];
+    services.cloudflare-dyndns.domains = [ hostnames.audiobooks ];
 
   };
 

platforms/nixos/modules/nmasur/settings.nix

@@ -1,4 +1,8 @@
-{ lib, hostnames, ... }:
+{
+  lib,
+  hostnames,
+  ...
+}:
 
 {
   options.nmasur.settings = {