From 1646eb1ef78ddb739883e4c275266428acb882ef Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Jun 2020 10:16:21 +1200 Subject: Add rbenv --- Makefile | 5 +++++ rbenv/profile.d/rbenv.sh | 5 +++++ rbenv/shrc.d/plenv.sh | 21 +++++++++++++++++++++ 3 files changed, 31 insertions(+) create mode 100644 rbenv/profile.d/rbenv.sh create mode 100644 rbenv/shrc.d/plenv.sh diff --git a/Makefile b/Makefile index 2377abdb..0613ea05 100644 --- a/Makefile +++ b/Makefile @@ -37,6 +37,7 @@ install-plenv \ install-psql \ install-pyenv \ + install-rbenv \ install-readline \ install-sh \ install-subversion \ @@ -538,6 +539,10 @@ install-pyenv: install-sh cp -p -- pyenv/profile.d/* $(HOME)/.profile.d cp -p -- pyenv/shrc.d/* $(HOME)/.shrc.d +install-rbenv: install-sh + cp -p -- rbenv/profile.d/* $(HOME)/.profile.d + cp -p -- rbenv/shrc.d/* $(HOME)/.shrc.d + install-readline: cp -p -- readline/inputrc $(HOME)/.inputrc diff --git a/rbenv/profile.d/rbenv.sh b/rbenv/profile.d/rbenv.sh new file mode 100644 index 00000000..52787b4d --- /dev/null +++ b/rbenv/profile.d/rbenv.sh @@ -0,0 +1,5 @@ +# Add rbenv to PATH and MANPATH if it appears to be in use +[ -d "$HOME"/.rbenv ] || return +PATH=$HOME/.rbenv/shims:$HOME/.rbenv/bin:$PATH +MANPATH=$HOME/.rbenv/versions/$(ruby -e 'print "#{ RUBY_VERSION }"')/man:$MANPATH +export MANPATH diff --git a/rbenv/shrc.d/plenv.sh b/rbenv/shrc.d/plenv.sh new file mode 100644 index 00000000..ed9ddd03 --- /dev/null +++ b/rbenv/shrc.d/plenv.sh @@ -0,0 +1,21 @@ +# POSIX-compatible version of the rbenv Bash shell wrapper +[ -d "$HOME"/.rbenv ] || return +rbenv() { + case $1 in + rehash) + shift + eval "$(rbenv sh-rehash "$@")" + ;; + sh-rehash) + command rbenv "$@" + ;; + shell) + shift + eval "$(rbenv sh-shell "$@")" + ;; + *) + command rbenv "$@" + rbenv rehash + ;; + esac +} -- cgit v1.2.3 From 8817941aeafdf9dbbcda35916c9863fd1a80abfb Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Jun 2020 10:18:58 +1200 Subject: Add mention of plenv,pyenv,rbenv config to README --- README.md | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/README.md b/README.md index 361dd191..130caa01 100644 --- a/README.md +++ b/README.md @@ -115,6 +115,13 @@ Configuration is included for: * [X11](https://www.x.org/wiki/)---Windowing system with network transparency for Unix +There is also some slightly customized support for multi-version environment +management for three major scripting languages: + +* [plenv](https://github.com/tokuhirom/plenv)---Perl +* [pyenv](https://github.com/pyenv/pyenv)---Python +* [rbenv](https://github.com/rbenv/rbenv)---Ruby + The configurations for shells, Mutt, tmux, and Vim are the most likely to be of interest. The i3 configuration is limited mainly to changing window switching key bindings to match Vim's. There are a fair few resources defined for -- cgit v1.2.3 From f01a17b6ec67735a923e661bfba478f68e97c6ae Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Jun 2020 11:23:29 +1200 Subject: Adjust layout of quote --- vim/vimrc | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/vim/vimrc b/vim/vimrc index 470b4cb1..1b123d1a 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -11,8 +11,8 @@ " │ Had heaven appeared so blue, nor earth so green, " │ For all my blood danced in me, and I knew " │ That I should light upon the Holy Grail. -" │ -" │ —Tennyson +" +" —Tennyson " " This file is an attempt at something like a “literate vimrc”, in the -- cgit v1.2.3 From 89a14628b4e7345ec00afe3290b816d0efca1721 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Jun 2020 11:23:39 +1200 Subject: Add a reader quote to vimrc --- vim/vimrc | 7 ++++++- 1 file changed, 6 insertions(+), 1 deletion(-) diff --git a/vim/vimrc b/vim/vimrc index 1b123d1a..4526dbc1 100644 --- a/vim/vimrc +++ b/vim/vimrc @@ -2,7 +2,7 @@ " Tom Ryder (tejr)’s Literate Vimrc " ━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━━ " -" Last updated: Mon, 01 Jun 2020 21:38:45 UTC +" Last updated: Sun, 07 Jun 2020 23:23:04 UTC " " │ And I was lifted up in heart, and thought " │ Of all my late-shown prowess in the lists, @@ -14,6 +14,11 @@ " " —Tennyson " +" │ your vimrc is better than the bible +" +" —@polanco@mastodon.sdf.org +" +" " This file is an attempt at something like a “literate vimrc”, in the " tradition of Donald Knuth’s “literate programming”: -- cgit v1.2.3 From f7835b821072b99f9264727b00cc22f42b91afa7 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Jun 2020 11:24:44 +1200 Subject: Bump VERSION --- VERSION | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/VERSION b/VERSION index 09b6f00f..e0bf6231 100644 --- a/VERSION +++ b/VERSION @@ -1,2 +1,2 @@ -tejr dotfiles v9.19.1 -Sun, 07 Jun 2020 21:27:28 +0000 +tejr dotfiles v9.20.0 +Sun, 07 Jun 2020 23:24:44 +0000 -- cgit v1.2.3 From f32c5e8931b50aee51edf8a54c42dfe4e3810c67 Mon Sep 17 00:00:00 2001 From: Tom Ryder Date: Mon, 8 Jun 2020 11:24:45 +1200 Subject: Update dotfiles(7) manual page --- man/man7/dotfiles.7df | 9 +++++++++ 1 file changed, 9 insertions(+) diff --git a/man/man7/dotfiles.7df b/man/man7/dotfiles.7df index f0e82fe2..40e4dedd 100644 --- a/man/man7/dotfiles.7df +++ b/man/man7/dotfiles.7df @@ -175,6 +175,15 @@ Vim (https://www.vim.org/)\[em]Vi IMproved, a text editor X11 (https://www.x.org/wiki/)\[em]Windowing system with network transparency for Unix .PP +There is also some slightly customized support for multi\-version +environment management for three major scripting languages: +.IP \[bu] 2 +plenv (https://github.com/tokuhirom/plenv)\[em]Perl +.IP \[bu] 2 +pyenv (https://github.com/pyenv/pyenv)\[em]Python +.IP \[bu] 2 +rbenv (https://github.com/rbenv/rbenv)\[em]Ruby +.PP The configurations for shells, Mutt, tmux, and Vim are the most likely to be of interest. The i3 configuration is limited mainly to changing window switching key -- cgit v1.2.3