summary refs log tree commit diff stats
path: root/user/modules/git.nix
diff options
context:
space:
mode:
authorAlan Pearce2019-10-08 21:44:57 +0200
committerAlan Pearce2019-10-08 21:44:57 +0200
commit0a50d682ec85bf023bebd68a3ca388001f0c0677 (patch)
tree3f725c5a36633ec5b59df37f156a03ee2a971656 /user/modules/git.nix
parent40fd4964068d0b7628b6f699dab4aec200eadb0a (diff)
downloadnixfiles-0a50d682ec85bf023bebd68a3ca388001f0c0677.tar.lz
nixfiles-0a50d682ec85bf023bebd68a3ca388001f0c0677.tar.zst
nixfiles-0a50d682ec85bf023bebd68a3ca388001f0c0677.zip
mv modules settings
Diffstat (limited to 'user/modules/git.nix')
-rw-r--r--user/modules/git.nix77
1 files changed, 0 insertions, 77 deletions
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.*"
-      "*~"
-      "\#*\#"
-      ".\#*"
-    ];
-  };
-}