diff options
| -rw-r--r-- | .newsboat/urls | 4 | ||||
| -rw-r--r-- | .zshrc | 33 | ||||
| -rwxr-xr-x | fonts/patch_dejavusansmono.sh | 40 | ||||
| -rw-r--r-- | init.vim | 30 | ||||
| -rwxr-xr-x | irssi/build_and_push.sh | 2 | ||||
| -rw-r--r-- | irssi/proxychains.conf | 2 | ||||
| -rw-r--r-- | kubernetes/bitlbee-purple/bitlbee.conf | 2 | ||||
| -rwxr-xr-x | openwrt/install_tp_mr6400.sh | 6 | ||||
| -rw-r--r-- | terminaldweller.com/rss-bridge/docker-compose.yaml | 8 | ||||
| -rwxr-xr-x | tmux/vcs_info.sh | 2 |
10 files changed, 103 insertions, 26 deletions
diff --git a/.newsboat/urls b/.newsboat/urls index 47ffc11..f0ef387 100644 --- a/.newsboat/urls +++ b/.newsboat/urls @@ -8,7 +8,7 @@ https://microservices.io/feed.xml https://news.ycombinator.com/rss # (Twitter) -http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=donttouchjustl1&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Marg"_("Twitter") +http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=_margery28_&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Marg"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PancakeSwap&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Pancakeswap"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=OrchidProtocol&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~OrchidProtocol"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=ethereum&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Ethereum"_("Twitter") @@ -17,6 +17,7 @@ http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=B http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=PrivexInc&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~Privex"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=binance&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~binance"_("Twitter") http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=igor_chubin&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~igor_chubin"_("Twitter") +http://rssgen.terminaldweller.com/?action=display&bridge=TwitterBridge&context=By+username&u=TheBlock__&norep=on&noretweet=on&nopinned=on&nopic=on&noimg=on&noimgscaling=on&format=Atom "~the_block"_("Twitter") # (Youtube) # Horror @@ -41,6 +42,7 @@ https://www.youtube.com/feeds/videos.xml?channel_id=UC9YXCCz-A28lxhMA-ArfBaA "~G https://www.youtube.com/feeds/videos.xml?channel_id=UCxMZO9A4Jixjr9lbgeBiQ6w "~Vormithrax"_("youtube") # Tech +https://www.youtube.com/feeds/videos.xml?channel_id=UCqK_GSMbpiV8spgD3ZGloSw "~Coin Bureau"_("youtube") https://www.youtube.com/feeds/videos.xml?channel_id=UC-91UA-Xy2Cvb98deRXuggA "~Joshua Fluke"_("youtube") https://www.youtube.com/feeds/videos.xml?channel_id=UC17mJJnvzAa_e9qQqLIfIeQ "~Semicolon&Sons"_("youtube") https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA "~Luke_Smith"_("youtube") @@ -103,6 +103,7 @@ alias vpn="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh 192.99.102.52 - alias vpn2="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh 145.239.165.137 -l rooot" alias vpn3="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh root@185.112.147.110 -p 2022" alias vpn6="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh -p 3333 ubuntu@185.130.45.46" +alias vpn7="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh -p 3333 ubuntu@185.130.47.81" alias vms="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh 185.126.202.69 -l ubuntu -p 1022" alias cloud_one="proxychains4 -q -f ~/proxies/ice/proxychains.conf ssh 130.185.121.80 -l ubuntu -p 1022" alias pytags="ctags --fields=+l --languages=python --python-kinds=-iv -R ." @@ -133,8 +134,26 @@ alias iredisrc="vim ~/scripts/.iredisrc" alias fixiredisrc="cp ~/scripts/.iredisrc ~/.iredisrc" # alias irssi="irssi -n terminaldweller" # alias irssi="TERM=screen-256color docker run --runtime=runsc -it -e TERM -u $(id -u):$(id -g) --log-driver=none -e DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" --network=host -v $HOME/.irssi:/home/user/.irssi:ro -v /etc/localtime:/etc/localtime:ro bloodstalker/irssi:latest" -alias irssi="TERM=screen-256color docker run --runtime=runsc -it -e TERM -u $(id -u):$(id -g) --log-driver=none -e DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" -v $HOME/.irssi:/home/user/.irssi:ro -v /etc/localtime:/etc/localtime:ro bloodstalker/irssi:latest" -alias openbb="TERM=screen-256color docker run --runtime=runc -it --env-file=/home/devi/.openbb/.env -e TERM -e DISPLAY=${DISPLAY} -e OPENBB_BACKEND=Qt5Agg --log-driver=none --network=host -v /tmp/.X11-unix:/tmp/.X11-unix ghcr.io/openbb-finance/openbbterminal-poetry:latest" +alias irssi="TERM=screen-256color docker run --runtime=runsc -it -e TERM -u $(id -u):$(id -g) --log-driver=none -e DBUS_SESSION_BUS_ADDRESS="$DBUS_SESSION_BUS_ADDRESS" -v $HOME/.irssi:/home/user/.irssi:ro -v /etc/localtime:/etc/localtime:ro devi_irssi" +alias openbb="TERM=screen-256color \ + docker \ + run \ + --runtime=runc \ + -it \ + --env-file=/home/devi/.openbb/.env \ + -e TERM \ + -e DISPLAY=${DISPLAY} \ + -e OPENBB_BACKEND=Qt5Agg \ + -e HTTP_PROXY=socks5://192.168.1.103:9995 \ + -e HTTPS_PROXY=socks5://192.168.1.103:9995 \ + -e NO_PROXY=localhost,127.0.0.0/8,dockerhost.local \ + -e http_proxy=socks5://192.168.1.103:9995 \ + -e https_proxy=socks5://192.168.1.103:9995 \ + -e no_proxy=localhost,127.0.0.0/8,dockerhost.local \ + --log-driver=none \ + --network=host \ + -v /tmp/.X11-unix:/tmp/.X11-unix \ + ghcr.io/openbb-finance/openbbterminal-poetry:latest" alias joplinkeymap="vim ~/scripts/.config/joplin/keymap.json" alias fixjoplinkeymap="cp ~/scripts/.config/joplin/keymap.json ~/.config/joplin/keymap.json" alias postitrc="vim ~/scripts/postit" @@ -155,7 +174,7 @@ alias pwsh="/mnt/c/Program\ Files/PowerShell/7/pwsh.exe" alias wincmd="/mnt/c/Windows/System32/runas.exe /profile /user:administrator cmd.exe" alias xonshrc="vim ~/scripts/.xonshrc" alias fixxonshrc="cp ~/scripts/.xonshrc ~/.xonshrc" -alias deviphone="ssh 192.168.1.110 -l u0_a601 -p 8022" +alias deviphone="ssh u0_a601@deviphone.lan -p 8022" alias rpiz2="ssh 192.168.1.116 -l pi" alias moshvpn="mosh rooot@192.99.102.52 --ssh='ssh -p 1022'" alias moshvps="mosh ubuntu@terminaldweller.com --ssh='ssh -p 1022'" @@ -172,10 +191,8 @@ alias socks5vpn2="autossh -M 0 -N -D 9996 -o ServerAliveInterval=180 -o ServerAl alias socks5vpn3="autossh -M 0 -N -D 0.0.0.0:9995 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l root -p 2022 185.112.147.110" alias socks5vpn4="autossh -M 0 -N -D 9994 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 1022 130.185.121.80" alias socks5vpn5="autossh -M 0 -N -D 0.0.0.0:9990 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 3333 185.130.45.46" -alias socks5vpn6="autossh -M 0 -N -D 9993 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -6 -l ubuntu -p 3022 2a07:e01:3:204::1" -alias zharf_server="zssh 192.168.12.5 -l farzad" -alias zharf_server2="zssh 192.168.90.7 -l root" -alias zharf_server3="zssh 192.168.90.8 -l root" +alias socks5vpn6="autossh -M 0 -N -D 9993 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -6 -l ubuntu -p 3333 2a07:e01:3:204::1" +alias socks5vpn7="autossh -M 0 -N -D 9992 -o ServerAliveInterval=180 -o ServerAliveCountMax=3 -o ExitOnForwardFailure=yes -l ubuntu -p 3333 130.185.47.81" alias k9sskin="vim ~/scripts/.k9s/skin.yml" alias k9sconfig="vim ~/scripts/.k9s/config.yml" alias fixk9sskin="cp ~/scripts/.k9s/skin.yml ~/.config/k9s/skin.yml" @@ -231,7 +248,7 @@ alias dud="du -hcD --max-depth=1 | sort -hr | colcol | column -t" alias bbox="busybox" alias gitconfigrc="vim ~/scripts/.gitconfig" alias fixgitconfigrc="cp ~/scripts/.gitconfig ~/.gitconfig" -alias nviminit="vim ~/scripts/init.vim" +alias nviminit="nvim ~/scripts/init.vim" alias fixnviminit="cp ~/scripts/init.vim ~/.config/nvim/init.vim" alias mysql='mysql --safe-updates --prompt="\u@\h [\d]>"' alias socat="socat -d -d" diff --git a/fonts/patch_dejavusansmono.sh b/fonts/patch_dejavusansmono.sh new file mode 100755 index 0000000..f376e29 --- /dev/null +++ b/fonts/patch_dejavusansmono.sh @@ -0,0 +1,40 @@ +#!/usr/bin/env bash +set -ex + +FONT_PATCHER=./font-patcher +OPTIONS="--adjust-line-height \ +--fontawesome \ +--fontawesomeextension \ +--fontlogos \ +--octicons \ +--codicons \ +--powersymbols \ +--pomicons \ +--powerline \ +--powerlineextra \ +--weather \ +--variable-width-glyphs \ +--careful" + +FONT_LIST=("./dejavu-fonts-ttf-2.37/ttf/DejaVuSansMono.ttf" "./dejavu-fonts-ttf-2.37/ttf/DejaVuSansMono-BoldOblique.ttf" "./dejavu-fonts-ttf-2.37/ttf/DejaVuSansMono-Oblique.ttf" "./dejavu-fonts-ttf-2.37/ttf/DejaVuSansMono-Bold.ttf") + +for FONT in ${FONT_LIST[@]};do + ${FONT_PATCHER} ${OPTIONS} ${FONT} +done + +mv DejaVu\ Sans\ Mono\ Bold\ Nerd\ Font\ Plus\ Font\ Awesome\ Plus\ Font\ Awesome\ Extension\ Plus\ Octicons\ Plus\ Power\ Symbols\ Plus\ Codicons\ Plus\ Pomicons\ Plus\ Font\ Logos\ Plus\ Weather\ Icons.ttf DejaVuSansMonoNerdBold.ttf +mv DejaVu\ Sans\ Mono\ Bold\ Oblique\ Nerd\ Font\ Plus\ Font\ Awesome\ Plus\ Font\ Awesome\ Extension\ Plus\ Octicons\ Plus\ Power\ Symbols\ Plus\ Codicons\ Plus\ Pomicons\ Plus\ Font\ Logos\ Plus\ Weather\ Icons.ttf DejaVuSansMonoNerdBoldOblique.ttf +mv DejaVu\ Sans\ Mono\ Nerd\ Font\ Plus\ Font\ Awesome\ Plus\ Font\ Awesome\ Extension\ Plus\ Octicons\ Plus\ Power\ Symbols\ Plus\ Codicons\ Plus\ Pomicons\ Plus\ Font\ Logos\ Plus\ Weather\ Icons.ttf DejaVuSansMonoNerdNormal.ttf +mv DejaVu\ Sans\ Mono\ Oblique\ Nerd\ Font\ Plus\ Font\ Awesome\ Plus\ Font\ Awesome\ Extension\ Plus\ Octicons\ Plus\ Power\ Symbols\ Plus\ Codicons\ Plus\ Pomicons\ Plus\ Font\ Logos\ Plus\ Weather\ Icons.ttf DejaVuSansMonoNerdOblique.ttf + +# mv 'DejaVu Sans Mono Bold Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Codicons Plus Pomicons Plus Font Logos Plus Weather Icons Mono.ttf' DejaVuSansMonoNerdBold.ttf +# mv 'DejaVu Sans Mono Bold Oblique Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Codicons Plus Pomicons Plus Font Logos Plus Weather Icons Mono.ttf' DejaVuSansMonoNerdBoldOblique.ttf +# mv 'DejaVu Sans Mono Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Codicons Plus Pomicons Plus Font Logos Plus Weather Icons Mono.ttf' DejaVuSansMonoNerdNormal.ttf +# mv 'DejaVu Sans Mono Oblique Nerd Font Plus Font Awesome Plus Font Awesome Extension Plus Octicons Plus Power Symbols Plus Codicons Plus Pomicons Plus Font Logos Plus Weather Icons Mono.ttf' DejaVuSansMonoNerdOblique.ttf + +sudo cp ./DejaVuSansMonoNerdBold.ttf /usr/share/fonts/TTF/ +sudo cp ./DejaVuSansMonoNerdBoldOblique.ttf /usr/share/fonts/TTF/ +sudo cp ./DejaVuSansMonoNerdNormal.ttf /usr/share/fonts/TTF/ +sudo cp ./DejaVuSansMonoNerdOblique.ttf /usr/share/fonts/TTF/ + +sudo fc-cache -fv @@ -86,7 +86,7 @@ endfunction " autocmd QueInit UIEnter * call OnUIEnter(deepcopy(v:event)) colo jellybeans -let g:airline_powerline_fonts = 0 +let g:airline_powerline_fonts = 1 try let g:airline#extensions#tabline#enabled = 1 let g:airline#extensions#tabline#left_sep = ' ' @@ -190,7 +190,7 @@ let g:qs_highlight_on_keys = ["f", "F", "t", "T"] " undotree set undolevels=1000 if has("persistent_undo") - set undodir=~/.undodir/ + set undodir=~/.nundodir/ set undofile endif let g:undotree_WindowLayout = 4 @@ -281,16 +281,16 @@ let g:mucomplete#completion_delay = 1 " firenvim write changes automatically, throttle writes let g:timer_started = v:false function! My_Write(timer) abort - let g:timer_started = v:false - write + let g:timer_started = v:false + write endfunction function! Delay_My_Write() abort - if g:timer_started - return - end - let g:timer_started = v:true - call timer_start(10000, 'My_Write') + if g:timer_started + return + end + let g:timer_started = v:true + call timer_start(10000, 'My_Write') endfunction au TextChanged * ++nested call Delay_My_Write() @@ -301,3 +301,15 @@ let g:firenvim_config = { \ 'cmdlineTimeout': 3000, \ } \ } + +"python syntax highlighting +"let g:python_slow_sync = 0 +let python_highlight_all = 1 +hi link pythonBuiltin Define +hi link pythonInclude PreCondit +hi link pythonClassParameters Constant +hi link pythonFunctionParameters Constant +hi link pythonExtraOperator Keyword +hi link pythonDoctest Tag +hi link pythonRawString Tag +hi link pythonTripleQuotes SpecialComment diff --git a/irssi/build_and_push.sh b/irssi/build_and_push.sh index eb12244..bd70326 100755 --- a/irssi/build_and_push.sh +++ b/irssi/build_and_push.sh @@ -1,3 +1,3 @@ #!/bin/sh -https_proxy=socks5://[::1]:9993 docker buildx build --platform linux/amd64 --push -t bloodstalker/irssi . +https_proxy=socks5://127.0.0.1:9990 docker buildx build --platform linux/amd64 --push -t bloodstalker/irssi . diff --git a/irssi/proxychains.conf b/irssi/proxychains.conf index e9f5f9b..2a19d56 100644 --- a/irssi/proxychains.conf +++ b/irssi/proxychains.conf @@ -65,4 +65,4 @@ localnet 127.0.0.0/255.0.0.0 # add proxy here ... # meanwile # defaults set to "tor" -socks5 192.168.1.103 9995 +socks5 192.168.1.214 9995 diff --git a/kubernetes/bitlbee-purple/bitlbee.conf b/kubernetes/bitlbee-purple/bitlbee.conf index e230337..7d04efd 100644 --- a/kubernetes/bitlbee-purple/bitlbee.conf +++ b/kubernetes/bitlbee-purple/bitlbee.conf @@ -118,7 +118,7 @@ ConfigDir = /var/lib/bitlbee ## ## Proxy = http://john:doe@proxy.localnet.com:8080 ## Proxy = socks4://socksproxy.localnet.com -Proxy = socks5://192.168.1.103:9995 +Proxy = socks5://192.168.1.214:9995 [defaults] diff --git a/openwrt/install_tp_mr6400.sh b/openwrt/install_tp_mr6400.sh new file mode 100755 index 0000000..1f29137 --- /dev/null +++ b/openwrt/install_tp_mr6400.sh @@ -0,0 +1,6 @@ +#!/bin/sh + +IF="enp0s20f0u3u1u3" +# mr6400 bootloader will want to get an image named tp_recovery.bin on 192.168.0.225/24. the bootloader's IP will be 192.168.0.2/24. +sudo ip addr add 192.168.0.225/24 dev ${IF} +sudo dnsmasq --port=0 --enable-tftp --tftp-root=/home/devi/devi/abbatoir/hole1 --tftp-no-blocksize --user=root --group=root -k --interface ${IF} -8 - diff --git a/terminaldweller.com/rss-bridge/docker-compose.yaml b/terminaldweller.com/rss-bridge/docker-compose.yaml index 225c94c..0cc8325 100644 --- a/terminaldweller.com/rss-bridge/docker-compose.yaml +++ b/terminaldweller.com/rss-bridge/docker-compose.yaml @@ -5,11 +5,11 @@ services: networks: - rssbridgenet ports: - - "3000:80" + - "3000:443" restart: unless-stopped - # volumes: - # - ./nginx.conf:/etc/nginx/nginx.conf:ro - # - /home/ubuntu/cargo:/cargo + volumes: + - ./nginx.conf:/etc/nginx/nginx.conf:ro + - /etc/letsencrypt/archive/rssgen.terminaldweller.com/:/certs/:ro # cap_drop: # - ALL networks: diff --git a/tmux/vcs_info.sh b/tmux/vcs_info.sh index 2215f7f..375ad5e 100755 --- a/tmux/vcs_info.sh +++ b/tmux/vcs_info.sh @@ -63,7 +63,7 @@ function repo_info { insertions=$(git --no-pager diff --numstat | awk '{sum1+=$1}END{print sum1}') git remote -v | grep github > /dev/null 2>&1 if [[ $? == 0 ]]; then - echo + echo else echo fi |