diff options
author | Tom Ryder <tom@sanctum.geek.nz> | 2017-10-28 15:02:43 +1300 |
---|---|---|
committer | Tom Ryder <tom@sanctum.geek.nz> | 2017-10-28 15:02:43 +1300 |
commit | 45ca5d95d610e44fa4728a0374024300bbb025d0 (patch) | |
tree | f0ef90c4e095cc0693bd2253326d9d3bbe7172e7 | |
parent | Merge branch 'master' into port/sunos/illumos/openindiana (diff) | |
download | dotfiles-45ca5d95d610e44fa4728a0374024300bbb025d0.tar.gz dotfiles-45ca5d95d610e44fa4728a0374024300bbb025d0.zip |
Merge branch 'master' into port/sunos/illumos/openindiana
-rw-r--r-- | IDEAS.md (renamed from IDEAS.markdown) | 4 | ||||
-rw-r--r-- | ISSUES.md (renamed from ISSUES.markdown) | 0 | ||||
-rw-r--r-- | README.md (renamed from README.markdown) | 2 | ||||
-rw-r--r-- | TABS.md | 26 | ||||
-rw-r--r-- | man/man1/murl.1df | 2 | ||||
-rw-r--r-- | man/man7/dotfiles.7df | 2 | ||||
-rw-r--r-- | sh/shrc.d/ls.sh | 10 |
7 files changed, 41 insertions, 5 deletions
diff --git a/IDEAS.markdown b/IDEAS.md index 544530e3..bba9e314 100644 --- a/IDEAS.markdown +++ b/IDEAS.md @@ -1,8 +1,8 @@ Ideas ===== -* A wrapper ksw(1df) (kill-switch) that caches SIGINT traps to kill a called - program or loop immediately rather than aborting a loop (is this possible?) +* A wrapper ksw(1df) (kill-switch) that traps SIGINT to kill a called program + or loop immediately, rather than aborting a loop (is this possible?) * A wrapper sil(1df) or nec(1df) to turn stty -echo off for the duration of a paste? * I can probably share my psql() completions/shortcuts after sanitizing them diff --git a/ISSUES.markdown b/ISSUES.md index 48007919..48007919 100644 --- a/ISSUES.markdown +++ b/ISSUES.md diff --git a/README.markdown b/README.md index adc4c73a..f1b254f0 100644 --- a/README.markdown +++ b/README.md @@ -143,7 +143,7 @@ A terminal session with my prompt looks something like this: ~$ ssh remote remote:~$ cd .dotfiles remote:~/.dotfiles(master+!)$ git status - M README.markdown + M README.md M bash/bashrc.d/prompt.bash A init remote:~/.dotfiles(master+!)$ foobar diff --git a/TABS.md b/TABS.md new file mode 100644 index 00000000..feeee631 --- /dev/null +++ b/TABS.md @@ -0,0 +1,26 @@ +Spaces to tabs +============== + +If you prefer tabs to spaces, the following recipe seems to convert everything +pretty nicely: + + $ find . -name .git -prune -o -name vim -prune -o -type f \ + -exec sh -c \ + 'for f;do unexpand -t4 "$f">"$f".tmp;mv "$f" "$f".tmp;done' \ + _ {} + + + $ find vim -name bundle -prune -o -type f \ + -exec sh -c \ + 'for f;do unexpand -t2 "$f">"$f".tmp;mv "$f" "$f".tmp;done' \ + _ {} + + +If you have GNU unexpand(1) and can add `--first-only` to each of those calls, +the results seem perfect. + +You can configure Vim to accommodate this by removing the settings for: + +* `expandtab` +* `shiftround` +* `shiftwidth` +* `smarttab` +* `softtabstop` diff --git a/man/man1/murl.1df b/man/man1/murl.1df index f022152b..088158b0 100644 --- a/man/man1/murl.1df +++ b/man/man1/murl.1df @@ -4,7 +4,7 @@ \- convert Markdown to HTML with pandoc(1) and extract URLs from it with hurl(1df) .SH SYNOPSIS .B murl -README.markdown +README.md .br .B murl page1.md page2.md diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index 831af06d..5538fdd2 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -209,7 +209,7 @@ A terminal session with my prompt looks something like this: ~$\ ssh\ remote remote:~$\ cd\ .dotfiles remote:~/.dotfiles(master+!)$\ git\ status -\ M\ README.markdown +\ M\ README.md M\ \ bash/bashrc.d/prompt.bash A\ \ init remote:~/.dotfiles(master+!)$\ foobar diff --git a/sh/shrc.d/ls.sh b/sh/shrc.d/ls.sh index d58c64f9..7e843cc7 100644 --- a/sh/shrc.d/ls.sh +++ b/sh/shrc.d/ls.sh @@ -33,6 +33,16 @@ ls() { [ -e "$HOME"/.cache/sh/opt/ls/time-style ] && set -- --time-style='+%Y-%m-%d %H:%M:%S' "$@" + # If the operating system is FreeBSD, there are some specific options we + # can add that might mean different things to e.g. GNU ls(1) + case $OS in + FreeBSD) + # -D: Timestamp format + # -G: Use color + set -- -D '%Y-%m-%d %H:%M:%S' -G "$@" + ;; + esac + # Run ls(1) with the concluded arguments command ls "$@" } |