diff --git a/hosts/mu/default.nix b/hosts/mu/default.nix index 6a997f4..6122906 100644 --- a/hosts/mu/default.nix +++ b/hosts/mu/default.nix @@ -6,7 +6,6 @@ ./hardware.nix ./fan.nix ./fish.nix - ./git.nix ./hosts.nix ./programs.nix ./sway.nix diff --git a/hosts/mu/git.nix b/hosts/mu/git.nix deleted file mode 100644 index 0fd2701..0000000 --- a/hosts/mu/git.nix +++ /dev/null @@ -1,15 +0,0 @@ -{ - home-manager, - lib, - ... -}: { - home-manager.users.caspervk = { - programs.git = { - userEmail = lib.mkForce "vk@magenta.dk"; - aliases = { - # https://docs.gitlab.com/ee/user/project/push_options.html - mr = "push --push-option=merge_request.create --push-option=merge_request.assign='vk'"; - }; - }; - }; -} diff --git a/modules/base/git.nix b/modules/base/git.nix index a16c1cc..f68d462 100644 --- a/modules/base/git.nix +++ b/modules/base/git.nix @@ -28,6 +28,11 @@ rebase.autoStash = true; rebase.updateRefs = true; }; + + aliases = { + # https://docs.gitlab.com/ee/user/project/push_options.html + mr = "push --push-option=merge_request.create --push-option=merge_request.assign='vk'"; + }; }; }; }