From 8d06f1a71f0a242450f26de148ad08f81c7656a7 Mon Sep 17 00:00:00 2001
From: Dmitriy Pleshevskiy <dmitriy@ideascup.me>
Date: Tue, 30 Aug 2022 04:32:05 +0300
Subject: [PATCH] secrets: cosmetic changes

---
 home/home.nix                   |  10 +++++-----
 secrets.example.nix             |  30 +++++++++++++-----------------
 secrets.nix                     | Bin 1619 -> 1601 bytes
 system/configuration.nix        |   6 +++---
 system/machine/home/default.nix |   9 ++++-----
 5 files changed, 25 insertions(+), 30 deletions(-)

diff --git a/home/home.nix b/home/home.nix
index 480e94b..48736bd 100644
--- a/home/home.nix
+++ b/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
diff --git a/secrets.example.nix b/secrets.example.nix
index 02e3606..ea4a460 100644
--- a/secrets.example.nix
+++ b/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";
     };
-  }
+  };
+}
diff --git a/secrets.nix b/secrets.nix
index b14ae77bc9a045284653f900414dc4b0f3ee35f4..1db197e798d357f08102606120376bbaac29d480 100644
GIT binary patch
literal 1601
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

literal 1619
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
R+0UssRo)B0(M6G+d<-3EA5H)O

diff --git a/system/configuration.nix b/system/configuration.nix
index 1438621..e7c8561 100644
--- a/system/configuration.nix
+++ b/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"
diff --git a/system/machine/home/default.nix b/system/machine/home/default.nix
index 044058d..8b2e4b6 100644
--- a/system/machine/home/default.nix
+++ b/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.