diff --git a/homeConfigurations/muede/default.nix b/homeConfigurations/muede/default.nix index 4847729..7b4b688 100644 --- a/homeConfigurations/muede/default.nix +++ b/homeConfigurations/muede/default.nix @@ -24,7 +24,6 @@ programs = { home-manager.enable = true; fzf.enable = true; - git-credential-oauth.enable = true; direnv = { enable = true; diff --git a/homeConfigurations/muede/git.nix b/homeConfigurations/muede/git.nix index ba7cd61..97c8477 100644 --- a/homeConfigurations/muede/git.nix +++ b/homeConfigurations/muede/git.nix @@ -1,27 +1,35 @@ { - config.programs.git = { - enable = true; - settings = { - user = { - name = "müde"; - email = "git@darkest.space"; + programs = { + git = { + enable = true; + settings = { + user = { + name = "müde"; + email = "git@darkest.space"; + }; + + aliases = { + prettylog = "log --pretty=oneline --graph"; + spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d"; + }; + + pull.ff = "only"; + merge.tool = "kdiff3"; + push.autoSetupRemote = "true"; + credential.credentialStore = "cache"; }; - aliases = { - prettylog = "log --pretty=oneline --graph"; - spring-clean = "!git branch --merged | xargs -n 1 -r git branch -d"; - }; - - pull.ff = "only"; - merge.tool = "kdiff3"; - push.autoSetupRemote = "true"; - credential.credentialStore = "cache"; + ignores = [ + ".direnv" + ".idea" + ".envrc" + ]; }; - ignores = [ - ".direnv" - ".idea" - ".envrc" - ]; + git-credential-oauth.enable = true; + gh = { + enable = true; + gitCredentialHelper.enable = true; + }; }; } diff --git a/homeModules/git.nix b/homeModules/git.nix index 5da1ba7..2c66c82 100644 --- a/homeModules/git.nix +++ b/homeModules/git.nix @@ -1,13 +1,6 @@ { - programs = { - git = { - enable = true; - settings.init.defaultBranch = "main"; - }; - - gh = { - enable = true; - gitCredentialHelper.enable = true; - }; + programs.git = { + enable = true; + settings.init.defaultBranch = "main"; }; }