noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2024-11-22 18:05:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

modify git config for work

Browse Source
This commit is contained in:
Noah Masur 2022-09-09 22:16:45 -04:00
parent 8fe3cffc9f
commit 2986ad06f5
4 changed files with 15 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

3
flake.nix
View File

@ -39,9 +39,10 @@
let let
# Global configuration for my systems # Global configuration for my systems
globals = { globals = rec {
user = "noah"; user = "noah";
fullName = "Noah Masur"; fullName = "Noah Masur";
gitName = fullName;
gitEmail = "7386960+nmasur@users.noreply.github.com"; gitEmail = "7386960+nmasur@users.noreply.github.com";
mailServer = "noahmasur.com"; mailServer = "noahmasur.com";
dotfilesRepo = "https://github.com/nmasur/dotfiles"; dotfilesRepo = "https://github.com/nmasur/dotfiles";

4
hosts/common.nix
View File

@ -8,6 +8,10 @@
type = types.str; type = types.str;
description = "Primary user of the system"; description = "Primary user of the system";
}; };
fullName = lib.mkOption {
type = lib.types.str;
description = "Human readable name of the user";
};
userDirs = { userDirs = {
# Required to prevent infinite recursion when referenced by himalaya # Required to prevent infinite recursion when referenced by himalaya
download = lib.mkOption { download = lib.mkOption {

8
hosts/macbook/default.nix
View File

@ -1,11 +1,15 @@
{ nixpkgs, darwin, home-manager, nur, globals, ... }: { nixpkgs, darwin, home-manager, nur, globals, ... }:
# System configuration for my MacBook # System configuration for my work MacBook
darwin.lib.darwinSystem { darwin.lib.darwinSystem {
system = "x86_64-darwin"; system = "x86_64-darwin";
specialArgs = { }; specialArgs = { };
modules = [ modules = [
(globals // { user = "Noah.Masur"; }) (globals // {
user = "Noah.Masur";
gitName = "Noah-Masur_1701";
gitEmail = "Noah.Masur@take2games.com";
})
home-manager.darwinModules.home-manager home-manager.darwinModules.home-manager
{ {
gui.enable = true; gui.enable = true;

6
modules/shell/git.nix
View File

@ -5,9 +5,9 @@ let home-packages = config.home-manager.users.${config.user}.home.packages;
in { in {
options = { options = {
fullName = lib.mkOption { gitName = lib.mkOption {
type = lib.types.str; type = lib.types.str;
description = "Human readable name of the user"; description = "Name to use for git commits";
}; };
gitEmail = lib.mkOption { gitEmail = lib.mkOption {
type = lib.types.str; type = lib.types.str;
@ -25,7 +25,7 @@ in {
home-manager.users.${config.user} = { home-manager.users.${config.user} = {
programs.git = { programs.git = {
enable = true; enable = true;
userName = config.fullName; userName = config.gitName;
userEmail = config.gitEmail; userEmail = config.gitEmail;
extraConfig = { extraConfig = {
pager = { branch = "false"; }; pager = { branch = "false"; };