diff options
Diffstat (limited to 'home')
| -rw-r--r-- | home/.config/X/resources | 2 | ||||
| -rw-r--r-- | home/.config/git/config | 9 | ||||
| -rw-r--r-- | home/.ssh/config | 3 | ||||
| -rw-r--r-- | home/.xsession | 7 |
4 files changed, 17 insertions, 4 deletions
diff --git a/home/.config/X/resources b/home/.config/X/resources index cfedf60b..f4603cd9 100644 --- a/home/.config/X/resources +++ b/home/.config/X/resources @@ -26,7 +26,7 @@ XTerm*VT100*translations: #override \n\ <Btn4Down>: scroll-back(1,line,m) \n\ <Btn5Down>: scroll-forw(1,line,m) -XTerm*faceName: Go Mono:size=11 +XTerm*faceName: Go Mono:size=12 XTerm*internalBorder: 6 XTerm*colorBDMode: true XTerm*scrollBar: false diff --git a/home/.config/git/config b/home/.config/git/config index 1a6d5ce1..c990de2c 100644 --- a/home/.config/git/config +++ b/home/.config/git/config @@ -2,6 +2,9 @@ name = June McEnroe email = june@causal.agency +[branch] + sort = committerdate + [commit] verbose = true @@ -12,6 +15,9 @@ [merge] conflictStyle = diff3 +[push] + autoSetupRemote = true + [pull] rebase = true @@ -21,5 +27,8 @@ [pretty] log = %Cred%h %Creset%s%C(yellow)%d %Cgreen(%ar) %Cblue<%aN> +[alias] + forgive = blame + [include] path = ./private diff --git a/home/.ssh/config b/home/.ssh/config index b2035a81..f579ae9f 100644 --- a/home/.ssh/config +++ b/home/.ssh/config @@ -1,9 +1,10 @@ IgnoreUnknown Include Include config_private +AddKeysToAgent yes SendEnv LANG LC_* -Host monday beastie puffy toaster tux progynova +Host tuesday beastie puffy toaster tux progynova HostName %h.local ForwardAgent yes RemoteForward 7062 127.0.0.1:7062 diff --git a/home/.xsession b/home/.xsession index a51d52f2..1e05126c 100644 --- a/home/.xsession +++ b/home/.xsession @@ -4,8 +4,11 @@ export LC_CTYPE=en_US.UTF-8 xset r rate 175 m 5/4 0 xmodmap ~/.config/X/modmap xrdb -load ~/.config/X/resources -xsetroot -bitmap /usr/X11R6/include/X11/bitmaps/xsnow \ - -bg rgb:14/13/0E -fg rgb:7A/49/55 + +fg=998D6B +command -v scheme && fg=$(scheme -p $(jot -r 1 1 8)) +xsetroot -bitmap /usr/X11R6/include/X11/bitmaps/escherknot \ + -bg '#14130E' -fg "#${fg}" xterm -name clock -geometry 14x1-0+0 -sl 0 -e clock & exec cwm -c ~/.config/cwm/cwmrc |