From 32fc608650b5aa824d87182e0491e0d9f5da7efe Mon Sep 17 00:00:00 2001 From: terminaldweller Date: Sun, 13 Feb 2022 20:28:00 +0330 Subject: updates --- .Xresources | 10 +++++++++- .tmux.conf | 5 ++++- .vimrc | 34 +++++++++++++++++++++++++++++++--- .zshrc | 22 ++++++++++++++++------ baseline/.tmux.conf | 4 ++-- baseline/.vimrc | 2 +- bin/colcol | 1 - chroot/debian11.sh | 1 + chroot/voidglibc.sh | 2 ++ chroot/voidmusl.sh | 11 ++++++----- irssi/solarized-powerline.theme | 4 ++-- kubernetes/pihole/10-customdns.conf | 2 ++ kubernetes/pihole/dhcp | 10 ++++++++++ services/clipd/run | 2 +- 14 files changed, 87 insertions(+), 23 deletions(-) diff --git a/.Xresources b/.Xresources index 3d52f5a..b54aabc 100644 --- a/.Xresources +++ b/.Xresources @@ -11,7 +11,7 @@ Xft.embeddedbitmap: 1 xterm*dpi: 96 gnome-terminal*dpi: 96 *.alpha: 1.0 -*.font: DejaVu Sans Mono for Powerline:pixelsize=11.3:antialias=true:autohint=true; +*.font: DejaVuSansMono Nerd Font Mono:pixelsize=11.3:antialias=true:autohint=true; xterm*scaleHeight: 1.01 #define base00 #2E3431 @@ -47,3 +47,11 @@ xterm*scaleHeight: 1.01 *.color13: base0D *.color14: base0E *.color15: base0F + +/* xterm*faceName: DejaVu Sans Mono Book */ +xterm*faceSize: 11 +xterm*savelines: 10000 +xterm*rightScrollBar: false +xterm*ScrollBar: false +xterm*background: black +xterm*foreground: lightgray diff --git a/.tmux.conf b/.tmux.conf index c3a5421..8a81091 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -130,8 +130,11 @@ unbind Right setw -g monitor-activity off set -g visual-activity off -set -g pane-active-border-style fg='#669933' +set -g pane-active-border-style fg='#669933',bold set -g pane-border-style fg='#0099ff' +set -g pane-border-status top +set -g pane-border-lines heavy +set -g pane-border-format "#{pane_index} #{pane_current_command}" # message text set -g message-style bg='#44475a',fg='#8be9fd' diff --git a/.vimrc b/.vimrc index 443c695..ca8cb50 100644 --- a/.vimrc +++ b/.vimrc @@ -140,7 +140,6 @@ Plug 'tpope/vim-vinegar' Plug 'tpope/vim-commentary' Plug 'tpope/vim-rhubarb' Plug 'rgrinberg/vim-ocaml' -Plug 'terryma/vim-multiple-cursors' Plug 'kshenoy/vim-signature' Plug 'Konfekt/vim-scratchpad' Plug 'rust-lang/rust.vim' @@ -205,7 +204,9 @@ Plug 'calincru/flex-bison-syntax' Plug 'tridactyl/vim-tridactyl' Plug 'hrother/offlineimaprc.vim' Plug 'lifepillar/pgsql.vim', {'for': ['sql','pqsl', 'pgsql']} +Plug 'HiPhish/info.vim' " Plug 'kana/vim-operator-user' +" Plug 'terryma/vim-multiple-cursors' " Plug 'haya14busa/vim-operator-flashy' " Plug 'terryma/vim-expand-region' " Plug 'romainl/vim-devdocs' @@ -1030,7 +1031,7 @@ function! s:compiler_explorer() set syntax=nasm 1 endfunction -" command! -complete=shellcmd -nargs=0 CompilerExplorer call s:compiler_explorer() +command! CompilerExplorer call s:compiler_explorer() vmap :CompilerExplorer "view the python docs for the word under cursor in a split window @@ -1043,7 +1044,7 @@ function! s:pythondoc() set syntax=man 1 endfunction -" command! -complete=shellcmd -nargs=0 PythonDoc call s:pythondoc() +command! PythonDoc call s:pythondoc() nnoremap h :PythonDoc vnoremap h :PythonDoc @@ -1442,6 +1443,11 @@ augroup ALELUA autocmd FileType lua let b:ale_linters = {'lua': ['luacheck']} autocmd FileType lua let b:ale_fixers = {'lua': ['lua-format']} augroup END +let g:ale_sh_shfmt_options = "-l -w" +augroup ALESH + autocmd! + autocmd FileType sh let b:ale_fixers = {'sh': ['shfmt']} +augroup END "latex let g:tex_flavor = 'latex' @@ -1582,6 +1588,28 @@ autocmd FileType vista,vista_kind nnoremap :call vista#fi " recutils let g:recutils_no_maps = 1 +" info +augroup VIMINFO + autocmd! + autocmd FileType info set number + autocmd FileType info nmap gu (InfoUp) + autocmd FileType info nmap gn (InfoNext) + autocmd FileType info nmap gp (InfoPrev) + autocmd FileType info nmap gm (InfoMenu) + autocmd FileType info nmap gf (InfoFollow) +augroup END +function! s:infovim() + let l:vword = expand("") + execute 'vert Info' l:vword +endfunction +command! InfoVimF1 call s:infovim() +nnoremap i :InfoVimF1 +vnoremap i :InfoVimF1 +function! s:vvman(one, two) + execute 'Vman' a:one a:two +endfunction +let g:Infofallback = function("s:vvman") + "this should be here at the end so nothing else could override it hi SpecialKey ctermbg=16 hi Pmenu ctermbg=233 diff --git a/.zshrc b/.zshrc index d81b437..12eaf4a 100644 --- a/.zshrc +++ b/.zshrc @@ -190,6 +190,8 @@ alias offlineimaprc="vim ~/scripts/.offlineimaprc" alias fixofflineimaprc="cp ~/scripts/.offlineimaprc ~/" alias screenrc="vim ~/scripts/.screenrc" alias fixscreenrc="cp ~/scripts/.screenrc ~/" +alias xresources="vim ~/scripts/.Xresources" +alias fixxresources="cp ~/scripts/.Xresources ~/.Xresources && xrdb -merge ~/.Xresources" #autosuggest ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold" @@ -221,11 +223,11 @@ docc() { } dockernuke() { - docker stop `docker ps -qa` - docker rm `docker ps -qa` - docker rmi -f `docker images -qa ` - docker volume rm $(docker volume ls -qf) - docker network rm `docker network ls -q` + docker stop `docker ps -qa` + docker rm `docker ps -qa` + docker rmi -f `docker images -qa ` + docker volume rm $(docker volume ls -qf) + docker network rm `docker network ls -q` } mdvv() { @@ -435,7 +437,11 @@ eval "$(fnm env)" # jellybeans takes forever to load. iceberg is very fast. vman() { - vim -c "Man $1 $2" -c 'silent only' -c 'colo iceberg' -c 'highlight Normal ctermbg=None' -c 'highlight lineNr ctermbg=16' -c 'hi EndOfBuffer ctermbg=16' + vim -R -M -c 'silent only' -c 'colo iceberg' -c 'highlight Normal ctermbg=None' -c 'highlight lineNr ctermbg=16' -c 'hi EndOfBuffer ctermbg=16' -c "Man $1 $2" +only +} + +vinfo() { + vim -R -M -c 'silent only' -c 'colo iceberg' -c 'highlight Normal ctermbg=None' -c 'highlight lineNr ctermbg=16' -c 'hi EndOfBuffer ctermbg=16' -c "Info $1 $2" +only } ddig() { @@ -505,6 +511,10 @@ fzf-down() { fzf-tmux -p 80%,80% -- --bind ctrl-/:toggle-preview "$@" } +dff(){ + df -h "$@" | colcol | column -t +} + # these i stole from junegunn to try out fzf_gf() { is_in_git_repo || return diff --git a/baseline/.tmux.conf b/baseline/.tmux.conf index de0c3a6..4690cb4 100644 --- a/baseline/.tmux.conf +++ b/baseline/.tmux.conf @@ -43,13 +43,13 @@ set -g status-justify left set -g status-fg colour137 set -g status-attr dim set -g status-left "" -set -g status-right "#[fg=colour233,bg=colour2,bold] %d/%m #[fg=colour233,bg=colour107,bold] %H:%M:%S " +set -g status-right "#[fg=colour233,bg=colour2,bold] %d/%m #[fg=colour233,bg=colour107,bold] %H:%M:%S #[fg=colour0,bg=colour24] #(if [ $(uname) = Linux ];then lsb_release -a 2>/dev/null | grep Distributor | awk '{print $3}';else uname;fi) " set -g status-right-length 70 set -g status-left-length 70 setw -g window-status-current-fg colour0 setw -g window-status-current-bg colour22 setw -g window-status-current-attr bold -setw -g window-status-current-format "#[fg=colour249] #I#[fg=colour255]:#[fg=colour16]#W#[fg=colour249]#F " +setw -g window-status-current-format "#[fg=colour249,bold] #I#[fg=colour255]:#[fg=colour16,bold]#W#[fg=colour249]#F " setw -g window-status-fg colour0 setw -g window-status-bg colour23 setw -g window-status-attr none diff --git a/baseline/.vimrc b/baseline/.vimrc index fada8b3..e459f99 100644 --- a/baseline/.vimrc +++ b/baseline/.vimrc @@ -182,7 +182,7 @@ hi def InterestingWord5 ctermfg=16 ctermbg=211 guifg=#000000 guibg=#ff87af hi def InterestingWord6 ctermfg=16 ctermbg=195 guifg=#000000 guibg=#d7ffff hi def InterestingWord7 ctermfg=16 ctermbg=99 guifg=#000000 guibg=#875fff hi def InterestingWord8 ctermfg=16 ctermbg=35 guifg=#000000 guibg=#00af5f -hi def InterestingWord9 ctermfg=16 ctermbg=57 guifg=#000000 guibg=#5f00ff +hi def InterestingWord9 ctermfg=16 ctermbg=209 guifg=#000000 guibg=#ff875f hi def InterestingWord0 ctermfg=16 ctermbg=39 guifg=#000000 guibg=#00afff " Steve Losh's highlight function diff --git a/bin/colcol b/bin/colcol index bb1eb61..5a4ff50 100755 --- a/bin/colcol +++ b/bin/colcol @@ -23,7 +23,6 @@ BEGIN { if (1 == NR){ max_col = NF } - # printf max_col" " printf NR-1" " for (i = 1; i <= NF; i++){ if (i >= colors_len) { diff --git a/chroot/debian11.sh b/chroot/debian11.sh index 158224e..3fe88da 100755 --- a/chroot/debian11.sh +++ b/chroot/debian11.sh @@ -5,4 +5,5 @@ sudo mount -t proc proc $CHROOT_DIR/proc/ sudo mount -t sysfs sys $CHROOT_DIR/sys/ # sudo mount -o bind /tmp $CHROOT_DIR/tmp/ # sudo mount -o bind /dev $CHROOT_DIR/dev/ +sudo mount -t devpts none "$CHROOT_DIR/dev/pts" -o ptmxmode=0666,newinstance sudo chroot $CHROOT_DIR diff --git a/chroot/voidglibc.sh b/chroot/voidglibc.sh index 90b440b..bc2c47b 100755 --- a/chroot/voidglibc.sh +++ b/chroot/voidglibc.sh @@ -5,4 +5,6 @@ sudo mount -t proc proc $CHROOT_DIR/proc/ sudo mount -t sysfs sys $CHROOT_DIR/sys/ # sudo mount -o bind /tmp $CHROOT_DIR/tmp/ # sudo mount -o bind /dev $CHROOT_DIR/dev/ +mkdir -p "$CHROOT_DIR/dev/pts" +sudo mount -t devpts none "$CHROOT_DIR/dev/pts" -o ptmxmode=0666,newinstance sudo chroot $CHROOT_DIR diff --git a/chroot/voidmusl.sh b/chroot/voidmusl.sh index 3f74e05..9d98ae6 100755 --- a/chroot/voidmusl.sh +++ b/chroot/voidmusl.sh @@ -3,9 +3,10 @@ CHROOT_DIR=/home/devi/rootfs/voidmusl sudo mount -t proc proc $CHROOT_DIR/proc/ sudo mount -t sysfs sys $CHROOT_DIR/sys/ -sudo mount -o bind /tmp $CHROOT_DIR/tmp/ -sudo mount -o bind /dev $CHROOT_DIR/dev/ -rmdir $CHROOT_DIR/dev/pts -sudo mount -t devpts none $CHROOT_DIR/dev/pts -o ptmxmode=0666,newinstance -ln -fs /dev/pts/ptmx $CHROOT_DIR/dev/ptmx +# sudo mount -o bind /tmp $CHROOT_DIR/tmp/ +# sudo mount -o bind /dev $CHROOT_DIR/dev/ +# rmdir $CHROOT_DIR/dev/pts +mkdir -p "$CHROOT_DIR/dev/pts" +sudo mount -t devpts none "$CHROOT_DIR/dev/pts" -o ptmxmode=0666,newinstance +# ln -fs /dev/pts/ptmx $CHROOT_DIR/dev/ptmx sudo chroot $CHROOT_DIR diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme index dd86276..734aefa 100644 --- a/irssi/solarized-powerline.theme +++ b/irssi/solarized-powerline.theme @@ -436,10 +436,10 @@ formats = { end_of_who = "%z00d700%kWHO %N%k%N END"; end_of_whois = "%z00d700%kWHOIS %N%k%N END"; end_of_whowas = "%z00d700%kWHOWAS %N%k%N END"; - netsplit = "%k%z8787ff%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2"; + netsplit = "%k%z8787ff%8%8 NETSPLIT %0%w%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2"; netsplit_join = "%k%z8787ff NETSPLIT %k%8%N Joins: $0"; netsplit_join_more = "%k%z8787ff NETSPLIT %k%8%N Joins: $0 (+$1 more)"; - netsplit_more = "%k%z8787ff%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2 (+$3 more, use /NETSPLIT to show all of them)"; + netsplit_more = "%k%z8787ff%8%8 NETSPLIT %0%w%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2 (+$3 more, use /NETSPLIT to show all of them)"; no_topic = "%k%N No topic set for {channelhilight $0}"; own_ctcp = "%k%z005f87 CTCP {hilight $2-}  {inick $0} %n%Z005f87%N"; server_chanmode_change = "%k%z8787ff SERVERMODE %k%8 {channelhilight $0} {mode $1} by {nick $2}"; diff --git a/kubernetes/pihole/10-customdns.conf b/kubernetes/pihole/10-customdns.conf index af0b1b7..89cfd1f 100644 --- a/kubernetes/pihole/10-customdns.conf +++ b/kubernetes/pihole/10-customdns.conf @@ -6,4 +6,6 @@ host-record=phone.lan,192.168.1.110 host-record=switch.lan,192.168.1.106 host-record=router.lan,192.168.1.200 host-record=voidbox.lan,192.168.1.103 +host-record=voidbox2.lan,192.168.1.117 host-record=searx.lan,192.168.1.109 +host-record=rpiz2.lan,192.168.1.116 diff --git a/kubernetes/pihole/dhcp b/kubernetes/pihole/dhcp index 3f51e22..25d3ca7 100644 --- a/kubernetes/pihole/dhcp +++ b/kubernetes/pihole/dhcp @@ -59,3 +59,13 @@ config 'host' option 'name' 'pi2' option 'mac' 'B8:27:EB:70:49:C4' option 'ip' '192.168.1.105' + +config 'host' + option 'name' 'voidbox2' + option 'mac' 'B0:A7:B9:58:53:45' + option 'ip' '192.168.1.117' + +config 'host' + option 'name' 'rpiz2' + option 'mac' 'E4:5F:01:4B:FF:DC' + option 'ip' '192.168.1.116' diff --git a/services/clipd/run b/services/clipd/run index ff08969..493539d 100755 --- a/services/clipd/run +++ b/services/clipd/run @@ -1,3 +1,3 @@ #!/bin/sh exec 2>&1 -DISPLAY=:0.0 exec /home/devi/scripts/bin/clipd +DISPLAY=:0.0 exec /home/devi/scripts/bin/clipd -s 200 -f /home/devi/.clip_history -- cgit v1.2.3