secrets: cosmetic changes

home/home.nix

@@ -8,8 +8,8 @@ in
 
   # Home Manager needs a bit of information about you and the
   # paths it should manage.
-  home.username = secrets.user.name;
-  home.homeDirectory = secrets.user.dir;
+  home.username = secrets.userName;
+  home.homeDirectory = secrets.userDir;
 
   home.keyboard = {
     model = "pc105";
@@ -64,10 +64,10 @@ in
   progs = {
     alacritty.enable = true;
 
-    git = with secrets.git; {
+    git = {
       enable = true;
-      gpgKey = gpgSigningKey;
-      inherit userName userEmail;
+      gpgKey = secrets.gpgSigningKey;
+      inherit (secrets) userName userEmail;
     };
 
     # password manager

secrets.example.nix

@@ -3,23 +3,19 @@
     127.0.0.2 other-localhost
   '';
 
-  user = {
-    name = "Bob";
-    dir = "/home/bob";
-  };
+  realName = "Bob";
+  userName = "bob";
+  userDir = "/home/bob";
+  userEmail = "bob@example.com";
 
-  git = {
-    userName = "Bob Ross";
-    userEmail = "bross@example.com";
-    # gpg --list-secret-keys
-    gpgSigningKey = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX"
-      };
+  # gpg --list-secret-keys
+  gpgSigningKey = "XXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXXX";
 
-    emailAccounts = {
-      "personal" = {
-        flavor = "yandex.com";
-        address = "bross@yandex.ru";
-        passwordCommand = "pass show emails/bross@yandex.ru";
-      };
+  emailAccounts = {
+    "personal" = {
+      flavor = "yandex.com";
+      address = "bross@yandex.ru";
+      passwordCommand = "pass show emails/bross@yandex.ru";
     };
-  }
+  };
+}

system/configuration.nix

@@ -74,10 +74,10 @@ in
   programs.zsh.enable = true;
 
   # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.me = with secrets.user; {
+  users.users.me = {
     isNormalUser = true;
-    inherit name;
-    home = dir;
+    name = secrets.userName;
+    home = secrets.userDir;
     extraGroups = [
       "wheel" # Enable ‘sudo’ for the user.
       "networkmanager"

system/machine/home/default.nix

@@ -4,11 +4,10 @@ let
   secrets = import ../../../secrets.nix;
 in
 {
-  imports =
-    [
-      # Include the results of the hardware scan.
-      ./hardware-configuration.nix
-    ];
+  imports = [
+    # Include the results of the hardware scan.
+    ./hardware-configuration.nix
+  ];
 
   boot = {
     # Use the GRUB 2 boot loader.