aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
Diffstat (limited to '')
-rw-r--r--.mutt/mailcap3
-rw-r--r--.secrets.baseline378
-rw-r--r--.tmux.conf3
-rw-r--r--.vimrc8
-rw-r--r--.w3m/keymap4
-rw-r--r--.zshrc15
-rwxr-xr-xbin/colo436
-rwxr-xr-xbin/run_with_dmenu.sh7
-rwxr-xr-xbin/w3m-sandbox99
-rwxr-xr-xbin/xman23
-rw-r--r--irssi/config14
-rwxr-xr-xirssi/irssi.sh1
-rw-r--r--irssi/solarized-powerline.theme4
-rw-r--r--terminaldweller.com/ejabberd/ejabberd.yml6
-rw-r--r--terminaldweller.com/haproxy/haproxy.cfg10
15 files changed, 546 insertions, 465 deletions
diff --git a/.mutt/mailcap b/.mutt/mailcap
index a55433f..c0f0cd0 100644
--- a/.mutt/mailcap
+++ b/.mutt/mailcap
@@ -1,2 +1,3 @@
-text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -collapse_br_tags -dump %s; nametemplate=%s.html; copiousoutput
+#text/html; lynx -assume_charset=%{charset} -display_charset=utf-8 -collapse_br_tags -dump %s; nametemplate=%s.html; copiousoutput
#text/html; beautiful_html_render %s; nametemplate=%s.html; copiousoutput;
+text/html; w3m -I %{charset} -T text/html; copiousoutput;
diff --git a/.secrets.baseline b/.secrets.baseline
new file mode 100644
index 0000000..4ccf93c
--- /dev/null
+++ b/.secrets.baseline
@@ -0,0 +1,378 @@
+{
+ "version": "1.2.0",
+ "plugins_used": [
+ {
+ "name": "ArtifactoryDetector"
+ },
+ {
+ "name": "AWSKeyDetector"
+ },
+ {
+ "name": "AzureStorageKeyDetector"
+ },
+ {
+ "name": "Base64HighEntropyString",
+ "limit": 4.5
+ },
+ {
+ "name": "BasicAuthDetector"
+ },
+ {
+ "name": "CloudantDetector"
+ },
+ {
+ "name": "GitHubTokenDetector"
+ },
+ {
+ "name": "HexHighEntropyString",
+ "limit": 3.0
+ },
+ {
+ "name": "IbmCloudIamDetector"
+ },
+ {
+ "name": "IbmCosHmacDetector"
+ },
+ {
+ "name": "JwtTokenDetector"
+ },
+ {
+ "name": "KeywordDetector",
+ "keyword_exclude": ""
+ },
+ {
+ "name": "MailchimpDetector"
+ },
+ {
+ "name": "NpmDetector"
+ },
+ {
+ "name": "PrivateKeyDetector"
+ },
+ {
+ "name": "SendGridDetector"
+ },
+ {
+ "name": "SlackDetector"
+ },
+ {
+ "name": "SoftlayerDetector"
+ },
+ {
+ "name": "SquareOAuthDetector"
+ },
+ {
+ "name": "StripeDetector"
+ },
+ {
+ "name": "TwilioKeyDetector"
+ }
+ ],
+ "filters_used": [
+ {
+ "path": "detect_secrets.filters.allowlist.is_line_allowlisted"
+ },
+ {
+ "path": "detect_secrets.filters.common.is_baseline_file",
+ "filename": ".secrets.baseline"
+ },
+ {
+ "path": "detect_secrets.filters.common.is_ignored_due_to_verification_policies",
+ "min_level": 2
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_indirect_reference"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_likely_id_string"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_lock_file"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_not_alphanumeric_string"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_potential_uuid"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_prefixed_with_dollar_sign"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_sequential_string"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_swagger_file"
+ },
+ {
+ "path": "detect_secrets.filters.heuristic.is_templated_secret"
+ }
+ ],
+ "results": {
+ "_emacs.el": [
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "3ceac0034c82ec474c0adccb5762ec1fe472312b",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "5262c8ec5e10a044e3134353e56daf2180234598",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "7bf17612e927a4c4b70dc288243b351ade4e3c0f",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "7f8e1f31121ef0377e8b73338ac9c2de2fd46afa",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "89404f61548e663cf654747751d1f2b3a216b032",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "96c0baaabd67700efdc4a3d9ae2e9a8069beba97",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "c88ea98a7908e22612fd52dd9372393063bd582b",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "fae26f12de312bf6db66cf0ee5862f7d749c8f82",
+ "is_verified": false,
+ "line_number": 39
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "_emacs.el",
+ "hashed_secret": "fb4bd4c824b5e3f20035f877a1cf11b0e0473c44",
+ "is_verified": false,
+ "line_number": 39
+ }
+ ],
+ "bbox/linux/.config": [
+ {
+ "type": "Secret Keyword",
+ "filename": "bbox/linux/.config",
+ "hashed_secret": "e9d596e7807a846bc76a51e845fcc844f24dfdaa",
+ "is_verified": false,
+ "line_number": 534
+ }
+ ],
+ "cygwin/_emacs.el": [
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "3ceac0034c82ec474c0adccb5762ec1fe472312b",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "5262c8ec5e10a044e3134353e56daf2180234598",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "7bf17612e927a4c4b70dc288243b351ade4e3c0f",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "7f8e1f31121ef0377e8b73338ac9c2de2fd46afa",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "89404f61548e663cf654747751d1f2b3a216b032",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "96c0baaabd67700efdc4a3d9ae2e9a8069beba97",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "c88ea98a7908e22612fd52dd9372393063bd582b",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "fae26f12de312bf6db66cf0ee5862f7d749c8f82",
+ "is_verified": false,
+ "line_number": 40
+ },
+ {
+ "type": "Hex High Entropy String",
+ "filename": "cygwin/_emacs.el",
+ "hashed_secret": "fb4bd4c824b5e3f20035f877a1cf11b0e0473c44",
+ "is_verified": false,
+ "line_number": 40
+ }
+ ],
+ "hived": [
+ {
+ "type": "Hex High Entropy String",
+ "filename": "hived",
+ "hashed_secret": "8aa1d8a1a63cf3962c6a514a01bff654d93efae8",
+ "is_verified": false,
+ "line_number": 133
+ },
+ {
+ "type": "Secret Keyword",
+ "filename": "hived",
+ "hashed_secret": "8aa1d8a1a63cf3962c6a514a01bff654d93efae8",
+ "is_verified": false,
+ "line_number": 133
+ }
+ ],
+ "irssi/config": [
+ {
+ "type": "Secret Keyword",
+ "filename": "irssi/config",
+ "hashed_secret": "825e522c6f25f4d5e79c97adb96bf4d84f8606c2",
+ "is_verified": false,
+ "line_number": 425
+ }
+ ],
+ "kubernetes/mongodb/add-user.yaml": [
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/mongodb/add-user.yaml",
+ "hashed_secret": "3dbf5139ab66dca370185572ca0405b45876f88d",
+ "is_verified": false,
+ "line_number": 6
+ },
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/mongodb/add-user.yaml",
+ "hashed_secret": "5dc04720de1c62c3696d92e2d76727e88493e072",
+ "is_verified": false,
+ "line_number": 6
+ }
+ ],
+ "kubernetes/mongodb/mongodb-secret.yaml": [
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/mongodb/mongodb-secret.yaml",
+ "hashed_secret": "a54e2524d515807405102b0631ef1b49ed62cf7a",
+ "is_verified": false,
+ "line_number": 8
+ }
+ ],
+ "kubernetes/pihole/pihole-secret.yaml": [
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/pihole/pihole-secret.yaml",
+ "hashed_secret": "9149aa7ee1879d5158217c8517e1c1b1682b400c",
+ "is_verified": false,
+ "line_number": 7
+ }
+ ],
+ "kubernetes/postgres/postgres-secret.yaml": [
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/postgres/postgres-secret.yaml",
+ "hashed_secret": "4579aab16b6d70dd9e0a477d82036cfd499a3080",
+ "is_verified": false,
+ "line_number": 7
+ }
+ ],
+ "kubernetes/squid/squid.conf": [
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/squid/squid.conf",
+ "hashed_secret": "25ea3c6424fa24a7ebf990b62539eee117c537ff",
+ "is_verified": false,
+ "line_number": 645
+ },
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/squid/squid.conf",
+ "hashed_secret": "30cd76ac36b30838f005d22dbf625ef461ce32c5",
+ "is_verified": false,
+ "line_number": 2811
+ },
+ {
+ "type": "Secret Keyword",
+ "filename": "kubernetes/squid/squid.conf",
+ "hashed_secret": "0beec7b5ea3f0fdbc95d0dd47f3c5bc275da8a33",
+ "is_verified": false,
+ "line_number": 6064
+ }
+ ],
+ "lynx.cfg": [
+ {
+ "type": "Secret Keyword",
+ "filename": "lynx.cfg",
+ "hashed_secret": "eef19c54306daa69eda49c0272623bdb5e2b341f",
+ "is_verified": false,
+ "line_number": 3609
+ }
+ ],
+ "openwrt/.config": [
+ {
+ "type": "Secret Keyword",
+ "filename": "openwrt/.config",
+ "hashed_secret": "c1ea94f7e524679d0cf34ab7b0b28abe41ba732b",
+ "is_verified": false,
+ "line_number": 867
+ }
+ ],
+ "terminaldweller.com/prosody/config/prosody.cfg.lua": [
+ {
+ "type": "Secret Keyword",
+ "filename": "terminaldweller.com/prosody/config/prosody.cfg.lua",
+ "hashed_secret": "e5e9fa1ba31ecd1ae84f75caaa474f3a663f05f4",
+ "is_verified": false,
+ "line_number": 141
+ },
+ {
+ "type": "Secret Keyword",
+ "filename": "terminaldweller.com/prosody/config/prosody.cfg.lua",
+ "hashed_secret": "5baa61e4c9b93f3f0682250b6cf8331b7ee68fd8",
+ "is_verified": false,
+ "line_number": 208
+ }
+ ]
+ },
+ "generated_at": "2022-07-15T13:45:59Z"
+}
diff --git a/.tmux.conf b/.tmux.conf
index abde695..e2337f5 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -83,8 +83,9 @@ bind-key M-w command-prompt -p "Move Current Window To? (e.g 3.1; session_name:6
bind-key ! break-pane -d -n _hidden_pane
bind-key @ join-pane -s $.0
-bind-key p popup -w 80% -h 80% -E xonsh
+bind-key p popup -w 80% -h 80% -E ksh
bind-key S popup -w 90% -h 90% -E env WWW_HOME=searx.terminaldweller.com /home/devi/w3m/w3m -o auto_image=FALSE -graph
+bind-key F popup -w 90% -h 90% -E ranger
#to support nested tmux sessions for ssh workflows
bind -T root F6 \
diff --git a/.vimrc b/.vimrc
index 658ed37..d65dc58 100644
--- a/.vimrc
+++ b/.vimrc
@@ -103,7 +103,6 @@ Plug 'mhinz/vim-signify'
Plug 'octol/vim-cpp-enhanced-highlight'
Plug 'vimwiki/vimwiki'
Plug 'flazz/vim-colorschemes'
-Plug 'plasticboy/vim-markdown'
Plug 'neomutt/neomutt.vim'
Plug 'sngn/vim-i3blocks-syntax'
Plug 'rhysd/vim-wasm'
@@ -209,6 +208,7 @@ Plug 'kmonad/kmonad-vim'
Plug 'MattesGroeger/vim-bookmarks'
Plug 'vim-pandoc/vim-pandoc'
Plug 'vim-pandoc/vim-pandoc-syntax'
+Plug 'plasticboy/vim-markdown'
" Plug 'kana/vim-operator-user'
" Plug 'terryma/vim-multiple-cursors'
" Plug 'Konfekt/vim-office'
@@ -1331,6 +1331,7 @@ map <leader>v <Plug>(Vman)
autocmd Filetype man setlocal relativenumber
autocmd Filetype man setlocal number
let g:vim_man_cmd = 'man -O width=200'
+" let g:vim_man_cmd = 'xman'
"context
let g:context_enabled = 0
@@ -1342,6 +1343,11 @@ augroup AUSpell
autocmd FileType markdown,txt,vimwiki,tex setlocal spell
augroup END
+augroup MDInsert
+ autocmd!
+ autocmd FileType markdown,vimwiki,pandoc imap <C-b> </br>
+augroup END
+
nnoremap <leader>b :Make<CR>
command -nargs=* Make call s:make(<q-args>)
diff --git a/.w3m/keymap b/.w3m/keymap
index f3b37a5..ce8b69e 100644
--- a/.w3m/keymap
+++ b/.w3m/keymap
@@ -120,7 +120,9 @@ keymap XS COMMAND "SHELL ~/.w3m/cgi-bin/fzf_surfraw.cgi ; TAB_GOTO /usr/lib/w3m/
# keymap xs COMMAND "SHELL /home/bloodstalker/scripts/bin/fzf_surfraw"
keymap go COMMAND "SHELL /usr/lib/w3m/cgi-bin/goto_clipboard.cgi"
# keymap XS COMMAND "SHELL /home/bloodstalker/scripts/bin/fzf_surfraw; TAB_GOTO /home/bloodstalker/scripts/bin/goto_clipboard.cgi"
-#
+
+keymap SPC-s COMMAND "TAB_GOTO searx.terminaldweller.com"
+
keymap d COMMAND "EXTERN 'echo %s >> ~/.w3m/RestoreTab.txt' ; CLOSE_TAB"
keymap u TAB_GOTO /usr/lib/w3m/cgi-bin/restore_tab.cgi
diff --git a/.zshrc b/.zshrc
index 667d656..5d15403 100644
--- a/.zshrc
+++ b/.zshrc
@@ -193,6 +193,7 @@ alias zh_router_root="zssh root@192.168.90.71"
alias zh_router_admin="zssh admin@192.168.90.71"
alias youtube_dl="proxychains4 -f /home/devi/proxies/ca/proxychains.conf youtube-dl"
alias campv="proxychains4 -f /home/devi/proxies/ca/proxychains.conf mpv --no-video"
+alias youtube="proxychains4 -f /home/devi/proxies/ca/proxychains.conf mpv --ytdl-format=160+249"
alias tridactylrc="vim ~/scripts/.tridactylrc"
alias fixtridactylrc="cp ~/scripts/.tridactylrc ~/"
alias man="man -O width=210"
@@ -233,6 +234,9 @@ alias fixcmusrc="cp ~/scripts/.config/cmus/rc ~/.config/cmus/rc"
alias zshenv="vim ~/scripts/.zshenv"
alias fixzshenv="cp ~/scripts/.zshenv ~/.zshenv"
alias postman="flatpak run com.getpostman.Postman"
+alias skype="flatpak run com.skype.Client"
+alias run_devdocs_server="docker run -p 9292:9292 devdocs"
+alias tree="tree -aCDpugh -L 10 --gitignore | less -r"
#autosuggest
ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold,underline"
@@ -577,8 +581,15 @@ fzf-down() {
fzf-tmux -p 80%,80% -- --bind ctrl-/:toggle-preview "$@"
}
-dff(){
- df -h "$@" | colcol | column -t
+dff() {
+ df -hT "$@" | colcol | column -t
+}
+
+jcurl() {
+ curl "$@" | json_pp -json_opt pretty,canonical | pygmentize -l json -P style=$PYGMENTIZE_STYLE
+}
+xcurl() {
+ curl "$@" | xml_pp | pygmentize -l xml -P style=$PYGMENTIZE_STYLE
}
# these i stole from junegunn to try out
diff --git a/bin/colo b/bin/colo
deleted file mode 100755
index 76825dc..0000000
--- a/bin/colo
+++ /dev/null
@@ -1,436 +0,0 @@
-#!/usr/bin/env python3
-# _*_ coding=utf-8 _*_
-"""prints colors"""
-
-import argparse
-import html.parser
-
-
-# BASH_STR = 'printf "\x1b[38;5;XXXmcolourXXX YYY \x1b[0m\t";'
-BASH_STR = "\x1b[38;5;XXXmcolourXXX YYY \x1b[0m\t"
-BASH_ANSI_STR = "\\x1b[38;5;XXXm"
-colo_list = []
-LJUST_CONST = 4
-
-COLORS = """<td>0</td><td>Black</td><td>#000000</td><td>rgb(0,0,0)</td><td>hsl(0,0%,0%)</td>
-<td>1</td><td>Maroon</td><td>#800000</td><td>rgb(128,0,0)</td><td>hsl(0,100%,25%)</td>
-<td>2</td><td>Green</td><td>#008000</td><td>rgb(0,128,0)</td><td>hsl(120,100%,25%)</td>
-<td>3</td><td>Olive</td><td>#808000</td><td>rgb(128,128,0)</td><td>hsl(60,100%,25%)</td>
-<td>4</td><td>Navy</td><td>#000080</td><td>rgb(0,0,128)</td><td>hsl(240,100%,25%)</td>
-<td>5</td><td>Purple</td><td>#800080</td><td>rgb(128,0,128)</td><td>hsl(300,100%,25%)</td>
-<td>6</td><td>Teal</td><td>#008080</td><td>rgb(0,128,128)</td><td>hsl(180,100%,25%)</td>
-<td>7</td><td>Silver</td><td>#c0c0c0</td><td>rgb(192,192,192)</td><td>hsl(0,0%,75%)</td>
-<td>8</td><td>Grey</td><td>#808080</td><td>rgb(128,128,128)</td><td>hsl(0,0%,50%)</td>
-<td>9</td><td>Red</td><td>#ff0000</td><td>rgb(255,0,0)</td><td>hsl(0,100%,50%)</td>
-<td>10</td><td>Lime</td><td>#00ff00</td><td>rgb(0,255,0)</td><td>hsl(120,100%,50%)</td>
-<td>11</td><td>Yellow</td><td>#ffff00</td><td>rgb(255,255,0)</td><td>hsl(60,100%,50%)</td>
-<td>12</td><td>Blue</td><td>#0000ff</td><td>rgb(0,0,255)</td><td>hsl(240,100%,50%)</td>
-<td>13</td><td>Fuchsia</td><td>#ff00ff</td><td>rgb(255,0,255)</td><td>hsl(300,100%,50%)</td>
-<td>14</td><td>Aqua</td><td>#00ffff</td><td>rgb(0,255,255)</td><td>hsl(180,100%,50%)</td>
-<td>15</td><td>White</td><td>#ffffff</td><td>rgb(255,255,255)</td><td>hsl(0,0%,100%)</td>
-<td>16</td><td>Grey0</td><td>#000000</td><td>rgb(0,0,0)</td><td>hsl(0,0%,0%)</td>
-<td>17</td><td>NavyBlue</td><td>#00005f</td><td>rgb(0,0,95)</td><td>hsl(240,100%,18%)</td>
-<td>18</td><td>DarkBlue</td><td>#000087</td><td>rgb(0,0,135)</td><td>hsl(240,100%,26%)</td>
-<td>19</td><td>Blue3</td><td>#0000af</td><td>rgb(0,0,175)</td><td>hsl(240,100%,34%)</td>
-<td>20</td><td>Blue3</td><td>#0000d7</td><td>rgb(0,0,215)</td><td>hsl(240,100%,42%)</td>
-<td>21</td><td>Blue1</td><td>#0000ff</td><td>rgb(0,0,255)</td><td>hsl(240,100%,50%)</td>
-<td>22</td><td>DarkGreen</td><td>#005f00</td><td>rgb(0,95,0)</td><td>hsl(120,100%,18%)</td>
-<td>23</td><td>DeepSkyBlue4</td><td>#005f5f</td><td>rgb(0,95,95)</td><td>hsl(180,100%,18%)</td>
-<td>24</td><td>DeepSkyBlue4</td><td>#005f87</td><td>rgb(0,95,135)</td><td>hsl(97,100%,26%)</td>
-<td>25</td><td>DeepSkyBlue4</td><td>#005faf</td><td>rgb(0,95,175)</td><td>hsl(07,100%,34%)</td>
-<td>26</td><td>DodgerBlue3</td><td>#005fd7</td><td>rgb(0,95,215)</td><td>hsl(13,100%,42%)</td>
-<td>27</td><td>DodgerBlue2</td><td>#005fff</td><td>rgb(0,95,255)</td><td>hsl(17,100%,50%)</td>
-<td>28</td><td>Green4</td><td>#008700</td><td>rgb(0,135,0)</td><td>hsl(120,100%,26%)</td>
-<td>29</td><td>SpringGreen4</td><td>#00875f</td><td>rgb(0,135,95)</td><td>hsl(62,100%,26%)</td>
-<td>30</td><td>Turquoise4</td><td>#008787</td><td>rgb(0,135,135)</td><td>hsl(180,100%,26%)</td>
-<td>31</td><td>DeepSkyBlue3</td><td>#0087af</td><td>rgb(0,135,175)</td><td>hsl(93,100%,34%)</td>
-<td>32</td><td>DeepSkyBlue3</td><td>#0087d7</td><td>rgb(0,135,215)</td><td>hsl(02,100%,42%)</td>
-<td>33</td><td>DodgerBlue1</td><td>#0087ff</td><td>rgb(0,135,255)</td><td>hsl(08,100%,50%)</td>
-<td>34</td><td>Green3</td><td>#00af00</td><td>rgb(0,175,0)</td><td>hsl(120,100%,34%)</td>
-<td>35</td><td>SpringGreen3</td><td>#00af5f</td><td>rgb(0,175,95)</td><td>hsl(52,100%,34%)</td>
-<td>36</td><td>DarkCyan</td><td>#00af87</td><td>rgb(0,175,135)</td><td>hsl(66,100%,34%)</td>
-<td>37</td><td>LightSeaGreen</td><td>#00afaf</td><td>rgb(0,175,175)</td><td>hsl(180,100%,34%)</td>
-<td>38</td><td>DeepSkyBlue2</td><td>#00afd7</td><td>rgb(0,175,215)</td><td>hsl(91,100%,42%)</td>
-<td>39</td><td>DeepSkyBlue1</td><td>#00afff</td><td>rgb(0,175,255)</td><td>hsl(98,100%,50%)</td>
-<td>40</td><td>Green3</td><td>#00d700</td><td>rgb(0,215,0)</td><td>hsl(120,100%,42%)</td>
-<td>41</td><td>SpringGreen3</td><td>#00d75f</td><td>rgb(0,215,95)</td><td>hsl(46,100%,42%)</td>
-<td>42</td><td>SpringGreen2</td><td>#00d787</td><td>rgb(0,215,135)</td><td>hsl(57,100%,42%)</td>
-<td>43</td><td>Cyan3</td><td>#00d7af</td><td>rgb(0,215,175)</td><td>hsl(68,100%,42%)</td>
-<td>44</td><td>DarkTurquoise</td><td>#00d7d7</td><td>rgb(0,215,215)</td><td>hsl(180,100%,42%)</td>
-<td>45</td><td>Turquoise2</td><td>#00d7ff</td><td>rgb(0,215,255)</td><td>hsl(89,100%,50%)</td>
-<td>46</td><td>Green1</td><td>#00ff00</td><td>rgb(0,255,0)</td><td>hsl(120,100%,50%)</td>
-<td>47</td><td>SpringGreen2</td><td>#00ff5f</td><td>rgb(0,255,95)</td><td>hsl(42,100%,50%)</td>
-<td>48</td><td>SpringGreen1</td><td>#00ff87</td><td>rgb(0,255,135)</td><td>hsl(51,100%,50%)</td>
-<td>49</td><td>MediumSpringGreen</td><td>#00ffaf</td><td>rgb(0,255,175)</td><td>hsl(61,100%,50%)</td>
-<td>50</td><td>Cyan2</td><td>#00ffd7</td><td>rgb(0,255,215)</td><td>hsl(70,100%,50%)</td>
-<td>51</td><td>Cyan1</td><td>#00ffff</td><td>rgb(0,255,255)</td><td>hsl(180,100%,50%)</td>
-<td>52</td><td>DarkRed</td><td>#5f0000</td><td>rgb(95,0,0)</td><td>hsl(0,100%,18%)</td>
-<td>53</td><td>DeepPink4</td><td>#5f005f</td><td>rgb(95,0,95)</td><td>hsl(300,100%,18%)</td>
-<td>54</td><td>Purple4</td><td>#5f0087</td><td>rgb(95,0,135)</td><td>hsl(82,100%,26%)</td>
-<td>55</td><td>Purple4</td><td>#5f00af</td><td>rgb(95,0,175)</td><td>hsl(72,100%,34%)</td>
-<td>56</td><td>Purple3</td><td>#5f00d7</td><td>rgb(95,0,215)</td><td>hsl(66,100%,42%)</td>
-<td>57</td><td>BlueViolet</td><td>#5f00ff</td><td>rgb(95,0,255)</td><td>hsl(62,100%,50%)</td>
-<td>58</td><td>Orange4</td><td>#5f5f00</td><td>rgb(95,95,0)</td><td>hsl(60,100%,18%)</td>
-<td>59</td><td>Grey37</td><td>#5f5f5f</td><td>rgb(95,95,95)</td><td>hsl(0,0%,37%)</td>
-<td>60</td><td>MediumPurple4</td><td>#5f5f87</td><td>rgb(95,95,135)</td><td>hsl(240,17%,45%)</td>
-<td>61</td><td>SlateBlue3</td><td>#5f5faf</td><td>rgb(95,95,175)</td><td>hsl(240,33%,52%)</td>
-<td>62</td><td>SlateBlue3</td><td>#5f5fd7</td><td>rgb(95,95,215)</td><td>hsl(240,60%,60%)</td>
-<td>63</td><td>RoyalBlue1</td><td>#5f5fff</td><td>rgb(95,95,255)</td><td>hsl(240,100%,68%)</td>
-<td>64</td><td>Chartreuse4</td><td>#5f8700</td><td>rgb(95,135,0)</td><td>hsl(7,100%,26%)</td>
-<td>65</td><td>DarkSeaGreen4</td><td>#5f875f</td><td>rgb(95,135,95)</td><td>hsl(120,17%,45%)</td>
-<td>66</td><td>PaleTurquoise4</td><td>#5f8787</td><td>rgb(95,135,135)</td><td>hsl(180,17%,45%)</td>
-<td>67</td><td>SteelBlue</td><td>#5f87af</td><td>rgb(95,135,175)</td><td>hsl(210,33%,52%)</td>
-<td>68</td><td>SteelBlue3</td><td>#5f87d7</td><td>rgb(95,135,215)</td><td>hsl(220,60%,60%)</td>
-<td>69</td><td>CornflowerBlue</td><td>#5f87ff</td><td>rgb(95,135,255)</td><td>hsl(225,100%,68%)</td>
-<td>70</td><td>Chartreuse3</td><td>#5faf00</td><td>rgb(95,175,0)</td><td>hsl(7,100%,34%)</td>
-<td>71</td><td>DarkSeaGreen4</td><td>#5faf5f</td><td>rgb(95,175,95)</td><td>hsl(120,33%,52%)</td>
-<td>72</td><td>CadetBlue</td><td>#5faf87</td><td>rgb(95,175,135)</td><td>hsl(150,33%,52%)</td>
-<td>73</td><td>CadetBlue</td><td>#5fafaf</td><td>rgb(95,175,175)</td><td>hsl(180,33%,52%)</td>
-<td>74</td><td>SkyBlue3</td><td>#5fafd7</td><td>rgb(95,175,215)</td><td>hsl(200,60%,60%)</td>
-<td>75</td><td>SteelBlue1</td><td>#5fafff</td><td>rgb(95,175,255)</td><td>hsl(210,100%,68%)</td>
-<td>76</td><td>Chartreuse3</td><td>#5fd700</td><td>rgb(95,215,0)</td><td>hsl(3,100%,42%)</td>
-<td>77</td><td>PaleGreen3</td><td>#5fd75f</td><td>rgb(95,215,95)</td><td>hsl(120,60%,60%)</td>
-<td>78</td><td>SeaGreen3</td><td>#5fd787</td><td>rgb(95,215,135)</td><td>hsl(140,60%,60%)</td>
-<td>79</td><td>Aquamarine3</td><td>#5fd7af</td><td>rgb(95,215,175)</td><td>hsl(160,60%,60%)</td>
-<td>80</td><td>MediumTurquoise</td><td>#5fd7d7</td><td>rgb(95,215,215)</td><td>hsl(180,60%,60%)</td>
-<td>81</td><td>SteelBlue1</td><td>#5fd7ff</td><td>rgb(95,215,255)</td><td>hsl(195,100%,68%)</td>
-<td>82</td><td>Chartreuse2</td><td>#5fff00</td><td>rgb(95,255,0)</td><td>hsl(7,100%,50%)</td>
-<td>83</td><td>SeaGreen2</td><td>#5fff5f</td><td>rgb(95,255,95)</td><td>hsl(120,100%,68%)</td>
-<td>84</td><td>SeaGreen1</td><td>#5fff87</td><td>rgb(95,255,135)</td><td>hsl(135,100%,68%)</td>
-<td>85</td><td>SeaGreen1</td><td>#5fffaf</td><td>rgb(95,255,175)</td><td>hsl(150,100%,68%)</td>
-<td>86</td><td>Aquamarine1</td><td>#5fffd7</td><td>rgb(95,255,215)</td><td>hsl(165,100%,68%)</td>
-<td>87</td><td>DarkSlateGray2</td><td>#5fffff</td><td>rgb(95,255,255)</td><td>hsl(180,100%,68%)</td>
-<td>88</td><td>DarkRed</td><td>#870000</td><td>rgb(135,0,0)</td><td>hsl(0,100%,26%)</td>
-<td>89</td><td>DeepPink4</td><td>#87005f</td><td>rgb(135,0,95)</td><td>hsl(17,100%,26%)</td>
-<td>90</td><td>DarkMagenta</td><td>#870087</td><td>rgb(135,0,135)</td><td>hsl(300,100%,26%)</td>
-<td>91</td><td>DarkMagenta</td><td>#8700af</td><td>rgb(135,0,175)</td><td>hsl(86,100%,34%)</td>
-<td>92</td><td>DarkViolet</td><td>#8700d7</td><td>rgb(135,0,215)</td><td>hsl(77,100%,42%)</td>
-<td>93</td><td>Purple</td><td>#8700ff</td><td>rgb(135,0,255)</td><td>hsl(71,100%,50%)</td>
-<td>94</td><td>Orange4</td><td>#875f00</td><td>rgb(135,95,0)</td><td>hsl(2,100%,26%)</td>
-<td>95</td><td>LightPink4</td><td>#875f5f</td><td>rgb(135,95,95)</td><td>hsl(0,17%,45%)</td>
-<td>96</td><td>Plum4</td><td>#875f87</td><td>rgb(135,95,135)</td><td>hsl(300,17%,45%)</td>
-<td>97</td><td>MediumPurple3</td><td>#875faf</td><td>rgb(135,95,175)</td><td>hsl(270,33%,52%)</td>
-<td>98</td><td>MediumPurple3</td><td>#875fd7</td><td>rgb(135,95,215)</td><td>hsl(260,60%,60%)</td>
-<td>99</td><td>SlateBlue1</td><td>#875fff</td><td>rgb(135,95,255)</td><td>hsl(255,100%,68%)</td>
-<td>100</td><td>Yellow4</td><td>#878700</td><td>rgb(135,135,0)</td><td>hsl(60,100%,26%)</td>
-<td>101</td><td>Wheat4</td><td>#87875f</td><td>rgb(135,135,95)</td><td>hsl(60,17%,45%)</td>
-<td>102</td><td>Grey53</td><td>#878787</td><td>rgb(135,135,135)</td><td>hsl(0,0%,52%)</td>
-<td>103</td><td>LightSlateGrey</td><td>#8787af</td><td>rgb(135,135,175)</td><td>hsl(240,20%,60%)</td>
-<td>104</td><td>MediumPurple</td><td>#8787d7</td><td>rgb(135,135,215)</td><td>hsl(240,50%,68%)</td>
-<td>105</td><td>LightSlateBlue</td><td>#8787ff</td><td>rgb(135,135,255)</td><td>hsl(240,100%,76%)</td>
-<td>106</td><td>Yellow4</td><td>#87af00</td><td>rgb(135,175,0)</td><td>hsl(3,100%,34%)</td>
-<td>107</td><td>DarkOliveGreen3</td><td>#87af5f</td><td>rgb(135,175,95)</td><td>hsl(90,33%,52%)</td>
-<td>108</td><td>DarkSeaGreen</td><td>#87af87</td><td>rgb(135,175,135)</td><td>hsl(120,20%,60%)</td>
-<td>109</td><td>LightSkyBlue3</td><td>#87afaf</td><td>rgb(135,175,175)</td><td>hsl(180,20%,60%)</td>
-<td>110</td><td>LightSkyBlue3</td><td>#87afd7</td><td>rgb(135,175,215)</td><td>hsl(210,50%,68%)</td>
-<td>111</td><td>SkyBlue2</td><td>#87afff</td><td>rgb(135,175,255)</td><td>hsl(220,100%,76%)</td>
-<td>112</td><td>Chartreuse2</td><td>#87d700</td><td>rgb(135,215,0)</td><td>hsl(2,100%,42%)</td>
-<td>113</td><td>DarkOliveGreen3</td><td>#87d75f</td><td>rgb(135,215,95)</td><td>hsl(100,60%,60%)</td>
-<td>114</td><td>PaleGreen3</td><td>#87d787</td><td>rgb(135,215,135)</td><td>hsl(120,50%,68%)</td>
-<td>115</td><td>DarkSeaGreen3</td><td>#87d7af</td><td>rgb(135,215,175)</td><td>hsl(150,50%,68%)</td>
-<td>116</td><td>DarkSlateGray3</td><td>#87d7d7</td><td>rgb(135,215,215)</td><td>hsl(180,50%,68%)</td>
-<td>117</td><td>SkyBlue1</td><td>#87d7ff</td><td>rgb(135,215,255)</td><td>hsl(200,100%,76%)</td>
-<td>118</td><td>Chartreuse1</td><td>#87ff00</td><td>rgb(135,255,0)</td><td>hsl(8,100%,50%)</td>
-<td>119</td><td>LightGreen</td><td>#87ff5f</td><td>rgb(135,255,95)</td><td>hsl(105,100%,68%)</td>
-<td>120</td><td>LightGreen</td><td>#87ff87</td><td>rgb(135,255,135)</td><td>hsl(120,100%,76%)</td>
-<td>121</td><td>PaleGreen1</td><td>#87ffaf</td><td>rgb(135,255,175)</td><td>hsl(140,100%,76%)</td>
-<td>122</td><td>Aquamarine1</td><td>#87ffd7</td><td>rgb(135,255,215)</td><td>hsl(160,100%,76%)</td>
-<td>123</td><td>DarkSlateGray1</td><td>#87ffff</td><td>rgb(135,255,255)</td><td>hsl(180,100%,76%)</td>
-<td>124</td><td>Red3</td><td>#af0000</td><td>rgb(175,0,0)</td><td>hsl(0,100%,34%)</td>
-<td>125</td><td>DeepPink4</td><td>#af005f</td><td>rgb(175,0,95)</td><td>hsl(27,100%,34%)</td>
-<td>126</td><td>MediumVioletRed</td><td>#af0087</td><td>rgb(175,0,135)</td><td>hsl(13,100%,34%)</td>
-<td>127</td><td>Magenta3</td><td>#af00af</td><td>rgb(175,0,175)</td><td>hsl(300,100%,34%)</td>
-<td>128</td><td>DarkViolet</td><td>#af00d7</td><td>rgb(175,0,215)</td><td>hsl(88,100%,42%)</td>
-<td>129</td><td>Purple</td><td>#af00ff</td><td>rgb(175,0,255)</td><td>hsl(81,100%,50%)</td>
-<td>130</td><td>DarkOrange3</td><td>#af5f00</td><td>rgb(175,95,0)</td><td>hsl(2,100%,34%)</td>
-<td>131</td><td>IndianRed</td><td>#af5f5f</td><td>rgb(175,95,95)</td><td>hsl(0,33%,52%)</td>
-<td>132</td><td>HotPink3</td><td>#af5f87</td><td>rgb(175,95,135)</td><td>hsl(330,33%,52%)</td>
-<td>133</td><td>MediumOrchid3</td><td>#af5faf</td><td>rgb(175,95,175)</td><td>hsl(300,33%,52%)</td>
-<td>134</td><td>MediumOrchid</td><td>#af5fd7</td><td>rgb(175,95,215)</td><td>hsl(280,60%,60%)</td>
-<td>135</td><td>MediumPurple2</td><td>#af5fff</td><td>rgb(175,95,255)</td><td>hsl(270,100%,68%)</td>
-<td>136</td><td>DarkGoldenrod</td><td>#af8700</td><td>rgb(175,135,0)</td><td>hsl(6,100%,34%)</td>
-<td>137</td><td>LightSalmon3</td><td>#af875f</td><td>rgb(175,135,95)</td><td>hsl(30,33%,52%)</td>
-<td>138</td><td>RosyBrown</td><td>#af8787</td><td>rgb(175,135,135)</td><td>hsl(0,20%,60%)</td>
-<td>139</td><td>Grey63</td><td>#af87af</td><td>rgb(175,135,175)</td><td>hsl(300,20%,60%)</td>
-<td>140</td><td>MediumPurple2</td><td>#af87d7</td><td>rgb(175,135,215)</td><td>hsl(270,50%,68%)</td>
-<td>141</td><td>MediumPurple1</td><td>#af87ff</td><td>rgb(175,135,255)</td><td>hsl(260,100%,76%)</td>
-<td>142</td><td>Gold3</td><td>#afaf00</td><td>rgb(175,175,0)</td><td>hsl(60,100%,34%)</td>
-<td>143</td><td>DarkKhaki</td><td>#afaf5f</td><td>rgb(175,175,95)</td><td>hsl(60,33%,52%)</td>
-<td>144</td><td>NavajoWhite3</td><td>#afaf87</td><td>rgb(175,175,135)</td><td>hsl(60,20%,60%)</td>
-<td>145</td><td>Grey69</td><td>#afafaf</td><td>rgb(175,175,175)</td><td>hsl(0,0%,68%)</td>
-<td>146</td><td>LightSteelBlue3</td><td>#afafd7</td><td>rgb(175,175,215)</td><td>hsl(240,33%,76%)</td>
-<td>147</td><td>LightSteelBlue</td><td>#afafff</td><td>rgb(175,175,255)</td><td>hsl(240,100%,84%)</td>
-<td>148</td><td>Yellow3</td><td>#afd700</td><td>rgb(175,215,0)</td><td>hsl(1,100%,42%)</td>
-<td>149</td><td>DarkOliveGreen3</td><td>#afd75f</td><td>rgb(175,215,95)</td><td>hsl(80,60%,60%)</td>
-<td>150</td><td>DarkSeaGreen3</td><td>#afd787</td><td>rgb(175,215,135)</td><td>hsl(90,50%,68%)</td>
-<td>151</td><td>DarkSeaGreen2</td><td>#afd7af</td><td>rgb(175,215,175)</td><td>hsl(120,33%,76%)</td>
-<td>152</td><td>LightCyan3</td><td>#afd7d7</td><td>rgb(175,215,215)</td><td>hsl(180,33%,76%)</td>
-<td>153</td><td>LightSkyBlue1</td><td>#afd7ff</td><td>rgb(175,215,255)</td><td>hsl(210,100%,84%)</td>
-<td>154</td><td>GreenYellow</td><td>#afff00</td><td>rgb(175,255,0)</td><td>hsl(8,100%,50%)</td>
-<td>155</td><td>DarkOliveGreen2</td><td>#afff5f</td><td>rgb(175,255,95)</td><td>hsl(90,100%,68%)</td>
-<td>156</td><td>PaleGreen1</td><td>#afff87</td><td>rgb(175,255,135)</td><td>hsl(100,100%,76%)</td>
-<td>157</td><td>DarkSeaGreen2</td><td>#afffaf</td><td>rgb(175,255,175)</td><td>hsl(120,100%,84%)</td>
-<td>158</td><td>DarkSeaGreen1</td><td>#afffd7</td><td>rgb(175,255,215)</td><td>hsl(150,100%,84%)</td>
-<td>159</td><td>PaleTurquoise1</td><td>#afffff</td><td>rgb(175,255,255)</td><td>hsl(180,100%,84%)</td>
-<td>160</td><td>Red3</td><td>#d70000</td><td>rgb(215,0,0)</td><td>hsl(0,100%,42%)</td>
-<td>161</td><td>DeepPink3</td><td>#d7005f</td><td>rgb(215,0,95)</td><td>hsl(33,100%,42%)</td>
-<td>162</td><td>DeepPink3</td><td>#d70087</td><td>rgb(215,0,135)</td><td>hsl(22,100%,42%)</td>
-<td>163</td><td>Magenta3</td><td>#d700af</td><td>rgb(215,0,175)</td><td>hsl(11,100%,42%)</td>
-<td>164</td><td>Magenta3</td><td>#d700d7</td><td>rgb(215,0,215)</td><td>hsl(300,100%,42%)</td>
-<td>165</td><td>Magenta2</td><td>#d700ff</td><td>rgb(215,0,255)</td><td>hsl(90,100%,50%)</td>
-<td>166</td><td>DarkOrange3</td><td>#d75f00</td><td>rgb(215,95,0)</td><td>hsl(6,100%,42%)</td>
-<td>167</td><td>IndianRed</td><td>#d75f5f</td><td>rgb(215,95,95)</td><td>hsl(0,60%,60%)</td>
-<td>168</td><td>HotPink3</td><td>#d75f87</td><td>rgb(215,95,135)</td><td>hsl(340,60%,60%)</td>
-<td>169</td><td>HotPink2</td><td>#d75faf</td><td>rgb(215,95,175)</td><td>hsl(320,60%,60%)</td>
-<td>170</td><td>Orchid</td><td>#d75fd7</td><td>rgb(215,95,215)</td><td>hsl(300,60%,60%)</td>
-<td>171</td><td>MediumOrchid1</td><td>#d75fff</td><td>rgb(215,95,255)</td><td>hsl(285,100%,68%)</td>
-<td>172</td><td>Orange3</td><td>#d78700</td><td>rgb(215,135,0)</td><td>hsl(7,100%,42%)</td>
-<td>173</td><td>LightSalmon3</td><td>#d7875f</td><td>rgb(215,135,95)</td><td>hsl(20,60%,60%)</td>
-<td>174</td><td>LightPink3</td><td>#d78787</td><td>rgb(215,135,135)</td><td>hsl(0,50%,68%)</td>
-<td>175</td><td>Pink3</td><td>#d787af</td><td>rgb(215,135,175)</td><td>hsl(330,50%,68%)</td>
-<td>176</td><td>Plum3</td><td>#d787d7</td><td>rgb(215,135,215)</td><td>hsl(300,50%,68%)</td>
-<td>177</td><td>Violet</td><td>#d787ff</td><td>rgb(215,135,255)</td><td>hsl(280,100%,76%)</td>
-<td>178</td><td>Gold3</td><td>#d7af00</td><td>rgb(215,175,0)</td><td>hsl(8,100%,42%)</td>
-<td>179</td><td>LightGoldenrod3</td><td>#d7af5f</td><td>rgb(215,175,95)</td><td>hsl(40,60%,60%)</td>
-<td>180</td><td>Tan</td><td>#d7af87</td><td>rgb(215,175,135)</td><td>hsl(30,50%,68%)</td>
-<td>181</td><td>MistyRose3</td><td>#d7afaf</td><td>rgb(215,175,175)</td><td>hsl(0,33%,76%)</td>
-<td>182</td><td>Thistle3</td><td>#d7afd7</td><td>rgb(215,175,215)</td><td>hsl(300,33%,76%)</td>
-<td>183</td><td>Plum2</td><td>#d7afff</td><td>rgb(215,175,255)</td><td>hsl(270,100%,84%)</td>
-<td>184</td><td>Yellow3</td><td>#d7d700</td><td>rgb(215,215,0)</td><td>hsl(60,100%,42%)</td>
-<td>185</td><td>Khaki3</td><td>#d7d75f</td><td>rgb(215,215,95)</td><td>hsl(60,60%,60%)</td>
-<td>186</td><td>LightGoldenrod2</td><td>#d7d787</td><td>rgb(215,215,135)</td><td>hsl(60,50%,68%)</td>
-<td>187</td><td>LightYellow3</td><td>#d7d7af</td><td>rgb(215,215,175)</td><td>hsl(60,33%,76%)</td>
-<td>188</td><td>Grey84</td><td>#d7d7d7</td><td>rgb(215,215,215)</td><td>hsl(0,0%,84%)</td>
-<td>189</td><td>LightSteelBlue1</td><td>#d7d7ff</td><td>rgb(215,215,255)</td><td>hsl(240,100%,92%)</td>
-<td>190</td><td>Yellow2</td><td>#d7ff00</td><td>rgb(215,255,0)</td><td>hsl(9,100%,50%)</td>
-<td>191</td><td>DarkOliveGreen1</td><td>#d7ff5f</td><td>rgb(215,255,95)</td><td>hsl(75,100%,68%)</td>
-<td>192</td><td>DarkOliveGreen1</td><td>#d7ff87</td><td>rgb(215,255,135)</td><td>hsl(80,100%,76%)</td>
-<td>193</td><td>DarkSeaGreen1</td><td>#d7ffaf</td><td>rgb(215,255,175)</td><td>hsl(90,100%,84%)</td>
-<td>194</td><td>Honeydew2</td><td>#d7ffd7</td><td>rgb(215,255,215)</td><td>hsl(120,100%,92%)</td>
-<td>195</td><td>LightCyan1</td><td>#d7ffff</td><td>rgb(215,255,255)</td><td>hsl(180,100%,92%)</td>
-<td>196</td><td>Red1</td><td>#ff0000</td><td>rgb(255,0,0)</td><td>hsl(0,100%,50%)</td>
-<td>197</td><td>DeepPink2</td><td>#ff005f</td><td>rgb(255,0,95)</td><td>hsl(37,100%,50%)</td>
-<td>198</td><td>DeepPink1</td><td>#ff0087</td><td>rgb(255,0,135)</td><td>hsl(28,100%,50%)</td>
-<td>199</td><td>DeepPink1</td><td>#ff00af</td><td>rgb(255,0,175)</td><td>hsl(18,100%,50%)</td>
-<td>200</td><td>Magenta2</td><td>#ff00d7</td><td>rgb(255,0,215)</td><td>hsl(09,100%,50%)</td>
-<td>201</td><td>Magenta1</td><td>#ff00ff</td><td>rgb(255,0,255)</td><td>hsl(300,100%,50%)</td>
-<td>202</td><td>OrangeRed1</td><td>#ff5f00</td><td>rgb(255,95,0)</td><td>hsl(2,100%,50%)</td>
-<td>203</td><td>IndianRed1</td><td>#ff5f5f</td><td>rgb(255,95,95)</td><td>hsl(0,100%,68%)</td>
-<td>204</td><td>IndianRed1</td><td>#ff5f87</td><td>rgb(255,95,135)</td><td>hsl(345,100%,68%)</td>
-<td>205</td><td>HotPink</td><td>#ff5faf</td><td>rgb(255,95,175)</td><td>hsl(330,100%,68%)</td>
-<td>206</td><td>HotPink</td><td>#ff5fd7</td><td>rgb(255,95,215)</td><td>hsl(315,100%,68%)</td>
-<td>207</td><td>MediumOrchid1</td><td>#ff5fff</td><td>rgb(255,95,255)</td><td>hsl(300,100%,68%)</td>
-<td>208</td><td>DarkOrange</td><td>#ff8700</td><td>rgb(255,135,0)</td><td>hsl(1,100%,50%)</td>
-<td>209</td><td>Salmon1</td><td>#ff875f</td><td>rgb(255,135,95)</td><td>hsl(15,100%,68%)</td>
-<td>210</td><td>LightCoral</td><td>#ff8787</td><td>rgb(255,135,135)</td><td>hsl(0,100%,76%)</td>
-<td>211</td><td>PaleVioletRed1</td><td>#ff87af</td><td>rgb(255,135,175)</td><td>hsl(340,100%,76%)</td>
-<td>212</td><td>Orchid2</td><td>#ff87d7</td><td>rgb(255,135,215)</td><td>hsl(320,100%,76%)</td>
-<td>213</td><td>Orchid1</td><td>#ff87ff</td><td>rgb(255,135,255)</td><td>hsl(300,100%,76%)</td>
-<td>214</td><td>Orange1</td><td>#ffaf00</td><td>rgb(255,175,0)</td><td>hsl(1,100%,50%)</td>
-<td>215</td><td>SandyBrown</td><td>#ffaf5f</td><td>rgb(255,175,95)</td><td>hsl(30,100%,68%)</td>
-<td>216</td><td>LightSalmon1</td><td>#ffaf87</td><td>rgb(255,175,135)</td><td>hsl(20,100%,76%)</td>
-<td>217</td><td>LightPink1</td><td>#ffafaf</td><td>rgb(255,175,175)</td><td>hsl(0,100%,84%)</td>
-<td>218</td><td>Pink1</td><td>#ffafd7</td><td>rgb(255,175,215)</td><td>hsl(330,100%,84%)</td>
-<td>219</td><td>Plum1</td><td>#ffafff</td><td>rgb(255,175,255)</td><td>hsl(300,100%,84%)</td>
-<td>220</td><td>Gold1</td><td>#ffd700</td><td>rgb(255,215,0)</td><td>hsl(0,100%,50%)</td>
-<td>221</td><td>LightGoldenrod2</td><td>#ffd75f</td><td>rgb(255,215,95)</td><td>hsl(45,100%,68%)</td>
-<td>222</td><td>LightGoldenrod2</td><td>#ffd787</td><td>rgb(255,215,135)</td><td>hsl(40,100%,76%)</td>
-<td>223</td><td>NavajoWhite1</td><td>#ffd7af</td><td>rgb(255,215,175)</td><td>hsl(30,100%,84%)</td>
-<td>224</td><td>MistyRose1</td><td>#ffd7d7</td><td>rgb(255,215,215)</td><td>hsl(0,100%,92%)</td>
-<td>225</td><td>Thistle1</td><td>#ffd7ff</td><td>rgb(255,215,255)</td><td>hsl(300,100%,92%)</td>
-<td>226</td><td>Yellow1</td><td>#ffff00</td><td>rgb(255,255,0)</td><td>hsl(60,100%,50%)</td>
-<td>227</td><td>LightGoldenrod1</td><td>#ffff5f</td><td>rgb(255,255,95)</td><td>hsl(60,100%,68%)</td>
-<td>228</td><td>Khaki1</td><td>#ffff87</td><td>rgb(255,255,135)</td><td>hsl(60,100%,76%)</td>
-<td>229</td><td>Wheat1</td><td>#ffffaf</td><td>rgb(255,255,175)</td><td>hsl(60,100%,84%)</td>
-<td>230</td><td>Cornsilk1</td><td>#ffffd7</td><td>rgb(255,255,215)</td><td>hsl(60,100%,92%)</td>
-<td>231</td><td>Grey100</td><td>#ffffff</td><td>rgb(255,255,255)</td><td>hsl(0,0%,100%)</td>
-<td>232</td><td>Grey3</td><td>#080808</td><td>rgb(8,8,8)</td><td>hsl(0,0%,3%)</td>
-<td>233</td><td>Grey7</td><td>#121212</td><td>rgb(18,18,18)</td><td>hsl(0,0%,7%)</td>
-<td>234</td><td>Grey11</td><td>#1c1c1c</td><td>rgb(28,28,28)</td><td>hsl(0,0%,10%)</td>
-<td>235</td><td>Grey15</td><td>#262626</td><td>rgb(38,38,38)</td><td>hsl(0,0%,14%)</td>
-<td>236</td><td>Grey19</td><td>#303030</td><td>rgb(48,48,48)</td><td>hsl(0,0%,18%)</td>
-<td>237</td><td>Grey23</td><td>#3a3a3a</td><td>rgb(58,58,58)</td><td>hsl(0,0%,22%)</td>
-<td>238</td><td>Grey27</td><td>#444444</td><td>rgb(68,68,68)</td><td>hsl(0,0%,26%)</td>
-<td>239</td><td>Grey30</td><td>#4e4e4e</td><td>rgb(78,78,78)</td><td>hsl(0,0%,30%)</td>
-<td>240</td><td>Grey35</td><td>#585858</td><td>rgb(88,88,88)</td><td>hsl(0,0%,34%)</td>
-<td>241</td><td>Grey39</td><td>#626262</td><td>rgb(98,98,98)</td><td>hsl(0,0%,37%)</td>
-<td>242</td><td>Grey42</td><td>#6c6c6c</td><td>rgb(108,108,108)</td><td>hsl(0,0%,40%)</td>
-<td>243</td><td>Grey46</td><td>#767676</td><td>rgb(118,118,118)</td><td>hsl(0,0%,46%)</td>
-<td>244</td><td>Grey50</td><td>#808080</td><td>rgb(128,128,128)</td><td>hsl(0,0%,50%)</td>
-<td>245</td><td>Grey54</td><td>#8a8a8a</td><td>rgb(138,138,138)</td><td>hsl(0,0%,54%)</td>
-<td>246</td><td>Grey58</td><td>#949494</td><td>rgb(148,148,148)</td><td>hsl(0,0%,58%)</td>
-<td>247</td><td>Grey62</td><td>#9e9e9e</td><td>rgb(158,158,158)</td><td>hsl(0,0%,61%)</td>
-<td>248</td><td>Grey66</td><td>#a8a8a8</td><td>rgb(168,168,168)</td><td>hsl(0,0%,65%)</td>
-<td>249</td><td>Grey70</td><td>#b2b2b2</td><td>rgb(178,178,178)</td><td>hsl(0,0%,69%)</td>
-<td>250</td><td>Grey74</td><td>#bcbcbc</td><td>rgb(188,188,188)</td><td>hsl(0,0%,73%)</td>
-<td>251</td><td>Grey78</td><td>#c6c6c6</td><td>rgb(198,198,198)</td><td>hsl(0,0%,77%)</td>
-<td>252</td><td>Grey82</td><td>#d0d0d0</td><td>rgb(208,208,208)</td><td>hsl(0,0%,81%)</td>
-<td>253</td><td>Grey85</td><td>#dadada</td><td>rgb(218,218,218)</td><td>hsl(0,0%,85%)</td>
-<td>254</td><td>Grey89</td><td>#e4e4e4</td><td>rgb(228,228,228)</td><td>hsl(0,0%,89%)</td>
-<td>255</td><td>Grey93</td><td>#eeeeee</td><td>rgb(238,238,238)</td><td>hsl(0,0%,93%)</td>
-"""
-
-
-class Argparser: # pylint: disable=too-few-public-methods
- """argparser class"""
-
- def __init__(self):
- parser = argparse.ArgumentParser()
- parser.add_argument(
- "--ansi", action="store_true", help="bool", default=False
- )
- parser.add_argument(
- "--hsi", action="store_true", help="bool", default=False
- )
- parser.add_argument(
- "--rgb", action="store_true", help="bool", default=False
- )
- parser.add_argument(
- "--number", action="store_true", help="bool", default=False
- )
- parser.add_argument(
- "--name", action="store_true", help="bool", default=False
- )
- parser.add_argument(
- "--hex", action="store_true", help="bool", default=False
- )
- self.args = parser.parse_args()
-
-
-class ColoParser(html.parser.HTMLParser):
- """html parser that ignores new lines"""
-
- def handle_data(self, data):
- if data == "\n":
- pass
- else:
- colo_list.append(data)
-
-
-def color_hsi(number_colo_list) -> str:
- """print hsi color codes"""
- print_list = str()
- hsi_colo_list = [
- colo_list[j] for j in range(0, len(colo_list)) if ((j + 1) % 5) == 0
- ]
- for i, number_colo in enumerate(number_colo_list):
- if i % 6 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", hsi_colo_list[i]
- )
- return print_list
-
-
-def color_rgb(number_colo_list) -> str:
- """print rgb color codes"""
- print_list = str()
- rgb_colo_list = [
- colo_list[j] for j in range(0, len(colo_list)) if ((j + 1) % 5) == 4
- ]
- for i, number_colo in enumerate(number_colo_list):
- if i % 6 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", rgb_colo_list[i]
- )
- return print_list
-
-
-def color_number(number_colo_list) -> str:
- """print color numbers"""
- print_list = str()
- for i, number_colo in enumerate(number_colo_list):
- if i % 12 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", number_colo
- )
- return print_list
-
-
-def color_name(number_colo_list) -> str:
- """print color names"""
- print_list = str()
- name_colo_list = [
- colo_list[j] for j in range(0, len(colo_list)) if ((j + 1) % 5) == 2
- ]
- for i, number_colo in enumerate(number_colo_list):
- if i % 6 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", name_colo_list[i]
- )
- return print_list
-
-
-def color_hex(number_colo_list) -> str:
- """print color hex codes"""
- print_list = str()
- hex_colo_list = [
- colo_list[j] for j in range(0, len(colo_list)) if ((j + 1) % 5) == 3
- ]
- for i, number_colo in enumerate(number_colo_list):
- if i % 8 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", hex_colo_list[i]
- )
- return print_list
-
-
-def color_ansi(number_colo_list) -> str:
- """print color ansi escape sequnces"""
- print_list = str()
- for i, number_colo in enumerate(number_colo_list):
- if i % 6 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", BASH_ANSI_STR.replace("XXX", number_colo)
- )
- return print_list
-
-
-def color_default(number_colo_list) -> str:
- """print numbers only"""
- print_list = str()
- for i, number_colo in enumerate(number_colo_list):
- if i % 12 == 0 and i != 0:
- print_list += "\n"
- print_list += BASH_STR.replace("XXX", number_colo).replace(
- "YYY", number_colo
- )
- return print_list
-
-
-def main() -> None:
- """prints the colors"""
- argparser = Argparser()
- print_list = str()
- lines = COLORS.split("\n")
- for line in lines:
- parser = ColoParser()
- parser.feed(line)
- number_colo_list = [
- colo_list[j] for j in range(0, len(colo_list)) if ((j + 1) % 5) == 1
- ]
-
- if argparser.args.hsi:
- print_list = color_hsi(number_colo_list)
- elif argparser.args.rgb:
- print_list = color_rgb(number_colo_list)
- elif argparser.args.number:
- print_list = color_number(number_colo_list)
- elif argparser.args.name:
- print_list = color_name(number_colo_list)
- elif argparser.args.hex:
- print_list = color_hex(number_colo_list)
- elif argparser.args.ansi:
- print_list = color_ansi(number_colo_list)
- else:
- print_list = color_default(number_colo_list)
- print(print_list)
-
-
-if __name__ == "__main__":
- main()
diff --git a/bin/run_with_dmenu.sh b/bin/run_with_dmenu.sh
index bce0c00..8fda128 100755
--- a/bin/run_with_dmenu.sh
+++ b/bin/run_with_dmenu.sh
@@ -1,10 +1,9 @@
#!/usr/bin/env zsh
-
. ~/scripts/zshrc_stripped.sh
-COMMAND=$(echo "" | dmenu -l 20 -p "Quick Term:")
+COMMAND=$(echo "" | dmenu -fn "DejaVuSansMono Nerd Font Mono-11.3;antialias=true;autohint=true" -l 20 -p "Quick Term:")
RESULT=$(eval "$COMMAND")
if [ "$COMMAND" = "getmangas" ]; then
- echo "$RESULT" | sort | dmenu -D ">" -l 20 -p "Quick Term Out:" | xsel -ib
+ echo "$RESULT" | sort | dmenu -fn "DejaVuSansMono Nerd Font Mono-11.3;antialias=true;autohint=true" -D ">" -l 20 -p "Quick Term Out:" | xsel -ib
else
- echo "$RESULT" | dmenu -l 20 -p "Quick Term Out:" | xsel -ib
+ echo "$RESULT" | dmenu -fn "DejaVuSansMono Nerd Font Mono-11.3;antialias=true;autohint=true" -l 20 -p "Quick Term Out:" | xsel -ib
fi
diff --git a/bin/w3m-sandbox b/bin/w3m-sandbox
new file mode 100755
index 0000000..3560442
--- /dev/null
+++ b/bin/w3m-sandbox
@@ -0,0 +1,99 @@
+#!/usr/bin/env dash
+# https://git.sr.ht/~seirdy/bwrap-scripts
+progname="$(basename "${0}")"
+
+help_text="Usage: $progname [OPTION...] [FILE]
+
+View a file or STDIN in w3m, sandboxed with bubblewrap.
+Internet access is blocked; ideal for viewing HTML emails.
+
+Options:
+ -h, --help Print this help and exit
+"
+
+usage() {
+ printf '%s' "$help_text"
+}
+
+# when the user passess bad args, send a msg to stderr and exit
+# usage: bad_option <option> <reason>
+bad_option() {
+ echo "$progname: option $1: $2" >&2
+ usage >&2
+ exit 1
+}
+
+args=''
+
+# parse arguments
+while [ $# -gt 0 ]; do
+ case "$1" in
+ -h | --help)
+ usage
+ exit 0
+ ;;
+ -*)
+ args="$args $1"
+ ;;
+ *)
+ if [ -f "$1" ]; then
+ file_path="$1"
+ else
+ args="$args $1"
+ fi
+ ;;
+ esac
+ shift
+done
+
+if [ -n "$TERMINFO" ]; then
+ terminfo="$TERMINFO"
+else
+ terminfo="/usr/share/terminfo"
+fi
+
+xdg_data="${XDG_DATA_HOME-$HOME/.local/share}"
+
+bwrap_wrapper() {
+ env -i bwrap \
+ --ro-bind /home/devi/w3m/w3m /home/devi/w3m/w3m \
+ --ro-bind "$terminfo" /usr/share/terminfo \
+ --ro-bind "$HOME/.w3m" "$HOME/.w3m" \
+ --symlink usr/lib64 /lib64 \
+ --ro-bind /usr/lib64 /usr/lib64 \
+ --proc /proc \
+ --unshare-all \
+ --hostname RESTRICTED \
+ --setenv WWW_HOME "$HOME/.w3m" \
+ --setenv TERM "$TERM" \
+ --new-session --die-with-parent --cap-drop ALL \
+ "$@"
+ # "$@" 9<"$xdg_data/seccomp/seccomp-filter-default.bpf"
+
+}
+
+if [ -z "$file_path" ]; then
+ bwrap_wrapper /home/devi/w3m/w3m \
+ -I %{charset} \
+ -T text/html \
+ -no-mouse \
+ -no-cookie \
+ -cols "$COLUMNS" \
+ -o display_link=true \
+ -o display_link_number=true \
+ -o display_image=false \
+ $args
+else
+ bwrap_wrapper \
+ --ro-bind "$(dirname "$file_path")" /data /home/devi/w3m/w3m \
+ -I %{charset} \
+ -T text/html \
+ -cols "$COLUMNS" \
+ -o display_link=true \
+ -o display_link_number=true \
+ -o display_image=false \
+ $args \
+ "/data/$(basename "$file_path")"
+fi
+
+# vi:ft=sh
diff --git a/bin/xman b/bin/xman
index 5f4efed..c0de313 100755
--- a/bin/xman
+++ b/bin/xman
@@ -2,8 +2,21 @@
# xmandoc MANPAGE - read manpage of possibly not installed package
xlocate "man/man..\?/$1\.[0-9]" 2>/dev/null |
- { grep . || { echo "xmandoc: No entry for $1 found." 1>&2; exit 1; } } |
- while read -r pkg page; do
- page=${page#* -> }
- xbps-query --cat=$page ${pkg%-*} | mandoc -O width=205 -a
- done
+ { grep . || {
+ echo "xmandoc: No entry for $1 found." 1>&2
+ exit 1
+ }; } |
+ while read -r pkg page; do
+ page=${page#* -> }
+ # xbps-query --cat=$page ${pkg%-*} | mandoc -O width=205 -a
+ xbps-query --cat=$page ${pkg%-*} |
+ mandoc -O width=205 -c | col -b |
+ vim - -M -R \
+ -c 'set ft=man nomod nolist' \
+ -c 'silent only' \
+ -c 'colo iceberg' \
+ -c 'highlight Normal ctermbg=None' \
+ -c 'highlight lineNr ctermbg=16' \
+ -c 'hi EndOfBuffer ctermbg=16' \
+ +only
+ done
diff --git a/irssi/config b/irssi/config
index 3221c83..b4fd8e8 100644
--- a/irssi/config
+++ b/irssi/config
@@ -123,9 +123,12 @@ chatnets = {
};
channels = (
- { name = "#dpdk"; chatnet = "LiberaChat"; autojoin = "yes"; },
- { name = "#fdio-vpp"; chatnet = "LiberaChat"; autojoin = "yes"; },
+ # { name = "#dpdk"; chatnet = "LiberaChat"; autojoin = "yes"; },
+ # { name = "#fdio-vpp"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#openssl"; chatnet = "LiberaChat"; autojoin = "yes"; },
+ { name = "#netbsd"; chatnet = "LiberaChat"; autojoin = "yes"; },
+ { name = "#netplan"; chatnet = "LiberaChat"; autojoin = "yes"; },
+ { name = "#ubuntu"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#qemu"; chatnet = "OFTC"; autojoin = "yes"; },
{ name = "#debian"; chatnet = "OFTC"; autojoin = "yes"; },
{ name = "#virt"; chatnet = "OFTC"; autojoin = "yes"; },
@@ -142,7 +145,7 @@ channels = (
{ name = "#git"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#neomutt"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#busybox"; chatnet = "LiberaChat"; autojoin = "yes"; },
- { name = "#shadow"; chatnet = "LiberaChat"; autojoin = "yes"; },
+ # { name = "#shadow"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#freebsd"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#linux"; chatnet = "LiberaChat"; autojoin = "yes"; },
{ name = "#irssi"; chatnet = "LiberaChat"; autojoin = "yes"; },
@@ -473,6 +476,9 @@ ignores = (
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#go-nuts" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#neomutt" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#kvm" ); },
+ { level = "JOINS PARTS QUITS NICKS"; channels = ( "#netbsd" ); },
+ { level = "JOINS PARTS QUITS NICKS"; channels = ( "#ubuntu" ); },
+ { level = "JOINS PARTS QUITS NICKS"; channels = ( "#netplan" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#vagrant" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#openssl" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#crypto" ); },
@@ -485,7 +491,7 @@ ignores = (
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#git" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#voidlinux" ); },
{ level = "JOINS PARTS QUITS NICKS"; channels = ( "#openwrt" ); },
- {
+ {
level = "JOINS PARTS QUITS NICKS";
channels = ( "#debian-next" );
},
diff --git a/irssi/irssi.sh b/irssi/irssi.sh
index 6b1f51e..6a70190 100755
--- a/irssi/irssi.sh
+++ b/irssi/irssi.sh
@@ -21,6 +21,7 @@ wget https://scripts.irssi.org/scripts/timezones.pl
wget https://scripts.irssi.org/scripts/trackbar.pl
wget https://scripts.irssi.org/scripts/uberprompt.pl
wget https://scripts.irssi.org/scripts/usercount.pl
+wget https://scripts.irssi.org/scripts/tracknick.pl
cd ~/scripts/irssi
cp ./config ~/.irssi/config
diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme
index 84928f5..beb08e0 100644
--- a/irssi/solarized-powerline.theme
+++ b/irssi/solarized-powerline.theme
@@ -403,7 +403,7 @@ formats = {
line_start_irssi = "%k%z5f5fd7IRSSI%N%Z5f5fd7 %N";
new_topic = "%k%z00d700TOPIC %8 {ichannelhilight $1} %wby {inick $0}  $2";
nick_changed = "%k%z00d700RENAME %Z00d700%0 %k%z005f87{nick $0} %Zff8700 {nick $1}%Z005f87%0%N";
- part = "%K%Z00d700%k%z00d700PART %8 {ichannelhilight $2}%N %0%Z005f87 %N{inick $0}%0 %k%Zeeeeee {reason $3}";
+ part = "%K%Z00d700%k%z00d700PART %8 {ichannelhilight $2}%N %0%Z005f87 %N{inick $0}%0 %Z005f87%Zeeeeee {reason $3}";
quit = "%0%Z005f00%k%z005f00QUIT %N {inick $0}%0 %Zeeeeee %N%n%k%N {reason $2}";
your_nick_changed = "%k%z00d700RENAME %Z00d700%0 %k%z005f87{mynick $0} %Zff8700 {mynick $1}%Z005f87%0%N";
own_msg = "$nickcolor$nickalign{ownmsgnick $2 {ownnick $[.15]0}}$1";
@@ -436,7 +436,7 @@ formats = {
end_of_who = "%z00d700%kWHO %Z00d700%0%N END";
end_of_whois = "%z00d700%kWHOIS %Z00d700%0%N END";
end_of_whowas = "%z00d700%kWHOWAS %Z00d700%0%N END";
- 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 = "%0%Z8787ff%z8787ff%k NETSPLIT %z8787ff%Z00d700%z00d700%k {iserver $0}  {iserver $1} %Z00d700%0%Z8787ff 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 %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)";
diff --git a/terminaldweller.com/ejabberd/ejabberd.yml b/terminaldweller.com/ejabberd/ejabberd.yml
index 11e4c57..86d9857 100644
--- a/terminaldweller.com/ejabberd/ejabberd.yml
+++ b/terminaldweller.com/ejabberd/ejabberd.yml
@@ -15,7 +15,7 @@ define_macro:
- "no_sslv2"
- "no_sslv3"
- "no_tlsv1"
- - "no_tlsv1_3"
+ - "no_tlsv1_1"
- "cipher_server_preference"
- "TLS_AES_256_GCM_SHA384:TLS_CHACHA20_POLY1305_SHA256:TLS_AES_128_GCM_SHA256:ECDHE-ECDSA-AES256-GCM-SHA384:ECDHE-RSA-AES256-GCM-SHA384:DHE-RSA-AES256-GCM-SHA384:ECDHE-ECDSA-CHACHA20-POLY1305:ECDHE-RSA-CHACHA20-POLY1305:DHE-RSA-CHACHA20-POLY1305:ECDHE-ECDSA-AES128-GCM-SHA256:ECDHE-RSA-AES128-GCM-SHA256:DHE-RSA-AES128-GCM-SHA256:ECDHE-ECDSA-AES256-SHA384:ECDHE-RSA-AES256-SHA384:DHE-RSA-AES256-SHA256:ECDHE-ECDSA-AES128-SHA256:ECDHE-RSA-AES128-SHA256:DHE-RSA-AES128-SHA256:ECDHE-ECDSA-AES256-SHA:ECDHE-RSA-AES256-SHA:DHE-RSA-AES256-SHA:ECDHE-ECDSA-AES128-SHA:ECDHE-RSA-AES128-SHA:DHE-RSA-AES128-SHA:RSA-PSK-AES256-GCM-SHA384:DHE-PSK-AES256-GCM-SHA384:RSA-PSK-CHACHA20-POLY1305:DHE-PSK-CHACHA20-POLY1305:ECDHE-PSK-CHACHA20-POLY1305:AES256-GCM-SHA384:PSK-AES256-GCM-SHA384:PSK-CHACHA20-POLY1305:RSA-PSK-AES128-GCM-SHA256:DHE-PSK-AES128-GCM-SHA256:AES128-GCM-SHA256:PSK-AES128-GCM-SHA256:AES256-SHA256:AES128-SHA256:ECDHE-PSK-AES256-CBC-SHA384:ECDHE-PSK-AES256-CBC-SHA:SRP-RSA-AES-256-CBC-SHA:SRP-AES-256-CBC-SHA:RSA-PSK-AES256-CBC-SHA384:DHE-PSK-AES256-CBC-SHA384:RSA-PSK-AES256-CBC-SHA:DHE-PSK-AES256-CBC-SHA:AES256-SHA:PSK-AES256-CBC-SHA384:PSK-AES256-CBC-SHA:ECDHE-PSK-AES128-CBC-SHA256:ECDHE-PSK-AES128-CBC-SHA:SRP-RSA-AES-128-CBC-SHA:SRP-AES-128-CBC-SHA:RSA-PSK-AES128-CBC-SHA256:DHE-PSK-AES128-CBC-SHA256:RSA-PSK-AES128-CBC-SHA:DHE-PSK-AES128-CBC-SHA:AES128-SHA:PSK-AES128-CBC-SHA256:PSK-AES128-CBC-SHA"
- "no_compression"
@@ -28,8 +28,8 @@ s2s_ciphers: 'TLS_CIPHERS'
c2s_protocol_options: 'TLS_OPTIONS'
s2s_protocol_options: 'TLS_OPTIONS'
certfiles:
- - /usr/local/etc/self_signed/ej2.pem
- #- '/opt/ejabberd/certs/ejabberd.pem'
+ # - /usr/local/etc/self_signed/ej2.pem
+ - /opt/ejabberd/certs/ejabberd.pem
#- '/var/lib/ejabberd/acme/fullchain1.pem'
#- '/var/lib/ejabberd/acme/chain1.pem'
#- '/var/lib/ejabberd/acme/cert1.pem'
diff --git a/terminaldweller.com/haproxy/haproxy.cfg b/terminaldweller.com/haproxy/haproxy.cfg
index b21026d..825b2b3 100644
--- a/terminaldweller.com/haproxy/haproxy.cfg
+++ b/terminaldweller.com/haproxy/haproxy.cfg
@@ -120,8 +120,9 @@ frontend https
# use_backend chat-backend-c2s if chat-host-s
frontend jabbber5222
bind *:5222
- mode http
- acl chat-host hdr_sub(host) -i chat.terminaldweller.com
+ timeout client 60s
+ mode tcp
+ acl chat-host req.ssl_sni -i chat.terminaldweller.com
use_backend chat-backend-c2s if chat-host
frontend jabber5223
bind *:5223
@@ -296,9 +297,8 @@ backend chat-backend-s
option ssl-hello-chk
server chat-host 130.185.121.80:5443
backend chat-backend-c2s
- #mode tcp
- mode http
- option forwardfor
+ mode tcp
+ option ssl-hello-chk
server chat-host 130.185.121.80:5222
backend chat-auth-backend-s
mode tcp