Fix some broken configs

1 files changed, 4 insertions, 10 deletions

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";