From 4977ffacb017fe1ff5030eeeabe147ad242eb162 Mon Sep 17 00:00:00 2001 From: William Carroll Date: Sun, 24 Oct 2021 11:34:44 -0700 Subject: fix(wpcarro/simple_vim): Debug simple_vim No need to `mkDerivation` when I'm already using `writeShellScriptBin`. Also: prefer `` instead of `` for consistency reasons. Change-Id: Ida8ecec0bd4e3e8c0fbb1ea34eefd61a0fefb4bc Reviewed-on: https://cl.tvl.fyi/c/depot/+/4797 Tested-by: BuildkiteCI Reviewed-by: wpcarro Autosubmit: wpcarro --- users/wpcarro/tools/simple_vim/config.vim | 14 +++++++------- users/wpcarro/tools/simple_vim/default.nix | 10 ++-------- 2 files changed, 9 insertions(+), 15 deletions(-) (limited to 'users/wpcarro/tools/simple_vim') diff --git a/users/wpcarro/tools/simple_vim/config.vim b/users/wpcarro/tools/simple_vim/config.vim index ea40964ee803..6cc6729bc41e 100644 --- a/users/wpcarro/tools/simple_vim/config.vim +++ b/users/wpcarro/tools/simple_vim/config.vim @@ -48,13 +48,13 @@ nnoremap :wincmd l " nnoremap :wincmd k " nnoremap :wincmd l -" Use instead of G to support: -" 20 - to jump to line 20 -" d20 - to delete from the current line until line 20 -" 20 - to select from the current line until line 20 -nnoremap G -onoremap G -vnoremap G +" Use instead of G to support: +" 20 - to jump to line 20 +" d20 - to delete from the current line until line 20 +" 20 - to select from the current line until line 20 +nnoremap G +onoremap G +vnoremap G " Easily change modes on keyboards that don't have CapsLock mapped to inoremap jk diff --git a/users/wpcarro/tools/simple_vim/default.nix b/users/wpcarro/tools/simple_vim/default.nix index 6631fdfff5da..01b1d5d3fe08 100644 --- a/users/wpcarro/tools/simple_vim/default.nix +++ b/users/wpcarro/tools/simple_vim/default.nix @@ -1,11 +1,5 @@ { pkgs, ... }: -let - configVim = builtins.path { - path = ./config.vim; - name = "config.vim"; - }; - -in pkgs.writeShellScriptBin "simple_vim" '' - ${pkgs.vim}/bin/vim -u ${configVim} +pkgs.writeShellScriptBin "simple_vim" '' + ${pkgs.neovim}/bin/nvim -u ${./config.vim} $@ '' -- cgit 1.4.1