starred/nix-config
1
0
Fork 0
mirror of https://github.com/ryan4yin/nix-config.git synced 2026-04-25 02:08:29 +02:00
Code Issues Packages Projects Releases 10 Wiki Activity

refactor: username

Browse Source
This commit is contained in:
Ryan Yin
2023-12-25 11:31:18 +08:00
parent d2a1bb18eb
commit 3b548b581c
6 changed files with 21 additions and 34 deletions
Download Patch File Download Diff File Expand all files Collapse all files

13
hosts/fern/default.nix
View File

@@ -1,4 +1,4 @@
{username, ...} @ args: _:
############################################################# #############################################################
# #
# Fern - MacBook Pro 2022 13-inch M2 16G, mainly for business. # Fern - MacBook Pro 2022 13-inch M2 16G, mainly for business.
@@ -10,15 +10,4 @@ in {
networking.hostName = hostname; networking.hostName = hostname;
networking.computerName = hostname; networking.computerName = hostname;
system.defaults.smb.NetBIOSName = hostname; system.defaults.smb.NetBIOSName = hostname;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users."${username}" = {
home = "/Users/${username}";
description = username;
# set user's default shell back to zsh
# `chsh -s /bin/zsh`
# DO NOT change the system's default shell to nushell! it will break some apps!
# It's better to change only starship/alacritty/vscode's shell to nushell!
};
} }

13
hosts/harmonica/default.nix
View File

@@ -1,4 +1,4 @@
{username, ...} @ args: _:
############################################################# #############################################################
# #
# Harmonica - MacBook Pro 2020 13-inch i5 16G, mainly for personal use # Harmonica - MacBook Pro 2020 13-inch i5 16G, mainly for personal use
@@ -10,15 +10,4 @@ in {
networking.hostName = hostname; networking.hostName = hostname;
networking.computerName = hostname; networking.computerName = hostname;
system.defaults.smb.NetBIOSName = hostname; system.defaults.smb.NetBIOSName = hostname;
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users."${username}" = {
home = "/Users/${username}";
description = username;
# set user's default shell back to zsh
# `chsh -s /bin/zsh`
# DO NOT change the system's default shell to nushell! it will break some apps!
# It's better to change only starship/alacritty/vscode's shell to nushell!
};
} }

3
modules/base.nix
View File

@@ -1,5 +1,6 @@
{username, ...}: { {username, userfullname, ...}: {
users.users.${username} = { users.users.${username} = {
description = userfullname;
openssh.authorizedKeys.keys = [ openssh.authorizedKeys.keys = [
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDiipi59EnVbi6bK1bGrcbfEM263wgdNfbrt6VBC1rHx ryan@ai-idols" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDiipi59EnVbi6bK1bGrcbfEM263wgdNfbrt6VBC1rHx ryan@ai-idols"
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSfp/hvegbK04HykWvoY1EbDW+vXu1AlCjVivWE2ZeR ryan@shoukei" "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMSfp/hvegbK04HykWvoY1EbDW+vXu1AlCjVivWE2ZeR ryan@shoukei"

14
modules/darwin/default.nix
View File

@@ -1,9 +1,7 @@
{ {mylib, ...}: {
imports = [ imports =
../base.nix (mylib.scanPaths ./.)
./nix-core.nix ++ [
../base.nix
./apps.nix ];
./system.nix
];
} }

11
modules/darwin/users.nix Normal file
View File

@@ -0,0 +1,11 @@
{username, ...}: {
# Define a user account. Don't forget to set a password with ‘passwd’.
users.users."${username}" = {
home = "/Users/${username}";
# set user's default shell back to zsh
# `chsh -s /bin/zsh`
# DO NOT change the system's default shell to nushell! it will break some apps!
# It's better to change only starship/alacritty/vscode's shell to nushell!
};
}

1
modules/nixos/base/user-group.nix
View File

@@ -25,7 +25,6 @@
initialHashedPassword = "$7$CU..../....Sdl/JRH..9eIvZ6mE/52r.$xeR6lyvTcVVKt28Owcoc/vPOOECcYSiq1xjw/QCz2t0"; initialHashedPassword = "$7$CU..../....Sdl/JRH..9eIvZ6mE/52r.$xeR6lyvTcVVKt28Owcoc/vPOOECcYSiq1xjw/QCz2t0";
home = "/home/${username}"; home = "/home/${username}";
isNormalUser = true; isNormalUser = true;
description = username;
extraGroups = [ extraGroups = [
username username
"users" "users"