mynix/system
1
1
Fork 0
Code Issues 2 Pull requests Activity

secrets: cosmetic changes

Browse source
This commit is contained in:
Dmitriy Pleshevskiy 2022-08-30 04:32:05 +03:00
parent 3d2c3f4d09
commit 8d06f1a71f
Signed by: pleshevskiy
GPG key ID: 1B59187B161C0215
5 changed files with 25 additions and 30 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

10
home/home.nix
View file

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

30
secrets.example.nix
View file

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

BIN
secrets.nix
View file

Binary file not shown.

6
system/configuration.nix
View file

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

9
system/machine/home/default.nix
View file

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