diff --git a/.gitmodules b/.gitmodules index 13076d8..c27e9ae 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "vim"] path = src/user/modules/utils/modules/vim/config url = https://github.com/itme-brain/vim.git +[submodule "git"] + path = src/user/modules/git/config + url = https://github.com/itme-brain/git.git diff --git a/src/user/config/default.nix b/src/user/config/default.nix index d5b9059..3740db7 100644 --- a/src/user/config/default.nix +++ b/src/user/config/default.nix @@ -17,14 +17,6 @@ in keys = import ./keys; 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; }; }; diff --git a/src/user/modules/git/config b/src/user/modules/git/config new file mode 160000 index 0000000..b20a21f --- /dev/null +++ b/src/user/modules/git/config @@ -0,0 +1 @@ +Subproject commit b20a21f87988793b2601ec9053871fcd47bdbb99 diff --git a/src/user/modules/git/default.nix b/src/user/modules/git/default.nix index b03a23c..ec54b88 100644 --- a/src/user/modules/git/default.nix +++ b/src/user/modules/git/default.nix @@ -10,48 +10,23 @@ in programs = { git = { 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 = { enable = true; settings.git_protocol = "ssh"; }; }; - home.packages = with pkgs; [ - git-crypt - ]; + home = { + 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; }; } diff --git a/src/user/modules/git/config/bashScripts/cdg.nix b/src/user/modules/git/scripts/cdg.nix similarity index 100% rename from src/user/modules/git/config/bashScripts/cdg.nix rename to src/user/modules/git/scripts/cdg.nix