diff --git a/nvim/plugin/editing.vim b/nvim/plugin/editing.vim
index 416d073..f0af3ab 100644
--- a/nvim/plugin/editing.vim
+++ b/nvim/plugin/editing.vim
@@ -78,13 +78,7 @@ set commentstring=//%s
   nmap <silent> <leader>] m'yygccp`'j
   nmap <silent> <leader>[ m'yygccP`'k
 
-  function! PutOutput(cmd)
-    let output = execute(a:cmd)
-    execute "noswapfile pedit" "+" . fnameescape("setlocal buftype=nofile bufhidden=wipe nobuflisted noswapfile") fnameescape("preview://" . a:cmd)
-    wincmd P
-    call setline(1, split(output, "\n"))
-  endfunction
-  command! -nargs=+ -complete=command PutOutput silent call PutOutput(<q-args>)
+  command! -nargs=+ -complete=command PutOutput execute 'put =execute(' . escape(string(<q-args>), '|"') . ')'
 
   " ,c is easier to type than "+ because it doesn't require pressing Shift
   noremap <leader>c "+
diff --git a/zsh/env.zsh b/zsh/env.zsh
index 895a982..34e23a0 100644
--- a/zsh/env.zsh
+++ b/zsh/env.zsh
@@ -34,6 +34,3 @@ export HOMEBREW_NO_AUTO_UPDATE=1
 
 # https://github.com/junegunn/fzf/blob/764316a53d0eb60b315f0bbcd513de58ed57a876/src/tui/tui.go#L496-L515
 export FZF_DEFAULT_OPTS="--color=16 --height=40% --reverse"
-
-# <https://github.com/sharkdp/bat#8-bit-themes>
-export BAT_THEME="base16-256"
diff --git a/zsh/plugins.zsh b/zsh/plugins.zsh
index 1472428..c557f6e 100644
--- a/zsh/plugins.zsh
+++ b/zsh/plugins.zsh
@@ -14,16 +14,13 @@ _plugin completions-rustc 'https://raw.githubusercontent.com/rust-lang/zsh-confi
 _plugin completions-cargo 'https://raw.githubusercontent.com/rust-lang/cargo/master/src/etc/_cargo' from=url \
   after_load='plugin-cfg-path fpath prepend ""'
 
-rustup_bin="${commands[rustup]}"
-if [[ -n "$rustup_bin" ]]; then
-  rustup_comp_path="${ZSH_CACHE_DIR}/site-functions/_rustup"
-  if [[ "$rustup_bin" -nt "$rustup_comp_path" || ! -s "$rustup_comp_path" ]]; then
-    _perf_timer_start "generate rustup completions"
-    "$rustup_bin" completions zsh >| "$rustup_comp_path"
-    _perf_timer_stop "generate rustup completions"
-  fi
-  unset rustup_comp_path
+rustup_comp_path="${ZSH_CACHE_DIR}/site-functions/_rustup"
+if [[ "${commands[rustup]}" -nt "$rustup_comp_path" || ! -s "$rustup_comp_path" ]]; then
+  _perf_timer_start "generate rustup completions"
+  rustup completions zsh >| "$rustup_comp_path"
+  _perf_timer_stop "generate rustup completions"
 fi
+unset rustup_comp_path
 
 # compinit {{{
   _perf_timer_start "compinit"