feat: setup nonest_nvim, YankAppend, and terminal integrations

Author: adamtabrams

CHANGELOG.md

@@ -6,6 +6,16 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 
 ## [Unreleased]
 
+## [0.9.0] - 2020-12-20
+### Added
+- Setup nonest_nvim to prevent nested Neovim instances!
+- Added YankAppend function to neovim with the `gy` mapping.
+- Added neovim integrations with lf and lazygit.
+
+### Fixed
+- Improved lf configs to switch to 3 or 2 panels.
+- Improve karabiner timing for "-" character it L_Shift.
+
 ## [0.8.0] - 2020-12-13
 ### Added
 - Switch `ytop` to `bottom` and add `curlie`.
@@ -135,7 +145,8 @@ and this project adheres to [Semantic Versioning](https://semver.org/spec/v2.0.0
 ### Added
 - Created basic script for proof of concept.
 
-[Unreleased]: https://github.com/adamtabrams/fig/compare/0.8.0...HEAD
+[Unreleased]: https://github.com/adamtabrams/fig/compare/0.9.0...HEAD
+[0.9.0]: https://github.com/adamtabrams/fig/compare/0.8.0...0.9.0
 [0.8.0]: https://github.com/adamtabrams/fig/compare/0.7.6...0.8.0
 [0.7.6]: https://github.com/adamtabrams/fig/compare/0.7.5...0.7.6
 [0.7.5]: https://github.com/adamtabrams/fig/compare/0.7.4...0.7.5

home/.config/nvim/init.vim

@@ -105,7 +105,6 @@ set shell=/bin/zsh
 set history=200
 set mouse=a
 set go=a
-" set scrolloff=2
 set scrolloff=5
 set inccommand=split
 set tabstop=4 shiftwidth=4 expandtab shiftround
@@ -186,6 +185,20 @@ function! ChangeReplace(...)
     return ""
 endfunction
 
+function! YankAppend(...)
+    let motion = get(a:, 1)
+    if a:0 == 0
+        let motion = GetMotion()
+    endif
+    let regA = @a
+    let @a = @+
+    exe 'norm "Ay'.motion
+    let @+ = @a
+    let @a = regA
+    call repeat#set(":call YankAppend('".motion."')\<CR>",-1)
+    return ""
+endfunction
+
 function! CleverTab()
     if pumvisible()
         return "\<c-n>"
@@ -212,6 +225,13 @@ function! AlignWithMark()
     return "\<c-r>=repeat(' ',col(\"'m\")-col('.'))\<CR>\<ESC>"
 endfunction
 
+function! TempTerm(...)
+    let command = get(a:, 1)
+    exe "au TermClose * ++once :b#|bd!#"
+    exe "terminal ".command
+    return ""
+endfunction
+
 "### Remappings ##################################
 "--- Hotfix --------------------------------------
 cnoremap 3636  <c-u>undo<CR>
@@ -239,13 +259,14 @@ nnoremap <silent> gA       i<c-r>=AlignWithMark()<CR><ESC>
 vnoremap <silent> gA       I<c-r>=AlignWithMark()<CR><ESC>
 
 "--- Testing -------------------------------------
-nnoremap <silent> gw  :w<CR>
-" nnoremap <silent> gN  :tabnext<CR>
-" nnoremap <silent> gP  :tabprevious<CR>
-nnoremap <c-d>        <c-d>zz
-nnoremap <c-u>        <c-u>zz
-" nnoremap n            nzz
-" nnoremap N            Nzz
+nnoremap <silent> gw   :w<CR>
+nnoremap <c-m>         <c-]>
+nnoremap <silent> gy   :call YankAppend()<CR>
+
+nnoremap <c-d>         <c-d>zz
+nnoremap <c-u>         <c-u>zz
+" nnoremap n             nzz
+" nnoremap N             Nzz
 
 "--- Autocomplete --------------------------------
 inoremap <c-f>  <c-x><c-f>
@@ -320,30 +341,31 @@ augroup END
 
 "--- Leader Key ----------------------------------
 let mapleader = ","
+nnoremap <silent> <Leader>t  :call TempTerm()<CR>
+nnoremap <silent> <Leader>g  :call TempTerm("lazygit")<CR>
+nnoremap <silent> <Leader>l  :call TempTerm("lf")<CR>
 
 "--- Fzf -----------------------------------------
 let maplocalleader = "\<Space>"
-" nnoremap <LocalLeader><LocalLeader>  :Lines<CR>
-nnoremap <LocalLeader>l              :Lines<CR>
-nnoremap <LocalLeader>f              :Files<CR>
 nnoremap <LocalLeader>g              :GFiles<CR>
 nnoremap <LocalLeader>s              :GFiles?<CR>
+nnoremap <LocalLeader><c-f>          :Files<CR>
 nnoremap <LocalLeader>b              :Buffers<CR>
 nnoremap <LocalLeader>w              :Windows<CR>
 nnoremap <LocalLeader>r              :Rg<CR>
 nnoremap <LocalLeader>h              :History<CR>
 nnoremap <LocalLeader>m              :Maps<CR>
 nnoremap <LocalLeader>t              :Filetypes<CR>
 nnoremap <LocalLeader>T              :set filetype=<CR>
-nnoremap <LocalLeader>~              :Files ~
-nnoremap <LocalLeader>.              :Files ../
+nnoremap <LocalLeader>l              :Lines<CR>
 nnoremap <LocalLeader>/              :BLines<CR>
 nnoremap <LocalLeader>'              :Marks<CR>
 nnoremap <LocalLeader>:              :Commands<CR>
 nnoremap <LocalLeader>?              :Helptags<CR>
+nnoremap <LocalLeader>~              :Files ~
+nnoremap <LocalLeader>.              :Files ../
 
 "--- Easy Motion ---------------------------------
 nmap <LocalLeader><LocalLeader>  <Plug>(easymotion-overwin-w)
-nmap <LocalLeader>A              <Plug>(easymotion-jumptoanywhere)
-nmap <LocalLeader>F              <Plug>(easymotion-bd-wl)
-" nmap gf      <Plug>(easymotion-bd-wl)
+nmap <LocalLeader>a              <Plug>(easymotion-jumptoanywhere)
+nmap <LocalLeader>f              <Plug>(easymotion-bd-wl)

home/.config/zsh/alias.zsh

@@ -6,11 +6,11 @@ alias bc="bc -q"
 alias vim="$EDITOR"
 alias vi="$EDITOR"
 alias v="$EDITOR"
-alias l="lfcd"
 alias lf="lfcd"
+alias l="lfcd"
 alias lg="lazygit"
-alias L="lazygit"
-alias B="hub browse"
+alias g="lazygit"
+alias b="hub browse"
 alias j="jump"
 alias page="$PAGER --paging=always"
 alias bat="bat --paging=never"
@@ -31,6 +31,7 @@ alias .alias="$EDITOR $ZDOTDIR/alias.zsh"
 alias .env="$EDITOR $HOME/.zprofile"
 alias .nvim="$EDITOR $XDG_CONFIG_HOME/nvim/init.vim"
 alias .hist="$EDITOR $MYHIST"
+alias .conf="cd $XDG_CONFIG_HOME"
 
 #### Functions ###################################
 up() { fc -e "sed -i \"\" -e \"s| | $* |\"" }
@@ -45,23 +46,34 @@ unbak() { mv "$1" $(sed "s/.bak$//" <<< "$1") }
 
 mksh() { echo "#!/bin/sh" >> "$1" && chmod +x "$1" && "$EDITOR" "$1" }
 
-#### Fzf #########################################
+#### Quick Select ################################
+# list quick-select commands
+glist() {
+    echo "gl  - goto latest dirs"
+    echo "gr  - goto repo"
+    echo "grr - goto repo (deeper search)"
+    echo "or  - open repo in browser"
+    echo "lr  - open repo(s) in lazygit"
+    echo "gt  - goto/open from ~/temp"
+    echo "gs  - goto/open from ~/save"
+}
+
 # go to one of the lastest dirs
 gl() {
-    goto=$(cat "$DIRSTACKFILE" | fzf --reverse)
+    goto=$(cat "$DIRSTACKFILE" | $SELECTOR)
     [ "$goto" ] && cd "$goto"
 }
 
 # go to a repo
 gr() {
-    repo="$(cd ~/repos && fd -d1 | fzf --reverse)"
+    repo="$(cd ~/repos && fd -d1 | $SELECTOR)"
     [ "$repo" ] && cd "$HOME/repos/$repo"
 }
 
 # go to a repo (recursive)
 grr() {
     repo="$(cd ~/repos && fd -d3 -t d -I -H "^.git$" |
-        rev | cut -c 6- | rev | fzf --reverse)"
+        rev | cut -c 6- | rev | $SELECTOR)"
     [ "$repo" ] && cd "$HOME/repos/$repo"
 }
 
@@ -72,21 +84,21 @@ or() {
 
 # use lazygit on one or more repos
 lr() {
-    for repo in $(cd ~/repos && fd -d1 | fzf --reverse --multi); do
+    for repo in $(cd ~/repos && fd -d1 | $SELECTOR --multi); do
         lazygit -p "$HOME/repos/$repo"
     done
 }
 
 # go to a dir or open a file in temp
 gt() {
-    sel="$HOME/temp/$(cd ~/temp && fd | fzf --reverse)"
+    sel="$HOME/temp/$(cd ~/temp && fd | $SELECTOR)"
     [ -d "$sel" ] && cd "$sel"
     [ -f "$sel" ] && "$EDITOR" "$sel"
 }
 
 # go to a dir or open a file in save
 gs() {
-    sel="$HOME/save/$(cd ~/save && fd | fzf --reverse)"
+    sel="$HOME/save/$(cd ~/save && fd | $SELECTOR)"
     [ -d "$sel" ] && cd "$sel"
     [ -f "$sel" ] && "$EDITOR" "$sel"
 }
@@ -115,7 +127,7 @@ markfile="$XDG_DATA_HOME/lf/marks"
 marks() { cat "$markfile" | tr ':' ' ' }
 
 jump() {
-    new_dir=$(marks | fzf --reverse | cut -f 2 -d ' ')
+    new_dir=$(marks | $SELECTOR | cut -f 2 -d ' ')
     [ -d "$new_dir" ] && cd "$new_dir"
 }
 

home/.config/zsh/nonest_nvim/go.mod

@@ -0,0 +1,5 @@
+module nonest_nvim
+
+go 1.15
+
+require github.com/neovim/go-client v1.1.3

home/.config/zsh/nonest_nvim/go.sum

@@ -0,0 +1,2 @@
+github.com/neovim/go-client v1.1.3 h1:RrjcL8ZdFNtI+w77cp0uWyHZBu2X9fHTvztipdyoZB8=
+github.com/neovim/go-client v1.1.3/go.mod h1:R9QUduDri8OKS78u/rAvFZmaw6pPfdb+MiKq0JYnZ+c=

home/.config/zsh/nonest_nvim/main.go

@@ -0,0 +1,75 @@
+package main
+
+import (
+	"fmt"
+	"os"
+	"os/exec"
+
+	"github.com/neovim/go-client/nvim"
+)
+
+func main() {
+	addr := os.Getenv("NVIM_LISTEN_ADDRESS")
+	if addr == "" {
+		editor := os.Getenv("REALEDITOR")
+		cmd := exec.Command(editor, os.Args[1:]...)
+		cmd.Stdin = os.Stdin
+		cmd.Stdout = os.Stdout
+
+		if err := cmd.Run(); err != nil {
+			fmt.Println(err)
+			os.Exit(1)
+		}
+		os.Exit(0)
+	}
+
+	fileNames := os.Args[1:]
+	if len(fileNames) == 0 {
+		fmt.Println("No arguments given")
+		os.Exit(1)
+	}
+
+	filePaths, err := getAbsolutePaths(fileNames...)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	v, err := nvim.Dial(addr)
+	if err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+
+	defer v.Close()
+
+	b := v.NewBatch()
+	b.Command(":bd!")
+
+	for _, filePath := range filePaths {
+		b.Command(":e " + filePath)
+	}
+
+	if err := b.Execute(); err != nil {
+		fmt.Println(err)
+		os.Exit(1)
+	}
+}
+
+func getAbsolutePaths(fileNames ...string) ([]string, error) {
+	pwd, err := os.Getwd()
+	if err != nil {
+		return nil, err
+	}
+
+	absolutePaths := make([]string, len(fileNames))
+
+	for _, filePath := range fileNames {
+		if filePath[0] != '/' {
+			filePath = pwd + "/" + filePath
+		}
+		absolutePaths = append(absolutePaths, filePath)
+	}
+
+	return absolutePaths, nil
+}

home/.config/zsh/nonest_nvim/nonest_nvim

@@ -1,9 +1,12 @@
 #!/bin/zsh
 
 #### General #####################################
-export EDITOR="nvim"
+export REALEDITOR="nvim"
+export EDITOR="nonest_nvim"
+# export EDITOR="/Users/aabrams7/repos/TEMP/neovim/build/bin/nvim"
 export TERMINAL="/Applications/Alacritty.app/Contents/MacOS/alacritty"
 export BROWSER="/Applications/Brave\ Browser.app/Contents/MacOS/Brave\ Browser"
+export SELECTOR="fzf"
 
 export LANG="en_US.UTF-8"
 export SHELL="zsh"
@@ -19,14 +22,15 @@ export XDG_CONFIG_HOME="$HOME/.config"
 export XDG_DATA_HOME="$HOME/.local/share"
 export XDG_CACHE_HOME="$HOME/.cache"
 
-#### Path ########################################
-export PATH="$HOME/.local/bin:$PATH"
-
 #### Files/Dirs ##################################
 export ZDOTDIR="$XDG_CONFIG_HOME/zsh"
 export MYHIST="$HOME/.local/history/histfile"
 export LESSHISTFILE="-"
 
+#### Path ########################################
+export PATH="$HOME/.local/bin:$PATH"
+export PATH="$ZDOTDIR/nonest_nvim:$PATH"
+
 #### Bat #########################################
 export BAT_PAGER="less -R"
 export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/bat.conf"
@@ -35,6 +39,7 @@ export BAT_CONFIG_PATH="$XDG_CONFIG_HOME/bat/bat.conf"
 fzf_base_command="fd --hidden --exclude .git --follow"
 export FZF_DEFAULT_COMMAND="$fzf_base_command --type file"
 export FZF_DEFAULT_OPTS="--preview='bat {} 2> /dev/null'"
+export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS --reverse"
 export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS --preview-window=':hidden'"
 export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS --bind=ctrl-u:page-up"
 export FZF_DEFAULT_OPTS="$FZF_DEFAULT_OPTS --bind=ctrl-d:page-down"