--- a/agignore Wed Dec 19 13:59:04 2018 -0500
+++ b/agignore Wed Dec 19 14:07:58 2018 -0500
@@ -6,3 +6,6 @@
*.private.key
*.pgp
*.fasl
+*.dx64fsl
+*.lx64fsl
+*.pyc
--- a/ffignore Wed Dec 19 13:59:04 2018 -0500
+++ b/ffignore Wed Dec 19 14:07:58 2018 -0500
@@ -10,3 +10,6 @@
\btags.bak$
\.meta$
\.fasl$
+\.dx64fsl$
+\.lx64fsl$
+\.pyc$
--- a/gitconfig Wed Dec 19 13:59:04 2018 -0500
+++ b/gitconfig Wed Dec 19 14:07:58 2018 -0500
@@ -15,8 +15,6 @@
make-the-fucking-branch-point-at-the-fucking-commit = "!sh -c 'git checkout $1 && git reset --hard $2' -"
root = rev-parse --show-toplevel
- graft = cherry-pick -x
-
l = log -18 --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
ll = log --color=always --all --topo-order --pretty='format:%Cgreen%h%Creset %s%Cred%d%Creset %C(black bold)(by %an)%Creset'
gl = log -12 --color=always --all --graph --topo-order --pretty='format:%Cgreen%h%Creset %s %C(black bold)(by %an)%Creset%C(yellow bold)%d%Creset%n'
@@ -37,7 +35,6 @@
d = "!sh -c 'git diff $* | nvim -R -' -"
di = !git diff --cached | nvim -R -
- ; dl = !git diff $* | nvim -R -c 'set ft=diff' -
dl = "!f() { git diff \"$@\" | nvim -R -c 'set ft=diff' -; }; f"
co = checkout
@@ -67,7 +64,7 @@
fu = fetch upstream
po = push origin
- ; lo = pull origin
+ pu = push upstream
mo = !git merge --no-ff origin/`git currentbranch`
mu = !git merge --no-ff upstream/`git currentbranch`
@@ -77,7 +74,6 @@
fuu = "!sh -c 'git fu && git uu' -"
fuo = "!sh -c 'git fo && git uo' -"
- fuum = "!sh -c 'git co master && git fuu' -"
addremove = !git add . && git add -u
addrem = !git addremove
--- a/gitignore Wed Dec 19 13:59:04 2018 -0500
+++ b/gitignore Wed Dec 19 14:07:58 2018 -0500
@@ -14,4 +14,5 @@
.notmylispwords
.*.done
*.lx64fsl
+*.dx64fsl
.sjl-rsync-exclude
--- a/hgignore Wed Dec 19 13:59:04 2018 -0500
+++ b/hgignore Wed Dec 19 14:07:58 2018 -0500
@@ -7,3 +7,4 @@
*.fasl
*.dx64fsl
*.lx64fsl
+.notmylispwords
--- a/hgrc Wed Dec 19 13:59:04 2018 -0500
+++ b/hgrc Wed Dec 19 14:07:58 2018 -0500
@@ -29,11 +29,9 @@
delay = 1.0
[web]
-# cacerts = /etc/hg-dummy-cert.pem
cacerts =
[schemes]
-webf = ssh://sjl@sjl.webfactional.com/repos/
bbs = ssh://hg@bitbucket.org/
gh = git://github.com/
ghs = git+ssh://git@github.com/
@@ -45,8 +43,6 @@
[extdiff]
cmd.vd = nvim
opts.vd = -c 'set lines=70' -c 'set columns=240' '+next' '+execute "DirDiff" argv(0) argv(1)'
-cmd.ksdiff = /usr/local/bin/ksdiff
-opts.ksdiff = --changeset --wait --filelist
[merge-tools]
splice.executable = nvim
@@ -62,9 +58,6 @@
keepthis.args = -c 'cp "$other" "$output.incoming" && cp "$local" "$output"'
keepthis.premerge = True
-kal.executable = /usr/local/bin/ksdiff
-kal.args = --merge --output $output --base $base -- $local $other
-
unityyamlmerge.executable = /Applications/Unity/Unity.app/Contents/Tools/UnityYAMLMerge
unityyamlmerge.args = merge -p --force $base $other $local $output
unityyamlmerge.checkprompt = True
@@ -75,7 +68,6 @@
**.unity = unityyamlmerge
**.prefab = unityyamlmerge
-
[email]
method = smtp
from = Steve Losh <steve@stevelosh.com>
@@ -83,11 +75,12 @@
[subrepos]
git:allowed = true
-[smtp]
-host = smtp.gmail.com
-port = 587
-username = steve@stevelosh.com
-tls = True
+# TODO: Fastmail
+# [smtp]
+# host = smtp.gmail.com
+# port = 587
+# username = steve@stevelosh.com
+# tls = True
[color]
status.modified = cyan
@@ -121,17 +114,10 @@
st = status -SC
? = summary
fdiff = diff -U 10000000000000
-qfdiff = qdiff -U 10000000000000
# Push to the git mirror at the same time.
pg = !"$HG" push; "$HG" push git
-# Push the qparent revision (mnemonic: q push parent).
-qpp = push -r qparent
-
-# Merge with default.
-md = merge default
-
# Commit message shortcuts.
cm = commit -m
cus = commit -m 'Update subrepository state.'
@@ -153,11 +139,6 @@
# Run a colored diff and pipe it to less.
dl = !"$HG" diff -p --color=never $@ | nvim -R -c 'set ft=diff' -
-# Kaleidoscope
-# Mnemonics: "kaleidoscope diff" and "kaleidoscope show"
-kd = !/opt/local/bin/hg ksdiff $@
-ks = !/opt/local/bin/hg ksdiff -c $@
-
# Log shortcuts --------------------------------------------------------------------
#
# Each of these can be used with -v to add a bit more info.
@@ -184,7 +165,7 @@
i, = incoming --graph --style=$HOME/src/dotfiles/mercurial/templates/map-cmdline.sglog
# Incoming and Outgoing all in one
-inout = !figlet incoming | lolcat; "$HG" incoming $@; figlet outgoing | lolcat; echo; "$HG" outgoing $@
+inout = !heading smallslant incoming; "$HG" incoming $@; heading smallslant outgoing; "$HG" outgoing $@
# hg n . -- show a summary of rev . without diff.
# hg show . -- show a summary of rev . with diff.
@@ -197,40 +178,6 @@
# Simple glog command that doesn't look bad and doesn't require my CLI templates.
gl = glog -l10 --template='\033[0;33m{rev}\033[0m {desc|firstline|strip} \033[0;35m{branches}\033[0m \033[0;33m{tags}\033[0m\n\033[1;30m({date|age} by {author|person})\033[0m\n\n'
-# Make a new repo with some sensible defaults.
-mkrepo = !$HG init $1 && cd $1 && \
- echo 'syntax: glob' > .hgignore && \
- echo '' >> .hgignore && \
- echo '.DS_Store' >> .hgignore && \
- echo '*.pyc' >> .hgignore && \
- echo '*.swp' >> .hgignore && \
- echo '*.swo' >> .hgignore && \
- echo '*.un~' >> .hgignore && \
- echo '.ropeproject' >> .hgignore && \
- echo 'tags' >> .hgignore && \
- echo "[paths]\n" >> .hg/hgrc
-
-# Empty the current MQ patch.
-qempty = !$HG qrefresh -X `$HG root`
-
-# Commit under any applied MQ patches, and go back to where you were after doing so.
-# `hg ciunder` will use `$EDITOR` to get the commit message
-# `hg cmunder 'message'` takes it on the command line
-ciunder = !HG_CUR_PATCH=`$HG qtop --color=never` && \
- $HG qnew temp-for-under && \
- $HG qpop -a && \
- $HG qpush --move temp-for-under && \
- $HG qrefresh -e && \
- $HG qfinish temp-for-under && \
- $HG qpush $HG_CUR_PATCH
-cmunder = !HG_CUR_PATCH=`$HG qtop --color=never` && \
- $HG qnew temp-for-under && \
- $HG qpop -a && \
- $HG qpush --move temp-for-under && \
- $HG qrefresh -m "$@" && \
- $HG qfinish temp-for-under && \
- $HG qpush $HG_CUR_PATCH
-
# Edit the current repo's hgrc file.
erc = !$EDITOR `$HG root`/.hg/hgrc
@@ -242,35 +189,6 @@
vshow = !$HG show $@ --color=never | nvim -c 'setlocal buftype=nofile ft=diff' -
vdiff = !$HG diff -p --color=always $@ | nvim -c ':AnsiEsc' -c 'setlocal buftype=nofile' -
-# Ack for non-ignored files
-ack = !$HG locate "set:not ignored()" | xargs ack $@
-grep-wdir = !$HG locate "set:not ignored()" | xargs grep $@
-
-# Run hg commands on all subrepos at once.
-subs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs -n1 -I SUB $HG -R "`$HG root`/SUB" $@
-psubs = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB $HG -R "`$HG root`/SUB" $@
-
-# Run shell commands on all subrepos at once.
-subscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | xargs -n1 -I SUB sh -c "cd `$HG root`/SUB && $@"
-psubscmd = !"$HG" debugsub | grep '^path' | cut -d' ' -f2 | parallel -j10 -I SUB sh -c "cd `$HG root`/SUB && $@"
-
-# Run a command on a subrepo:
-#
-# hg sub SUBREPO_REGEX ...command and arguments...
-#
-# The SUBREPO_REGEX should be a regex that will let grep match one and only one of
-# the subrepos in .hgsub. For example:
-#
-# $ cat .hgsub
-# bundled/foo = ...
-# bundled/bar = ...
-#
-# $ hg sub fo root
-# .../bundled/foo
-# $ hg sub ar status -m
-# M lol.py
-sub = !grep = "`$HG root`/.hgsub" | cut -d' ' -f1 | grep "$1" | tr -d '\n ' | xargs -0 -I SUB $HG -R SUB $2 $3 $4 $5 $6 $7 $8 $9 $10 $11 $12 $13 $14 $15 $16 $17 $18 $19 $20
-
git-hash = log --template '{gitnode}' --rev
# Local settings
--- a/ideavimrc Wed Dec 19 13:59:04 2018 -0500
+++ /dev/null Thu Jan 01 00:00:00 1970 +0000
@@ -1,28 +0,0 @@
-set gdefault
-set surround
-set hlsearch
-set incsearch
-set ignorecase
-set smartcase
-
-noremap H ^
-noremap L $
-vnoremap L g_
-noremap s :w<cr>
-nnoremap ,<space> :noh<cr>
-
-nnoremap <Space> za
-vnoremap <Space> za
-nnoremap zO zczO
-
-nnoremap <cr> o<esc>
-nnoremap K :q<cr>
-nnoremap ,v <c-w>v
-nnoremap ,s <c-w>s
-
-nnoremap <c-h> <c-w>h
-nnoremap <c-j> <c-w>j
-nnoremap <c-k> <c-w>k
-nnoremap <c-l> <c-w>l
-
-nnoremap <tab> %