diff --git a/.gitmodules b/.gitmodules index 8d64deb..cc1eb92 100644 --- a/.gitmodules +++ b/.gitmodules @@ -4,3 +4,6 @@ [submodule "nvim/.config/nvim/pack/bundle/start/vim-snippets"] path = nvim/.config/nvim/pack/bundle/start/vim-snippets url = https://github.com/honza/vim-snippets.git +[submodule "nvim/.config/nvim/pack/bundle/start/fzf-lua"] + path = nvim/.config/nvim/pack/bundle/start/fzf-lua + url = https://github.com/ibhagwan/fzf-lua.git diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..43959dc --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,5 @@ +[init] + defaultBranch = main +[user] + name = Jason Swank + email = jswank@ diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index 3f8478f..5ac9e70 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -48,7 +48,7 @@ set path+=** " netrw config let g:netrw_banner=0 " disable annoying banner -let g:netrw_browse_split=4 " open in prior window +let g:netrw_browse_split=0 " open in prior window let g:netrw_altv=1 " open splits to the right let g:netrw_liststyle=3 " tree view let g:netrw_list_hide=netrw_gitignore#Hide() @@ -59,6 +59,10 @@ let g:netrw_list_hide.=',\(^\|\s\s\)\zs\.\S\+' " - /v/t to open in an h-split/v-split/tab " - check |netrw-browse-maps| for more mappings +" fzf-lua +nnoremap lua require('fzf-lua').files() +nnoremap lua require('fzf-lua').buffers() +nnoremap lua require('fzf-lua').grep() " " GO stuff diff --git a/nvim/.config/nvim/pack/bundle/start/fzf-lua b/nvim/.config/nvim/pack/bundle/start/fzf-lua new file mode 160000 index 0000000..e104672 --- /dev/null +++ b/nvim/.config/nvim/pack/bundle/start/fzf-lua @@ -0,0 +1 @@ +Subproject commit e1046726cf0cedf15ae0ff40537a421b79968c3e diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 6133735..e4a9481 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -5,9 +5,7 @@ ForwardAgent yes NoHostAuthenticationForLocalhost yes HashKnownHosts no IdentityFile ~/.ssh/id_ed25519 -IdentitiesOnly yes +#IdentitiesOnly no -# Include codespace-config -Include ~/.config/pm/*/ssh_config Include scalene-config Include infinite-config diff --git a/ssh/.ssh/infinite-config b/ssh/.ssh/infinite-config index db442c1..f0f3878 100644 --- a/ssh/.ssh/infinite-config +++ b/ssh/.ssh/infinite-config @@ -1,2 +1,2 @@ Host *.infinite.industries infinite.industries -User infinite + User infinite diff --git a/zsh/.zshenv b/zsh/.zshenv index 1276517..3af7000 100644 --- a/zsh/.zshenv +++ b/zsh/.zshenv @@ -11,10 +11,11 @@ export LESS=RX # R for ANSI color sequences, X to not clear screen on exit export FZF_DEFAULT_OPTS="--multi --height=40% --layout=reverse" -export GOPATH=/home/jswank/go +export GOPATH=~/go # doesn't work on arch for tmux -path+=('/home/jswank/bin') +path+=(~/bin) +path+=(~/.local/bin) path+=($GOPATH/bin) export PATH