From bdba40b2386ba4c07f1fe5fdc2283f94301a05bb Mon Sep 17 00:00:00 2001 From: Ben Sima Date: Fri, 18 May 2018 15:26:43 -0700 Subject: Fix some broken configs --- home.nix | 14 ++++---------- 1 file changed, 4 insertions(+), 10 deletions(-) (limited to 'home.nix') diff --git a/home.nix b/home.nix index a2e9e72..e563a85 100644 --- a/home.nix +++ b/home.nix @@ -44,14 +44,9 @@ userEmail = "ben@bsima.me"; extraConfig = '' [push] - default = simple -[branch "master] - remote = upstream - merge = refs/heads/master -[remote] - pushDefault = origin +default = simple [commit] - template = ~/.config/nixpkgs/git-commit-template +template = ~/.config/nixpkgs/git-commit-template ''; }; @@ -64,11 +59,10 @@ f = "fasd -f"; # file sd = "fasd -sid"; # interactive directory selection sf = "fasd -sif"; # interactive file selection - z = "fasd_cd -d"; # cd, same functionality as j in autojump - zz = "fasd_cd -d -i"; # cd with interactive selection + #z = "fasd_cd -d"; # cd, same functionality as j in autojump + #zz = "fasd_cd -d -i"; # cd with interactive selection g = "grep -in"; rm = "rm -i"; - myip = "ifconfig | grep 'inet ' | grep -v 127.0.0.1 | cut -d\ -f10"; ddate = "date +%Y.%m.%d"; tdate = "date +%Y.%m.%d..%H.%M"; ttime = "date +%H.%M"; -- cgit v1.2.3