added git submodule

This commit is contained in:
Bryan Ramos 2026-03-09 17:36:32 -04:00
parent 8ecfea2ef5
commit 46d6f2825f
5 changed files with 15 additions and 44 deletions

3
.gitmodules vendored
View file

@ -4,3 +4,6 @@
[submodule "vim"] [submodule "vim"]
path = src/user/modules/utils/modules/vim/config path = src/user/modules/utils/modules/vim/config
url = https://github.com/itme-brain/vim.git url = https://github.com/itme-brain/vim.git
[submodule "git"]
path = src/user/modules/git/config
url = https://github.com/itme-brain/git.git

View file

@ -17,14 +17,6 @@ in
keys = import ./keys; keys = import ./keys;
groups = [ "wheel" "networkmanager" "home-manager" "input" ]; groups = [ "wheel" "networkmanager" "home-manager" "input" ];
gitConfig = optionalAttrs modules.git.enable {
userName = "Bryan Ramos";
userEmail = email;
signing = optionalAttrs modules.security.gpg.enable {
key = "F1F3466458452B2DF351F1E864D12BA95ACE1F2D";
signByDefault = true;
};
};
bookmarks = import ./bookmarks; bookmarks = import ./bookmarks;
}; };
}; };

@ -0,0 +1 @@
Subproject commit b20a21f87988793b2601ec9053871fcd47bdbb99

View file

@ -10,48 +10,23 @@ in
programs = { programs = {
git = { git = {
enable = true; enable = true;
package = pkgs.gitSVN; };
settings = {
init = { defaultBranch = "master"; };
#format = { pretty = "oneline"; };
#log = { abbrevCommit = true; };
mergetool = {
vimdiff = {
trustExitCode = true;
};
keepBackup = false;
};
merge = {
tool = "vimdiff";
};
safe = {
directory = [
"/etc/nixos"
"/boot"
];
};
};
ignores = [
"node_modules"
".direnv"
"dist-newstyle"
".nuxt/"
".output/"
"dist"
"result"
];
} // config.user.gitConfig;
gh = { gh = {
enable = true; enable = true;
settings.git_protocol = "ssh"; settings.git_protocol = "ssh";
}; };
}; };
home.packages = with pkgs; [ home = {
git-crypt packages = with pkgs; [
]; git-crypt
];
file.".config/git" = {
source = ./config;
recursive = true;
};
};
programs.bash.initExtra = import ./config/bashScripts/cdg.nix; programs.bash.initExtra = import ./scripts/cdg.nix;
}; };
} }