diff --git a/.config/git/config b/.config/git/config deleted file mode 100644 index 9802b84..0000000 --- a/.config/git/config +++ /dev/null @@ -1,18 +0,0 @@ -[user] - email = jordan@vimium.com - name = Jordan Holt - signingkey = B8CFFF61F1CCF520 -[rebase] - autosquash = true -[commit] - gpgsign = true -[push] - default = current -[pull] - rebase = true -[alias] - amend = commit --amend - lg = log --color --graph --abbrev-commit -- - ls = ls-files - unadd = reset HEAD - undo-commit = reset --soft "HEAD^" diff --git a/modules/default.nix b/modules/default.nix index 9c1db55..8cd0f94 100644 --- a/modules/default.nix +++ b/modules/default.nix @@ -7,7 +7,7 @@ ./editors/vscode.nix ./security/gpg.nix ./security/pass.nix - ./shell/git.nix + ./shell/git ./shell/zsh ]; } \ No newline at end of file diff --git a/modules/shell/git.nix b/modules/shell/git/default.nix similarity index 91% rename from modules/shell/git.nix rename to modules/shell/git/default.nix index ac1c883..e8e129f 100644 --- a/modules/shell/git.nix +++ b/modules/shell/git/default.nix @@ -30,5 +30,9 @@ in { pull.rebase = true; }; }; + + home.configFile = { + "git/ignore".source = ./ignore; + }; }; } \ No newline at end of file diff --git a/.config/git/ignore b/modules/shell/git/ignore similarity index 100% rename from .config/git/ignore rename to modules/shell/git/ignore