From 129cb96323b5cd7db0f13ed4b99f27b3ee1e37f1 Mon Sep 17 00:00:00 2001 From: Joe Papperello Date: Wed, 8 Jul 2020 15:12:52 -0400 Subject: [PATCH] cruft --- bashrc | 15 ++++---------- bin/pcat.pl | 2 +- etc/gpg-agent.conf | 2 +- ssh-config | 49 ++++++++++------------------------------------ vimrc | 2 ++ 5 files changed, 18 insertions(+), 52 deletions(-) diff --git a/bashrc b/bashrc index db86f56..7db4041 100644 --- a/bashrc +++ b/bashrc @@ -24,14 +24,6 @@ if [[ -n $TMUX ]]; then fi } -function vpndocker() { - if [[ `stat -c '%a' /dev/net/tun` == '660' ]]; then - docker "$@" - else - echo 'lxc config device add penguin tun unix-char path=/dev/net/tun' | xclip -selection c - echo 'no access to /dev/net/tun' - fi -} ec2-info() { IP=169.254.169.254 @@ -40,7 +32,7 @@ ec2-info() { } export EDITOR=vim export GOPATH=$HOME/code/go -export PATH=$HOME/bin:$HOME/local/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:$HOME/dotfiles/bin/:$HOME/Applications/:$PATH +export PATH=$HOME/bin:$HOME/local/bin:$HOME/bin/fzf/bin/:$HOME/gobin/go/bin/:$HOME/go/bin/:/usr/local/go/bin:$HOME/perl5/bin:/usr/sbin/:$GOPATH/bin:$HOME/Library/Python/2.7/bin:$HOME/bin/vim/vim-8.0.1481/bin/bin/:$HOME/dotfiles/bin/:$HOME/Applications/:$PATH [ -f $HOME/perl5/lib/perl5/Devel/Local.pm ] && source `which devel-local.sh` function github() { git clone git@github.com:SocialFlowDev/$1.git @@ -83,6 +75,7 @@ fi export GOPATH=$HOME/code/go export PATH=$PATH:$GOPATH/bin:$HOME/.local/bin export PERLBREW_ROOT=$HOME/perlbrew + function refresh_gpga() { if [ -f "${HOME}/.gpg-agent-info" ]; then . "${HOME}/.gpg-agent-info" @@ -157,10 +150,10 @@ rmqq() { } function vpnotp() { echo -n 'Enter keepass pw: '; - printf "\033]52;c;$(echo $(KeePassXC-2.5.4-x86_64.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a Password | tr -d '\n') | base64)\a" + printf "\033]52;c;$(echo $(KeePassXC.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a Password | tr -d '\n') | base64)\a" } function vpnconnect() { echo -n 'Enter keepass pw: '; - KeePassXC-2.5.4-x86_64.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a UserName -a Password | sed -z "s|[\n\r]||2g" > ~/vpn/new-$1.tblk/Contents/Resources/creds.txt && docker start $1vpn && rm ~/vpn/new-$1.tblk/Contents/Resources/creds.txt && echo "connected to $1" + KeePassXC.AppImage cli show /mnt/chromeos/GoogleDrive/MyDrive/keepass/keepass2.kdbx $1 -q -t -a UserName -a Password | sed -z "s|[\n\r]||2g" > $HOME/vpn/$1.tblk/Contents/Resources/creds.txt && docker start $1 && sleep 1 && rm $HOME/vpn/$1.tblk/Contents/Resources/creds.txt && echo "connected to $1" } diff --git a/bin/pcat.pl b/bin/pcat.pl index bbc990a..564dd13 100755 --- a/bin/pcat.pl +++ b/bin/pcat.pl @@ -5,5 +5,5 @@ my $a = $ARGV[0]; my ($host,$port) = split(/:/,$a); warn $host; -my $vpn = ($host =~ /mars.sfsrv.net/) ? 'marsvpn' : 'saturnvpn'; +my $vpn = ($host =~ /mars.sfsrv.net/) ? 'mars' : 'saturn'; `socat TCP-LISTEN:$port,reuseaddr,fork 'EXEC:docker exec -i $vpn "nc $host $port"'`; diff --git a/etc/gpg-agent.conf b/etc/gpg-agent.conf index e50fb6b..a98756d 100644 --- a/etc/gpg-agent.conf +++ b/etc/gpg-agent.conf @@ -1,4 +1,4 @@ enable-ssh-support -pinentry-program /usr/bin/pinentry-qt +pinentry-program /usr/bin/pinentry-curses default-cache-ttl 86400 max-cache-ttl 86400 diff --git a/ssh-config b/ssh-config index cd3c7c7..91057d8 100644 --- a/ssh-config +++ b/ssh-config @@ -1,30 +1,24 @@ -Host *.priv.sf - User appuser - ConnectTimeout 30 - #ProxyCommand ssh -p2222 -o VisualHostKey=no root@localhost nc -q0 %h %p 2>/dev/null - #ProxyCommand docker exec -i prodvpn nc -q0 %h %p 2>/dev/null - StrictHostKeyChecking false - KbdInteractiveAuthentication false - Host *.mars.sfsrv.net User appuser ConnectTimeout 30 - #ProxyCommand docker exec -i marsvpn nc -q0 %h %p 2>/dev/null - ProxyCommand ~/dotfiles/script/vpnnc.sh marsvpn %h %p + ProxyCommand docker exec -i mars nc -q0 %h %p 2>/dev/null + #ProxyCommand ~/dotfiles/script/vpnnc.sh mars %h %p StrictHostKeyChecking false KbdInteractiveAuthentication false Host 20.0.*.* User appuser ConnectTimeout 30 - ProxyCommand ~/dotfiles/script/vpnnc.sh marsvpn %h %p + ProxyCommand docker exec -i mars nc -q0 %h %p 2>/dev/null + #ProxyCommand ~/dotfiles/script/vpnnc.sh mars %h %p StrictHostKeyChecking false KbdInteractiveAuthentication false Host 10.125.*.* User appuser ConnectTimeout 30 - ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p + ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null + #ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p StrictHostKeyChecking false KbdInteractiveAuthentication false @@ -33,38 +27,22 @@ Host 10.125.*.* Host *.saturn.sfsrv.net User appuser ConnectTimeout 30 - #ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null - ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p + ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null + #ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p StrictHostKeyChecking false KbdInteractiveAuthentication false Host 54.164.21.74 User appuser ConnectTimeout 30 - #ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null - ProxyCommand ~/dotfiles/script/vpnnc.sh saturnvpn %h %p + ProxyCommand docker exec -i saturn nc -q0 %h %p 2>/dev/null + #ProxyCommand ~/dotfiles/script/vpnnc.sh saturn %h %p StrictHostKeyChecking false KbdInteractiveAuthentication false -Host *.sflow.us - User appuser - StrictHostKeyChecking false -# IdentityFile ~/.ssh/2016_prod_home.key -# -#Host *.sfsrv.net -# User appuser -# StrictHostKeyChecking false -# -#Host dev-home.priv.sf -# User root -# #LocalForward *:8000 dev-home.priv.sf:8030 -# LogLevel Quiet -# - -# Host joe2.home.saturn.sfsrv.net #IdentityFile ~/.ssh/2016_saturn_home.key ConnectTimeout 30 @@ -73,10 +51,3 @@ Host joe2.home.saturn.sfsrv.net #LocalForward *:5432 pg-site.dev.saturn.sfsrv.net:5432 #LocalForward *:7006 redis-2.dev.saturn.sfsrv.net:7006 - -#Host *.saturn.sflow.us -# IdentityFile ~/.ssh/2016_saturn_home.key -# ConnectTimeout 30 -# ProxyCommand docker exec -i saturnvpn nc -q0 %h %p 2>/dev/null -# StrictHostKeyChecking false -# KbdInteractiveAuthentication false diff --git a/vimrc b/vimrc index 838cf58..d088e1a 100644 --- a/vimrc +++ b/vimrc @@ -278,6 +278,8 @@ au FileType go nmap b (go-build) au FileType go nmap l :%s/\s*q.Q(.*$\n//g map :lne map :lp +"au FileType go map :cnext +"au FileType go map :cprevious "let g:go_auto_type_info = 1 "set updatetime=100 let g:go_highlight_types = 1