update

9 files changed, 181 insertions, 21 deletions

diff --git a/.muttrc b/.muttrc
index 7d884bd..0869ecd 100644
--- a/.muttrc
+++ b/.muttrc
@@ -1,3 +1,4 @@
+# vim: filetype=neomuttrc
 set from = 'thabogre@gmail.com'
 set realname = 'farzad sadeghi'
 set imap_user = 'thabogre@gmail.com'
@@ -35,6 +36,8 @@ set imap_keepalive = 900
 set timeout=30
 folder-hook gmail/important    "color status        J_black         color136        "
 #set imap_list_subscribed=yes
+set dsn_notify="failure,delay"
+set dsn_return="hdrs"
 
 set sidebar_visible = yes
 set mail_check_stats = yes
@@ -131,11 +134,21 @@ color index         brightred       red             "~="                       #
 
 # message headers ------------------------------------------------------
 
-color hdrdefault    brightcolor222  default
+color hdrdefault    default  default
+color header        color69         default        "^ARC-"
+color header        color25         default        "^Received"
+color header        color30         default        "^X-"
+color header        color36         default        "^List-"
+color header        color63         default        "^MIME-"
+color header        color99         default        "^Content-"
+color header        color209        default        "^DKIM"
+color header        color132        default        "^Authentication"
+color header        color131        default        "^User-Agent"
 color header        color27         default        "^(To|Cc|Bcc)"
 color header        color28         default        "^(From)"
 color header        color6          default        "^(Date)"
 color header        color22         default        "^(Subject)"
+unignore *
 
 # body -----------------------------------------------------------------
 
@@ -162,6 +175,11 @@ color body          color39         default        "(Good signature)"
 color body          color235        default        "^gpg: Good signature .*"
 color body          color241        default        "^gpg: "
 color body          color241        color160        "^gpg: BAD signature from.*"
+color body          color30         default         "^# \.*"
+color body          color31         default         "^## \.*"
+color body          color32         default         "^### \.*"
+color body          color33         default         "^#### \.*"
+color body          color29         default         "^(\t| )*(-|\\*) \.*"
 mono  body          bold                            "^gpg: Good signature"
 mono  body          bold                            "^gpg: BAD signature from.*"
 
@@ -251,3 +269,59 @@ auto_view  text/html
 bind index,pager \CP sidebar-prev
 bind index,pager \CN sidebar-next
 bind index,pager \CO sidebar-open
+bind pager j next-line
+bind pager k previous-line
+bind pager l view-attachments
+bind index l display-message
+bind browser l select-entry
+bind index h noop
+bind browser h goto-parent
+bind browser gg top-page
+bind pager g noop
+bind pager gg top
+bind pager G bottom
+bind index g noop
+bind index gg first-entry
+bind browser G bottom-page
+bind index G last-entry
+bind index D delete-message
+bind index U undelete-message
+bind index,pager R group-reply
+bind attach,browser,pager,index \CF next-page
+bind attach,browser,pager,index \CB previous-page
+bind attach,browser,pager,index \Cu half-up
+bind attach,browser,pager,index \Cd half-down
+bind index H top-page
+bind index M middle-page
+bind index L bottom-page
+
+# color   body    brightwhite     default         "^[[:space:]].*"
+color   body    yellow          default         "^(diff).*"
+color   body    white           default         "^[\-\-\-].*"
+color   body    white           default         "^[\+\+\+].*"
+color   body    green           default         "^[\+].*"
+color   body    red             default         "^[\-].*"
+color   body    brightblue      default         "[@@].*"
+color   body    brightwhite     default         "^(\s).*"
+color   body    cyan            default         "^(Signed-off-by).*"
+color   body    cyan            default         "^(Docker-DCO-1.1-Signed-off-by).*"
+color   body    brightwhite     default         "^(Cc)"
+color   body    yellow          default         "^diff \-.*"
+color   body    brightwhite     default         "^index [a-f0-9].*"
+color   body    brightblue      default         "^---$"
+color   body    white           default         "^\-\-\- .*"
+color   body    white           default         "^[\+]{3} .*"
+color   body    green           default         "^[\+][^\+]+.*"
+color   body    red             default         "^\-[^\-]+.*"
+color   body    brightblue      default         "^@@ .*"
+color   body    green           default         "LGTM"
+color   body    brightmagenta   default         "-- Commit Summary --"
+color   body    brightmagenta   default         "-- File Changes --"
+color   body    brightmagenta   default         "-- Patch Links --"
+color   body    green           default         "^Merged #.*"
+color   body    red             default         "^Closed #.*"
+color   body    brightblue      default         "^Reply to this email.*"
+
+# set pager_format=" %n %zc  %T %s%*  %{!%d %b · %H:%M} %?X?  %X ? %P  "
+# set vfolder_format = " %N %?n?%3n&   ?  %8m  · %f"
+# set attach_format = "%u%D  %T%-75.75d %?T?%&   ? %5s · %m/%M"
diff --git a/.vimrc b/.vimrc
index a04eea7..12ca145 100644
--- a/.vimrc
+++ b/.vimrc
@@ -34,6 +34,7 @@ syntax sync minlines=64
 set ttyfast
 set relativenumber
 set wildignorecase
+set shm=a
 " set wildmode=list:longest,full
 set wildignore+=*/tmp/*,*.so,*.swp,*.zip
 set wildmenu
@@ -113,8 +114,6 @@ Plugin 'majutsushi/tagbar'
 Plugin 'szw/vim-maximizer'
 Plugin 'chrisbra/csv.vim'
 Plugin 'Valloric/YouCompleteMe'
-Plugin 'vim-pandoc/vim-pandoc'
-Plugin 'vim-pandoc/vim-pandoc-syntax'
 Plugin 'elzr/vim-json'
 Plugin 'wellle/context.vim'
 Plugin 'ludovicchabant/vim-gutentags'
@@ -127,7 +126,6 @@ Plugin 'chrisbra/Recover.vim'
 Plugin 'wellle/targets.vim'
 Plugin 'rhysd/git-messenger.vim'
 Plugin 'mhinz/vim-grepper'
-Plugin 'vim-utils/vim-troll-stopper'
 Plugin 'junegunn/limelight.vim'
 Plugin 'valloric/MatchTagAlways'
 Plugin 'junegunn/vim-peekaboo'
@@ -159,7 +157,6 @@ Plugin 'amix/vim-zenroom2'
 Plugin 'raimon49/requirements.txt.vim'
 Plugin 'Shougo/vimproc.vim'
 Plugin 'rhysd/vim-llvm'
-Plugin 'rhysd/vim-gfm-syntax'
 Plugin 'haya14busa/is.vim'
 Plugin 'haya14busa/vim-asterisk'
 Plugin 'haya14busa/incsearch.vim'
@@ -168,16 +165,22 @@ Plugin 'lervag/vimtex'
 Plugin 'vim-utils/vim-man'
 Plugin 'ajh17/VimCompletesMe'
 Plugin 'ryanoasis/vim-devicons'
+Plugin 'godlygeek/tabular'
 Plugin 'sheerun/vim-polyglot'
 Plugin 'dbeniamine/cheat.sh-vim'
 Plugin 'lifepillar/pgsql.vim'
-" Plugin 'tmux-plugins/vim-tmux-focus-events'
 Plugin 'congma/vim-compiler-checkbashisms'
 Plugin 'hsanson/vim-openapi'
 Plugin 'mattn/emmet-vim'
 Plugin 'hail2u/vim-css3-syntax'
 Plugin 'chrisbra/unicode.vim'
 Plugin 'meatballs/vim-xonsh'
+Plugin 'junegunn/gv.vim'
+" Plugin 'rhysd/vim-gfm-syntax'
+" Plugin 'vim-utils/vim-troll-stopper'
+" Plugin 'vim-pandoc/vim-pandoc'
+" Plugin 'vim-pandoc/vim-pandoc-syntax'
+" Plugin 'tmux-plugins/vim-tmux-focus-events'
 " Plugin 'skammer/vim-css-color'
 " Plugin 'christoomey/vim-tmux-navigator'
 " Plugin 'jelera/vim-javascript-syntax'
@@ -209,9 +212,9 @@ Plugin 'meatballs/vim-xonsh'
 call vundle#end()
 filetype plugin indent on
 
-let g:gfm_syntax_enable_always = 1
-let g:gfm_syntax_enable_filetypes = ['markdown.gfm']
-autocmd BufRead,BufNew,BufNewFile README.md setlocal ft=markdown.gfm
+" vim-markdown
+" let g:vim_markdown_math = 1
+" let g:vim_markdown_strikethrough = 1
 
 "jellybeans
 silent! colo jellybeans
@@ -273,7 +276,7 @@ try
   let g:airline#extensions#tabline#formatter = 'default'
   let g:airline#extensions#ale#enabled = 1
   let g:airline#extensions#branch#enabled = 1
-  let g:airline#extensions#xkblayout#enabled = 1
+  " let g:airline#extensions#xkblayout#enabled = 1
 catch
 endtry
 let g:airline_theme = 'jellybeans'
@@ -290,7 +293,7 @@ function! Airline_Custom()
   \])
 endfunction
 autocmd user AirlineAfterInit call Airline_Custom()
-let g:XkbSwitchLib = '/usr/local/lib/libxkbswitch.so'
+" let g:XkbSwitchLib = '/usr/local/lib/libxkbswitch.so'
 let g:airline_exclude_preview = 1
 
 syntax on
@@ -394,8 +397,12 @@ map <F24> <S-Delete>
 map! <F24> <S-Delete>
 
 "cnoremap help vert help
-map <F1> <Plug>(expand_region_shrink)
-map <F2> <Plug>(expand_region_expand)
+" map <F1> <Plug>(expand_region_shrink)
+" map <F2> <Plug>(expand_region_expand)
+nnoremap <F1> :set rl!<CR>
+inoremap <F1> <ESC>:set rl!<CR>i
+nnoremap <F2> :set spell!<CR>
+inoremap <F2> <ESC>:set spell!<CR>i
 nnoremap <F3> :bp<CR>
 nnoremap <F4> :bn<CR>
 inoremap <F3> <ESC>:bp<CR>
@@ -641,6 +648,33 @@ let g:tagbar_type_vimwiki = {
           \ , 'ctagsargs': 'default'
           \ }
 
+let g:tagbar_type_markdown = {
+  \ 'ctagstype'	: 'markdown',
+  \ 'kinds'		: [
+    \ 'c:chapter:0:1',
+    \ 's:section:0:1',
+    \ 'S:subsection:0:1',
+    \ 't:subsubsection:0:1',
+    \ 'T:l4subsection:0:1',
+    \ 'u:l5subsection:0:1',
+  \ ],
+  \ 'sro'			: '""',
+  \ 'kind2scope'	: {
+    \ 'c' : 'chapter',
+    \ 's' : 'section',
+    \ 'S' : 'subsection',
+    \ 't' : 'subsubsection',
+    \ 'T' : 'l4subsection',
+  \ },
+  \ 'scope2kind'	: {
+    \ 'chapter' : 'c',
+    \ 'section' : 's',
+    \ 'subsection' : 'S',
+    \ 'subsubsection' : 't',
+    \ 'l4subsection' : 'T',
+  \ },
+\ }
+
 "doxygentoolkit
 autocmd BufNewFile,BufRead,BufEnter *.sol let g:DoxygenToolkit_briefTag_pre="@dev  "
 
@@ -922,7 +956,6 @@ highlight vimBufnrWarn ctermbg=16 ctermfg=202
 iab strign string
 iab pritn print
 iab retrun return
-iab return return
 iab fucntion function
 iab funciton function
 iab tehn then
@@ -1085,9 +1118,6 @@ let g:haskell_enable_static_pointers = 1
 let g:haskell_backpack = 1
 let g:haskell_disable_TH = 0
 
-"vim-markdown
-let g:vim_markdown_strikethrough = 1
-
 "keeps track of the cursor in insert mode, pull it back by one so it appears
 "not to move when exiting insert
 let CursorColumnI = 0
@@ -1328,7 +1358,7 @@ let wiki.path = '~/vimwiki/'
 let wiki.nested_syntaxes = {'python': 'python', 'c++': 'cpp', 'c':'c', 'go':'go', 'javascript':'javascript', 'sh':'sh', 'yaml':'yaml', 'Dockerfile':'Dockerfile'}
 let g:vimwiki_list = [wiki]
 let g:vimwiki_global_ext = 0
-" let g:vimwiki_list = [{'path': '~/vimwiki/', 'syntax': 'markdown', 'ext': '.md'}]
+" let g:vimwiki_list = [{'path': '~/devi/devi/work/vimwiki.git/master', 'syntax': 'markdown', 'ext': '.wiki'}]
 
 "this should be here at the end so nothing else could override it
 hi SpecialKey ctermbg=16
diff --git a/.zshrc b/.zshrc
index 36f319a..ce8c72b 100644
--- a/.zshrc
+++ b/.zshrc
@@ -16,7 +16,7 @@ autoload -U compinit && compinit -u
 
 alias ls="exa"
 alias la="exa -a"
-alias ll="exa -abghHliSmxGF --git -@"
+alias ll="exa -abghHliSmxF --git -@"
 alias lss="exa -S"
 alias ee="nautilus ."
 alias updaterc="cp ~/scripts/.zshrc ~/.zshrc"
@@ -140,6 +140,7 @@ alias proxychainsrc="vim ~/scripts/.proxychains/proxychains.conf"
 alias fixproxychainsrc="cp ~/scripts/.proxychains/proxychains.conf ~/.proxychains/proxychains.conf"
 alias zgit="proxychains git"
 alias socks5z="ssh -N -D 9998 -o ExitOnForwardFailure=yes -l pi 192.168.1.108"
+alias socks5ir="ssh -N -D 9997 -o ExitOnForwardFailure=yes -l ubuntu -p 1022 terminaldweller.com"
 
 #autosuggest
 ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold"
@@ -242,10 +243,10 @@ export PATH=$PATH:/home/devi/k3s
 export PATH=$PATH:/home/devi/kompose
 export PATH=$PATH:/home/devi/mongosh
 export PATH=$PATH:/home/devi/powershell
-export PATH=$PATH:/home/devi/protobuf/bin
 export PATH=$PATH:/home/devi/ytfzf
 export PATH=$PATH:/home/devi/gotty
 export PATH=$PATH:/home/devi/.poetry/bin
+export PATH=$PATH:/home/devi/pulumi
 
 export EDITOR=vim
 export BROWSER=w3m
diff --git a/baseline/.vimrc b/baseline/.vimrc
index 3cbbdb1..94d49a1 100644
--- a/baseline/.vimrc
+++ b/baseline/.vimrc
@@ -18,6 +18,7 @@ Plugin 'majutsushi/tagbar'
 Plugin 'ludovicchabant/vim-gutentags'
 Plugin 'mbbill/undotree'
 Plugin 'tpope/vim-commentary'
+Plugin 'wellle/context.vim'
 call vundle#end()
 filetype plugin indent on
 
@@ -94,6 +95,7 @@ map <F13> <S-F10>
 map! <F13> <S-F10>
 nnoremap <F10> :vsp<cr>
 nnoremap <S-F10> :sp<cr>
+nnoremap <F5> :ContextToggle<CR>
 set pastetoggle=<F11>
 nnoremap <leader>cd :cd %:p:h<cr>
 nmap ]c :cn<CR>
diff --git a/cygwin/socks5.bat b/cygwin/socks5.bat
index 95acfa3..6fb2132 100644
--- a/cygwin/socks5.bat
+++ b/cygwin/socks5.bat
@@ -1 +1 @@
-sh -N -D 9999 -o ExitOnForwardFailure=yes -l pi 192.168.1.108
+ssh -N -D 9999 -o ExitOnForwardFailure=yes -l pi 192.168.1.108
diff --git a/postit b/postit
index 5bd3c71..e79220c 100644
--- a/postit
+++ b/postit
@@ -15,3 +15,7 @@ script -q -c "sudo tcpdump -l port 53 2>/dev/null | grep --line-buffered ' A? '"
 st -f "DejaVuSansMono-11.3"
 https://wigle.net/
 export WSL_INTEROP=/run/WSL/13105_interop
+/mnt/c/Program\ Files/PowerShell/7/pwsh.exe
+hyperion--16:18:30
+sudo ./irc-slack --port 6667 --host 0.0.0.0 --debug
+ssh -N -D 9999 -o ExitOnForwardFailure=yes -l pi 192.168.1.108
diff --git a/ssh/config b/ssh/config
new file mode 100644
index 0000000..2f47c0c
--- /dev/null
+++ b/ssh/config
@@ -0,0 +1,6 @@
+host github.com
+  user terminaldweller
+  identityfile ~/.ssh/id_rsa
+host git.zharfpouyan.net
+  user sadeghi_f
+  identityfile ~/.ssh/zharf
diff --git a/terminaldweller.com/haproxy/docker-compose.yaml b/terminaldweller.com/haproxy/docker-compose.yaml
new file mode 100644
index 0000000..fe861d0
--- /dev/null
+++ b/terminaldweller.com/haproxy/docker-compose.yaml
@@ -0,0 +1,9 @@
+version: "3.4"
+services:
+  haproxy:
+    image: haproxy
+    ports:
+      - "80:80"
+    volumes:
+      - ./haproxy.cfg:/usr/local/etc/haproxy/haproxy.cfg:ro
+
diff --git a/terminaldweller.com/haproxy/haproxy.cfg b/terminaldweller.com/haproxy/haproxy.cfg
new file mode 100644
index 0000000..39a42d2
--- /dev/null
+++ b/terminaldweller.com/haproxy/haproxy.cfg
@@ -0,0 +1,34 @@
+global
+log 127.0.0.1 local0
+ 
+defaults
+timeout connect 5000ms
+timeout client 50000ms
+timeout server 50000ms
+mode http
+
+frontend http
+bind *:80
+acl blog-host hdr_sub(host) -i blog.terminaldweller.com
+acl mail-host hdr_sub(host) -i mail.terminaldweller.com
+acl api-host hdr_sub(host) -i api.terminaldweller.com
+
+use_backend blog-backend if blog-host
+use_backend mail-backend if mail-host
+use_backend api-backend if api-host
+default_backend blog-backend
+
+backend blog-backend
+mode http
+option forwardfor
+server blog-host 192.99.102.52:9000 check
+
+backend mail-backend
+mode http
+option forwardfor
+server mail-host 185.126.202.69:80 check
+
+backend api-backend
+mode http
+option forwardfor
+server api-host 192.99.102.52:8008 check