Merge branch 'like-debian' of dotfiles/mac into master

.aliases

@@ -1,6 +1,15 @@
 #!/usr/bin/env bash
 
 
+git() {
+    if [[ $@ == "push origin master" ]]; then
+        echo "nope"
+    else
+        command git "$@"
+    fi
+}
+
+
 # lazy af
 alias mk='make'
 alias smk='snakemake'

.gitconfig

@@ -7,7 +7,7 @@
     clean = git-media-clean %f
     smudge = git-media-smudge %f
 [push]
-    default = matching
+    default = simple
 [alias]
 
     # courtesy of https://stackoverflow.com/a/34467298
@@ -27,6 +27,8 @@
     # View the current working tree status using the short format
     s = status -s
 
+    cdiff = diff --cached
+
     # Show the diff between the latest commit and the current state
     d = !"git diff-index --quiet HEAD -- || clear; git --no-pager diff --patch-with-stat"
 

.vimrc

@@ -170,20 +170,21 @@ set nosmartindent   " die die die
 "colorscheme solarized
 "
 "
-" 88, not 80
-set textwidth=88
+" 80 or 88, whatever
+set textwidth=80
 "
 " if you're curious about the reasoning behind B950, 
 " Bugbear's documentation explains it. The tl;dr is 
 " "it's like highway speed limits, we won't bother 
 " you if you overdo it by a few km/h".
 "
-" Turn character 88 red
+" Turn character 80/88 red
 " (for visibility conforming to
 "  coding standards)
 " https://stackoverflow.com/questions/23246962/vim-highlight-a-single-character-at-column-80#23247938
 hi Bang ctermfg=red guifg=red
-match Bang /\%>87v.*\%<89v/
+"match Bang /\%>87v.*\%<89v/
+match Bang /\%>79v.*\%<81v/
 
 " ------------------------
 "     End Lines & Tabs