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

refactor: do not hardcode username/email in sub modules

Browse Source
This commit is contained in:
Ryan Yin
2023-07-27 02:28:29 +08:00
parent 204cb03922
commit befddfe476
2 changed files with 10 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
flake.nix
View File

@@ -99,6 +99,9 @@
... ...
}: let }: let
username = "ryan"; username = "ryan";
userfullname = "Ryan Yin";
useremail = "xiaoyin_c@qq.com";
x64_system = "x86_64-linux"; x64_system = "x86_64-linux";
x64_darwin = "x86_64-darwin"; x64_darwin = "x86_64-darwin";
allSystems = [x64_system x64_darwin]; allSystems = [x64_system x64_darwin];
@@ -150,7 +153,7 @@
system = x64_system; system = x64_system;
specialArgs = specialArgs =
{ {
inherit username; inherit username userfullname useremail;
# use unstable branch for some packages to get the latest updates # use unstable branch for some packages to get the latest updates
pkgs-unstable = import nixpkgs-unstable { pkgs-unstable = import nixpkgs-unstable {
system = x64_system; # refer the `system` parameter form outer scope recursively system = x64_system; # refer the `system` parameter form outer scope recursively
@@ -199,6 +202,7 @@
system = x64_darwin; system = x64_darwin;
specialArgs = specialArgs =
{ {
inherit username userfullname useremail;
# use unstable branch for some packages to get the latest updates # use unstable branch for some packages to get the latest updates
pkgs-unstable = import nixpkgs-unstable { pkgs-unstable = import nixpkgs-unstable {
inherit system; # refer the `system` parameter form outer scope recursively inherit system; # refer the `system` parameter form outer scope recursively

7
home/base/server/git.nix
View File

@@ -2,6 +2,9 @@
config, config,
lib, lib,
pkgs, pkgs,
userfullname,
useremail,
... ...
}: { }: {
# `programs.git` will generate the config file: ~/.config/git/config # `programs.git` will generate the config file: ~/.config/git/config
@@ -16,8 +19,8 @@
enable = true; enable = true;
lfs.enable = true; lfs.enable = true;
userName = "Ryan Yin"; userName = userfullname;
userEmail = "xiaoyin_c@qq.com"; userEmail = useremail;
includes = [ includes = [
{ {