From e5a3fd3b8274a5a9024d7c76db1feb64ec130b73 Mon Sep 17 00:00:00 2001 From: Jeremy Kaplan Date: Mon, 23 Oct 2017 16:20:21 -0700 Subject: [PATCH] Add tako workon plugin --- .gitmodules | 2 +- tako/config.tako | 18 ------------------ tako/plugins | 2 +- zsh/.zshrc | 2 ++ 4 files changed, 4 insertions(+), 20 deletions(-) diff --git a/.gitmodules b/.gitmodules index 620f293..79c3b74 100644 --- a/.gitmodules +++ b/.gitmodules @@ -33,4 +33,4 @@ url = https://github.com/glts/vim-textobj-comment.git [submodule "tako/plugins"] path = tako/plugins - url = git@gitlab.com:adqm/tako-plugins.git + url = git@gitlab.com:jdkaplan/tako-plugins.git diff --git a/tako/config.tako b/tako/config.tako index e4ab115..cef82fd 100644 --- a/tako/config.tako +++ b/tako/config.tako @@ -16,7 +16,6 @@ source_many($HOME + '/.config/tako/completers', is_tako) $TAKO_SETTINGS.auto_pushd = True -$WORKON_HOME = $HOME + '/.virtualenvs' $XDG_CONFIG_HOME = $HOME + '/.config' $EDITOR = 'emacs' $VISUAL = $EDITOR @@ -30,22 +29,6 @@ for path in [ $LS_COLORS = $(dircolors @($HOME + '/.config/zsh/dircolors.256dark'))[len("LS_COLORS='"):-len("';\nexport LS_COLORS")] -def _workon(args, stdin=None): - if len(args) < 1: - return 'Need name of virtualenv\n' - - source_order = [ - 'preactivate', - 'activate', - 'postactivate', - ] - - for f in filter(os.path.isfile, [ - os.path.join($WORKON_HOME, args[0], 'bin', '{}.tako'.format(name)) - for name in source_order - ]): - source @(f) - def _sympy(args, stdin=None): source @($HOME + '/.config/tako/sympy.tako') @@ -66,7 +49,6 @@ $TAKO_SETTINGS.aliases.update({ 'units': 'units --verbose', 'trr': 'transmission-remote', 'vol': 'pulseaudio-ctl set', - 'workon': _workon, 'octave': 'octave-cli', 'bc': 'bc -l', 'sympy': _sympy, diff --git a/tako/plugins b/tako/plugins index a584be7..fce6d9e 160000 --- a/tako/plugins +++ b/tako/plugins @@ -1 +1 @@ -Subproject commit a584be73f8c40d7137eb0a1bfd5b59b4370462c2 +Subproject commit fce6d9e0072293802bb514acdabc2756013c7e2a diff --git a/zsh/.zshrc b/zsh/.zshrc index fc1d0c4..3d3fcee 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -77,3 +77,5 @@ eval $(dircolors $HOME/.config/zsh/dircolors.256dark) autoload -U select-word-style select-word-style bash + +eval "$(direnv hook zsh)"