From 65eb792c3206a2435d0d1dab33221f5dd9036e76 Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Wed, 8 Nov 2023 10:19:19 -0500 Subject: [PATCH 1/7] add .gitconfig --- git/.gitconfig | 2 ++ 1 file changed, 2 insertions(+) create mode 100644 git/.gitconfig diff --git a/git/.gitconfig b/git/.gitconfig new file mode 100644 index 0000000..7286495 --- /dev/null +++ b/git/.gitconfig @@ -0,0 +1,2 @@ +[init] + defaultBranch = main From 15fe57263cdd2b7de1df19bdc0295282b3de9789 Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Wed, 8 Nov 2023 10:24:31 -0500 Subject: [PATCH 2/7] ssh & enc/dec functions --- install.sh | 9 +++++++++ ssh/.ssh/scalene-config | 6 ++++++ 2 files changed, 15 insertions(+) diff --git a/install.sh b/install.sh index 7a3ae74..6a4d1f5 100755 --- a/install.sh +++ b/install.sh @@ -11,3 +11,12 @@ fi rm -f $HOME/.zshrc $HOME/.profile >/dev/null 2>&1 find * -maxdepth 0 -type d | xargs -I{} $STOW -t "$HOME" {} + +func encrypt() { + openssl enc -e -aes256 -base64 -in $1 +} + +func decrypt() { + openssl enc -d -aes256 -base64 -in $1 +} + diff --git a/ssh/.ssh/scalene-config b/ssh/.ssh/scalene-config index 23bbb77..29c1340 100644 --- a/ssh/.ssh/scalene-config +++ b/ssh/.ssh/scalene-config @@ -1,5 +1,11 @@ Host nyyrikki-vpn Hostname 10.147.19.238 +Host nyyrikki + Hostname 192.168.101.110 + +Host tuulikki + Hostname 192.168.101.69 + Host tuulikki.scalene.net Port 22022 From 8cf2a07e8c239370b75fa939c89dd4ebe5aa797e Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Fri, 10 Nov 2023 15:49:08 +0000 Subject: [PATCH 3/7] add fzf-lua --- .gitmodules | 3 +++ install.sh | 15 +++++++-------- nvim/.config/nvim/init.vim | 6 +++++- nvim/.config/nvim/pack/bundle/start/fzf-lua | 1 + zsh/.zshenv | 5 +++-- 5 files changed, 19 insertions(+), 11 deletions(-) create mode 160000 nvim/.config/nvim/pack/bundle/start/fzf-lua 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/install.sh b/install.sh index 6a4d1f5..d7a9971 100755 --- a/install.sh +++ b/install.sh @@ -12,11 +12,10 @@ rm -f $HOME/.zshrc $HOME/.profile >/dev/null 2>&1 find * -maxdepth 0 -type d | xargs -I{} $STOW -t "$HOME" {} -func encrypt() { - openssl enc -e -aes256 -base64 -in $1 -} - -func decrypt() { - openssl enc -d -aes256 -base64 -in $1 -} - +#func encrypt() { +# openssl enc -e -aes256 -base64 -in $1 +#} +# +#func decrypt() { +# openssl enc -d -aes256 -base64 -in $1 +#} 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/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 From 9f4d6c25e1e9a73f80cbcc680e77aee271fe54a9 Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Fri, 10 Nov 2023 15:49:53 +0000 Subject: [PATCH 4/7] change email --- git/.gitconfig | 3 +++ 1 file changed, 3 insertions(+) diff --git a/git/.gitconfig b/git/.gitconfig index 7286495..43959dc 100644 --- a/git/.gitconfig +++ b/git/.gitconfig @@ -1,2 +1,5 @@ [init] defaultBranch = main +[user] + name = Jason Swank + email = jswank@ From 017f24d10e72256b102d6599d216bb924dd7f875 Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Fri, 10 Nov 2023 16:14:49 +0000 Subject: [PATCH 5/7] ssh:allow for ssh-agent forwarding --- ssh/.ssh/config | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/ssh/.ssh/config b/ssh/.ssh/config index 6133735..f6213d3 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -5,7 +5,7 @@ ForwardAgent yes NoHostAuthenticationForLocalhost yes HashKnownHosts no IdentityFile ~/.ssh/id_ed25519 -IdentitiesOnly yes +#IdentitiesOnly no # Include codespace-config Include ~/.config/pm/*/ssh_config From c15dc5f5fff521e258f6c2e9bad4800990d52268 Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Fri, 10 Nov 2023 16:18:30 +0000 Subject: [PATCH 6/7] ssh: minor cleanup --- ssh/.ssh/config | 2 -- ssh/.ssh/infinite-config | 2 +- 2 files changed, 1 insertion(+), 3 deletions(-) diff --git a/ssh/.ssh/config b/ssh/.ssh/config index f6213d3..e4a9481 100644 --- a/ssh/.ssh/config +++ b/ssh/.ssh/config @@ -7,7 +7,5 @@ HashKnownHosts no IdentityFile ~/.ssh/id_ed25519 #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 From 5d80c2be62b40537f1c5fca445f61be9ff20bd00 Mon Sep 17 00:00:00 2001 From: Jason Swank Date: Fri, 10 Nov 2023 19:26:55 +0000 Subject: [PATCH 7/7] Remove unused function --- install.sh | 8 -------- 1 file changed, 8 deletions(-) diff --git a/install.sh b/install.sh index d7a9971..7a3ae74 100755 --- a/install.sh +++ b/install.sh @@ -11,11 +11,3 @@ fi rm -f $HOME/.zshrc $HOME/.profile >/dev/null 2>&1 find * -maxdepth 0 -type d | xargs -I{} $STOW -t "$HOME" {} - -#func encrypt() { -# openssl enc -e -aes256 -base64 -in $1 -#} -# -#func decrypt() { -# openssl enc -d -aes256 -base64 -in $1 -#}