From 59f136495fdc6d7b8911348659a62c1e43494b60 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 14 Jun 2014 16:27:43 +0200 Subject: [PATCH 1/7] Added jedi to vim plugins on 2014-06-11 --- .vimrc | 2 ++ 1 file changed, 2 insertions(+) diff --git a/.vimrc b/.vimrc index 2027f5d..6129340 100644 --- a/.vimrc +++ b/.vimrc @@ -17,6 +17,8 @@ Plugin 'mhinz/vim-signify' Plugin 'tpope/vim-sensible' " Nice colour scheme Plugin 'jnurmine/Zenburn.git' +" Python autocompletion +Plugin 'davidhalter/jedi-vim' " All of your Plugins must be added before the following line call vundle#end() " required From 14d1ec042c894180efaf17060bb246b15861b720 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sat, 14 Jun 2014 17:08:29 +0200 Subject: [PATCH 2/7] Handy wrapper around bpython --- .bash_aliases | 11 +++++++++++ 1 file changed, 11 insertions(+) diff --git a/.bash_aliases b/.bash_aliases index 42cb842..e9e866f 100644 --- a/.bash_aliases +++ b/.bash_aliases @@ -46,3 +46,14 @@ function fuck() { echo ; echo " (╯°□°）╯︵$(echo "$2"|toilet -f term -F rotate)"; echo fi } + +#20140614 wrapper around bpython to load the virtualenv's python path +bpython() { + if test -n "$VIRTUAL_ENV" + then + PYTHONPATH="$(python -c 'import sys; print ":".join(sys.path)')" \ + command bpython "$@" + else + command bpython "$@" + fi +} From 482f5c6d1e6a76b84a7708dfa604815e973dcfc7 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 15 Jun 2014 11:28:54 +0200 Subject: [PATCH 3/7] If privdotfiles is available, add its bin dir to PATH --- .bashrc | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/.bashrc b/.bashrc index 12dee5a..57092dd 100644 --- a/.bashrc +++ b/.bashrc @@ -119,4 +119,8 @@ if [ -f /etc/bash_completion ] && ! shopt -oq posix; then . /etc/bash_completion fi +if [ -x ~/.privdotfiles/bin ]; then + PATH=$PATH:~/.privdotfiles/bin +fi + PATH=$PATH:/usr/local/bin/android-sdk-linux/platform-tools From 1e2d963805e97560c73b7b5c4bec8b8251f94114 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 15 Jun 2014 11:52:40 +0200 Subject: [PATCH 4/7] Nice vim plugins --- .vimrc | 7 +++++++ 1 file changed, 7 insertions(+) diff --git a/.vimrc b/.vimrc index 6129340..6d6843e 100644 --- a/.vimrc +++ b/.vimrc @@ -19,6 +19,13 @@ Plugin 'tpope/vim-sensible' Plugin 'jnurmine/Zenburn.git' " Python autocompletion Plugin 'davidhalter/jedi-vim' +" Handy Markdown stuff +Plugin 'tpope/vim-markdown' +" Pandoc, for stuff like autocompletion of citations from bibtex, other LaTeX +" stuff +Plugin 'vim-pandoc/vim-pandoc' +" Distraction-free writing, start with V (\V) +Plugin 'mikewest/vimroom' " All of your Plugins must be added before the following line call vundle#end() " required From 6442cc247ee845a1e1ec71f5a578552de9cb3a53 Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 15 Jun 2014 13:39:11 +0200 Subject: [PATCH 5/7] Fix shift with Function keys in tmux for at least shift+F6 --- .terminfo/s/screen-256color | Bin 0 -> 1555 bytes .tmux.conf | 3 +++ 2 files changed, 3 insertions(+) create mode 100644 .terminfo/s/screen-256color diff --git a/.terminfo/s/screen-256color b/.terminfo/s/screen-256color new file mode 100644 index 0000000000000000000000000000000000000000..bd01662b0123ba43bea73d56b774f27863b6969c GIT binary patch literal 1555 zcmcIjJxo(k6h5~xqDH~RM0p8mOl|@~$@}e3p0h)@d>2WT`P6k6yX?c=u;1{W7i zG)BXqtBaG9iGzc2ad2>Q(8L&xiIbC)@p;a9kAwyWWAL@-JKy=vx#!+{+Se*Np#?uV z@i9=Hs$??7kZy&iO8HV{z5nvn;3#Xs<(!iZVj{?yDuCcGIV55j4#7!q_jo|Kn*ayk zAXc1$HjvQ4bs>mD5A?wxMoAb$yap3619O}$LKzlejrmQ+TW}lhA$tg0@EH9QcnZ(p zIpFG4}cn=@o6MTX1@B@CrF9?Vx;krlBj*Anb6+Jy|;f2Y3xyyMV6_8-A@zxVILf7NN+KkN0tqkxhghbA}%N?PV*S(DSYEbDT* zf`T!NFrcI_p&LXa-%vCFN2mfVp<8);EpUyQMXjjliQPC_^ z(prQu$`~WmRpv|)Qhlg}DWdumULbWIgM^k>;_S1^IZ!SlH&7;>XoI(_o2u+nbsxl$VVd>bKw25j+4Ug(bO^+H#BOW!8TGB31 zaZEbRGSeb$PzK;Ibar-ig+krksyZ<-IXN>kJDbhsa&vR@^Z9(CP%M^8}k%IfOcTCKLeUaxP^NX9{F@AYPGQmoU=(>il4V(S!X^gl6Twi%<}k;lRZ xuSM(ftaJ<>fXtAqX<^o49AG{qr)9>7+LrBA+0??jx4+!nW4Wd_tT!9h{{f!}85IBk literal 0 HcmV?d00001 diff --git a/.tmux.conf b/.tmux.conf index b10938d..7628329 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -70,5 +70,8 @@ bind C-a last-window # Bigger history set -g history-limit 10000 +# Fix for shift-keys with Fn; needs correct terminfo too +setw -g xterm-keys on + # Local config if-shell "[ -f ~/.tmux.conf.user ]" 'source ~/.tmux.conf.user' From c83f2043a3d3ab952b0840bd06bd996a8ffb1c5c Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 15 Jun 2014 13:42:57 +0200 Subject: [PATCH 6/7] Explanation about the keycode fix --- README.md | 4 ++++ 1 file changed, 4 insertions(+) diff --git a/README.md b/README.md index a15d33a..dfb21f8 100644 --- a/README.md +++ b/README.md @@ -6,3 +6,7 @@ After having my homedirs in subversion for years, move to Git. ``` sh install.sh ``` + +# Fix for shift+F6 in tmux (and screen probably) + +In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compile the file with tic. This will result in `~/.terminfo/s/screen-256color` with the correct keycode for shift+F6. From 9052efb7d481aa2e7abe63d3c4b884ce2f7c1b2d Mon Sep 17 00:00:00 2001 From: Michiel Scholten Date: Sun, 15 Jun 2014 13:43:56 +0200 Subject: [PATCH 7/7] Explanation about the keycode fix, tmux config part --- README.md | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/README.md b/README.md index dfb21f8..eb64985 100644 --- a/README.md +++ b/README.md @@ -9,4 +9,4 @@ sh install.sh # Fix for shift+F6 in tmux (and screen probably) -In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compile the file with tic. This will result in `~/.terminfo/s/screen-256color` with the correct keycode for shift+F6. +In tmux, do `infocmp > screen-256color`. Add the line `kf16=\E[17;2~,` and compile the file with tic. This will result in `~/.terminfo/s/screen-256color` with the correct keycode for shift+F6. `.tmux.conf` needs the line `setw -g xterm-keys on` for it to register correctly.