From 0a50d682ec85bf023bebd68a3ca388001f0c0677 Mon Sep 17 00:00:00 2001 From: Alan Pearce Date: Tue, 8 Oct 2019 21:44:57 +0200 Subject: mv modules settings --- user/modules/git.nix | 77 ---------------------------------------------------- 1 file changed, 77 deletions(-) delete mode 100644 user/modules/git.nix (limited to 'user/modules/git.nix') diff --git a/user/modules/git.nix b/user/modules/git.nix deleted file mode 100644 index 503b9e3f..00000000 --- a/user/modules/git.nix +++ /dev/null @@ -1,77 +0,0 @@ -{ config, pkgs, ... }: - -{ - home.packages = with pkgs; [ - gitAndTools.git-extras - ]; - programs.git = { - enable = true; - userName = "Alan Pearce"; - userEmail = "alan@alanpearce.eu"; - extraConfig = { - pull = { - rebase = true; - }; - push = { - default = "current"; - followTags = true; - }; - rebase = { - autosquash = true; - }; - rerere = { - enable = true; - }; - diff = { - algorithm = "patience"; - tool = "icdiff"; - }; - difftool = { - prompt = false; - }; - "difftool.icdiff" = { - cmd = "${pkgs.icdiff}/bin/icdiff --line-numbers $LOCAL $REMOTE"; - }; - "difftool.sopsdiffer" = { - textconf = "${pkgs.sops}/bin/sops -d"; - }; - "merge.npm-merge-driver" = { - name = "automatically merge npm lockfiles"; - driver = "npx npm-merge-driver merge %A %O %B %P"; - }; - remote = { - autoSetupMerge = true; - }; - "branch.master" = { - rebase = false; - }; - }; - signing = { - key = "0xCD4BEB92A8D46583"; - }; - lfs = { - enable = true; - }; - aliases = { - authors = "shortlog -s -n"; - mup = "merge FETCH_HEAD"; - rup = "rebase FETCH_HEAD"; - st = "status -sb"; - ci = "commit"; - br = "branch"; - co = "checkout"; - lasttag = "!sh -c 'git tag --sort=version:refname | grep \"^v\\\\?[0-9]\" | tail -n1'"; - pending = "!sh -c 'git log --oneline --grep=\"#\" ...$(git lasttag)'"; - lg = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset'"; - prl = "log --pretty=format:'%Cred%h%Creset -%Creset %s %Cgreen(%cr) %C(bold blue)<%an> %Cred%d%Creset' --grep='#'"; - ignored = "ls-files --others -i --exclude-standard"; - }; - ignores = [ - ".DS_Store" - "*_flymake.*" - "*~" - "\#*\#" - ".\#*" - ]; - }; -} -- cgit 1.4.1