noah/dotfiles
1
0
Fork 0
mirror of https://github.com/nmasur/dotfiles synced 2025-10-28 12:53:16 +00:00
Code Issues Packages Projects Releases Wiki Activity

update git settings renamed options

Browse Source
This commit is contained in:
Noah Masur
2025-10-13 15:05:39 -04:00
parent a57207dd5d
commit 72c548e707
6 changed files with 12 additions and 10 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
platforms/home-manager/modules/nmasur/presets/programs/dotfiles.nix
View File

@@ -29,7 +29,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Always make the dotfiles directory considered safe for git and direnv # Always make the dotfiles directory considered safe for git and direnv
programs.git.extraConfig.safe.directory = cfg.path; programs.git.settings.safe.directory = cfg.path;
programs.direnv.config.whitelist.prefix = [ cfg.path ]; programs.direnv.config.whitelist.prefix = [ cfg.path ];
home.activation = { home.activation = {

4
platforms/home-manager/modules/nmasur/presets/programs/git-work.nix
View File

@@ -39,8 +39,8 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
programs.git = { programs.git = {
userName = lib.mkForce cfg.work.name; settings.user.name = lib.mkForce cfg.work.name;
userEmail = lib.mkForce cfg.work.email; settings.user.email = lib.mkForce cfg.work.email;
includes = [ includes = [
{ {
path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}"; path = "${config.home.homeDirectory}/${config.xdg.configFile."git/personal".target}";

8
platforms/home-manager/modules/nmasur/presets/programs/git/default.nix
View File

@@ -29,9 +29,11 @@ in
programs.git = { programs.git = {
enable = true; enable = true;
userName = cfg.name; settings = {
userEmail = cfg.email; user = {
extraConfig = { name = cfg.name;
email = cfg.email;
};
core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less --no-init"; core.pager = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight | less --no-init";
interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight"; interactive.difffilter = "${pkgs.git}/share/git/contrib/diff-highlight/diff-highlight";
pager = { pager = {

2
platforms/home-manager/modules/nmasur/presets/programs/helix.nix
View File

@@ -16,7 +16,7 @@ in
config = lib.mkIf cfg.enable { config = lib.mkIf cfg.enable {
# Use Neovim as the editor for git commit messages # Use Neovim as the editor for git commit messages
programs.git.extraConfig.core.editor = lib.mkForce "${lib.getExe pkgs.helix}"; programs.git.settings.core.editor = lib.mkForce "${lib.getExe pkgs.helix}";
programs.jujutsu.settings.ui.editor = lib.mkForce "${lib.getExe pkgs.helix}"; programs.jujutsu.settings.ui.editor = lib.mkForce "${lib.getExe pkgs.helix}";
# Set Neovim as the default app for text editing and manual pages # Set Neovim as the default app for text editing and manual pages

4
platforms/home-manager/modules/nmasur/presets/programs/jujutsu.nix
View File

@@ -20,8 +20,8 @@ in
# https://github.com/martinvonz/jj/blob/main/docs/config.md # https://github.com/martinvonz/jj/blob/main/docs/config.md
settings = { settings = {
user = { user = {
name = config.programs.git.userName; name = config.programs.git.settings.user.name;
email = config.programs.git.userEmail; email = config.programs.git.settings.user.email;
}; };
ui.paginate = "never"; ui.paginate = "never";

2
platforms/home-manager/modules/nmasur/presets/programs/neovim.nix
View File

@@ -38,7 +38,7 @@ in
); );
# Use Neovim as the editor for git commit messages # Use Neovim as the editor for git commit messages
programs.git.extraConfig.core.editor = "${lib.getExe cfg.package}"; programs.git.settings.core.editor = "${lib.getExe cfg.package}";
programs.jujutsu.settings.ui.editor = "${lib.getExe cfg.package}"; programs.jujutsu.settings.ui.editor = "${lib.getExe cfg.package}";
# Set Neovim as the default app for text editing and manual pages # Set Neovim as the default app for text editing and manual pages