diff options
| -rw-r--r-- | .k9s/config.yml | 44 | ||||
| -rw-r--r-- | .k9s/skin.yml | 70 | ||||
| -rw-r--r-- | .tmux.conf | 16 | ||||
| -rw-r--r-- | .vimrc | 59 | ||||
| -rwxr-xr-x | .w3m/cgi-bin/agent_windows_10_win10 | 15 | ||||
| -rw-r--r-- | .w3m/config | 2 | ||||
| -rw-r--r-- | .zshrc | 48 | ||||
| -rw-r--r-- | baseline/.tmux.conf | 2 | ||||
| -rw-r--r-- | baseline/.vimrc | 1 | ||||
| l--------- | bin/delf | 2 | ||||
| -rwxr-xr-x | bin/disasm | 17 | ||||
| -rw-r--r-- | c/Dockerfile | 6 | ||||
| -rwxr-xr-x | git/wipe_irssi_passwords | 2 | ||||
| -rw-r--r-- | irssi/config | 10 | ||||
| -rw-r--r-- | irssi/solarized-powerline.theme | 1 | ||||
| -rw-r--r-- | makefilec | 7 | ||||
| -rw-r--r-- | makefilecpp | 7 | ||||
| -rw-r--r-- | postit | 2 | ||||
| -rwxr-xr-x | tmux/date.sh | 7 | ||||
| -rwxr-xr-x | tmux/vcs_info.sh | 20 |
20 files changed, 306 insertions, 32 deletions
diff --git a/.k9s/config.yml b/.k9s/config.yml new file mode 100644 index 0000000..7b74ebf --- /dev/null +++ b/.k9s/config.yml @@ -0,0 +1,44 @@ +k9s: + refreshRate: 2 + maxConnRetry: 5 + enableMouse: false + headless: false + logoless: true + crumbsless: false + readOnly: false + noIcons: false + logger: + tail: 100 + buffer: 5000 + sinceSeconds: 60 + fullScreenLogs: false + textWrap: false + showTime: false + currentContext: minikube + currentCluster: minikube + clusters: + minikube: + namespace: + active: default + favorites: + - default + view: + active: ctx + featureGates: + nodeShell: false + shellPod: + image: busybox:1.31 + command: [] + args: [] + namespace: default + limits: + cpu: 100m + memory: 100Mi + portForwardAddress: localhost + thresholds: + cpu: + critical: 90 + warn: 70 + memory: + critical: 90 + warn: 70 diff --git a/.k9s/skin.yml b/.k9s/skin.yml new file mode 100644 index 0000000..c5ed102 --- /dev/null +++ b/.k9s/skin.yml @@ -0,0 +1,70 @@ +# Skin InTheNavy... +k9s: + # General K9s styles + body: + fgColor: dodgerblue + bgColor: '#000000' + logoColor: '#0000ff' + # ClusterInfoView styles. + info: + fgColor: lightskyblue + sectionColor: steelblue + # Help panel styles + help: + fgColor: white + bgColor: default + keyColor: cyan + numKeyColor: blue + sectionColor: gray + frame: + # Borders styles. + border: + fgColor: dodgerblue + focusColor: aliceblue + # MenuView attributes and styles. + menu: + fgColor: darkblue + keyColor: cornflowerblue + # Used for favorite namespaces + numKeyColor: cadetblue + # CrumbView attributes for history navigation. + crumbs: + fgColor: white + bgColor: default + activeColor: skyblue + # Resource status and update styles + status: + newColor: '#00ff00' + modifyColor: powderblue + addColor: lightskyblue + errorColor: indianred + highlightcolor: royalblue + killColor: slategray + completedColor: gray + # Border title styles. + title: + fgColor: aqua + bgColor: default + highlightColor: skyblue + counterColor: slateblue + filterColor: slategray + views: + # TableView attributes. + table: + fgColor: blue + bgColor: default + cursorColor: aqua + # Header row styles. + header: + fgColor: white + bgColor: default + sorterColor: orange + # YAML info styles. + yaml: + keyColor: steelblue + colonColor: blue + valueColor: royalblue + # Logs styles. + logs: + fgColor: white + bgColor: default @@ -10,7 +10,11 @@ set -g @plugin 'tmux-plugins/tmux-prefix-highlight' set -g @plugin 'tmux-plugins/tmux-online-status' # set -g @plugin 'tmux-plugins/tmux-sidebar' +set-window-option -g automatic-rename on +set-option -g set-titles on set -g focus-events on +# dont wait for escape +set -sg escape-time 0 set -g default-command /usr/bin/zsh set -g default-shell /usr/bin/zsh @@ -20,6 +24,7 @@ set-option -g prefix C-a set -g status-interval 120 set-option -g history-limit 10000 set-option -g repeat-time 500 +set -g display-time 1000 #prefix highlight settings set -g @prefix_highlight_show_copy_mode 'on' @@ -31,8 +36,8 @@ set -g @prefix_highlight_output_suffix '' #online status options # set -g @online_icon "ok" # set -g @offline_icon "offline!" -set -g @online_icon "#[bg=colour75 fg=colour22]#[bg=colour22] " -set -g @offline_icon "#[bg=colour75 fg=colour1]#[bg=colour1] " +set -g @online_icon "#[bg=colour25 fg=colour22]#[bg=colour22] " +set -g @offline_icon "#[bg=colour25 fg=colour1]#[bg=colour1] " set -g @jump-key 's' @@ -63,7 +68,7 @@ bind -T off F6 \ set -u key-table \;\ refresh-client -S -wg_is_keys_off="#[fg=colour15,bg=colour63,bold]#([ $(tmux show-option -qv key-table) = 'off' ] && echo 'OFF')#[fg=colour22] #{?#{pane_ssh_connected},#[fg=colour63 bg=colour24],#[fg=colour63 bg=colour31]}#[default]" +wg_is_keys_off="#[fg=colour15,bg=colour63,bold]#([ $(tmux show-option -qv key-table) = 'off' ] && echo 'OFF')#[fg=colour24] #{?#{pane_ssh_connected},#[fg=colour63 bg=colour31],#[fg=colour63 bg=colour24]}#[default]" # from christoomey's vim-tmux-nivagator is_vim="ps -o state= -o comm= -t '#{pane_tty}' | grep -iqE '^[^TXZ ]+ +(\\S+\\/)?g?(view|n?vim?x?)(diff)?$'" @@ -100,6 +105,7 @@ bind ] paste-buffer bind Space choose-buffer # bind C-l send-keys 'C-l' bind -n C-h clear-history +bind P pipe-pane -o "cat >>~/#W.log" \; display "Toggled logging to ~/#W.log" #move windows # bind-key -n C-S-Left swap-window -t -1 @@ -125,16 +131,14 @@ set -g pane-border-style fg='#0099ff' # message text set -g message-style bg='#44475a',fg='#8be9fd' -#powerline set-option -g status on -#set-option -g status-interval 2 set-option -g status-justify "centre" set-option -g status-left-length 120 set-option -g status-right-length 170 # set-option -g status-left "#{prefix_highlight}$wg_is_keys_off#[fg=colour15 bg=colour22]#U@#H#[fg=colour22 bg=colour148]#(/home/devi/tmux-powerline/powerline.sh left)" # set-option -g status-right "#(/home/devi/tmux-powerline/powerline.sh right)#{online_status}" -set-option -g status-left "#{prefix_highlight}$wg_is_keys_off#{?#{pane_ssh_connected},#[fg=colour15 bg=colour24],#[fg=colour15 bg=colour31]}#U@#H:#{pane_ssh_port}#{?#{pane_ssh_connected},#[fg=colour24 bg=colour61],#[fg=colour31 bg=colour61]}#(/home/devi/scripts/tmux/vcs_info.sh)" +set-option -g status-left "#{prefix_highlight}$wg_is_keys_off#{?#{pane_ssh_connected},#[fg=colour15 bg=colour31],#[fg=colour15 bg=colour24]}#U@#H#{?#{pane_ssh_connected},:#{pane_ssh_port}#[fg=colour31 bg=colour29],#[fg=colour24 bg=colour29]}#(/home/devi/scripts/tmux/vcs_info.sh)" # set-option -g status-left "#{prefix_highlight}$wg_is_keys_off#{?#{pane_ssh_connected},#[fg=colour15 bg=colour31],#[fg=colour15 bg=colour24]}#[fg=colour15 bg=colour31]#U@#H:#{pane_ssh_port}#[fg=colour31 bg=colour61]#(/home/devi/scripts/tmux/vcs_info.sh)" set-option -g status-right "#(/home/devi/scripts/tmux/date.sh)#{online_status}" @@ -167,6 +167,7 @@ Plugin 'ryanoasis/vim-devicons' Plugin 'godlygeek/tabular' Plugin 'sheerun/vim-polyglot' Plugin 'dbeniamine/cheat.sh-vim' +Plugin 'wlemuel/vim-tldr' Plugin 'lifepillar/pgsql.vim' Plugin 'congma/vim-compiler-checkbashisms' Plugin 'hsanson/vim-openapi' @@ -178,6 +179,8 @@ Plugin 'junegunn/gv.vim' Plugin 'ap/vim-css-color' Plugin 'christoomey/vim-tmux-navigator' Plugin 'Shirk/vim-gas' +Plugin 'roxma/vim-tmux-clipboard' +Plugin 'wellle/visual-split.vim' " Plugin 'tmux-plugins/vim-tmux' " Plugin 'rhysd/vim-gfm-syntax' " Plugin 'vim-utils/vim-troll-stopper' @@ -228,6 +231,9 @@ let g:jellybeans_overrides = { \ 'Comment': { 'guifg': '339966' }, \ 'background': { "guibg": "000000", "ctermbg":"none"}, \ 'StorageClass': {"guifg": '9966ff' }, +\ 'PreCondit': {"guifg": '5f87ff' }, +\ 'Tag': {"guifg": '00af5f' }, +\ 'Label': {"guifg": '008787' }, \ 'Exception': {"guifg": "99cc00"}, \ "Ignore": {"guifg": "336699"}, \ "SpecialComment": {"guifg": "009900"}, @@ -436,6 +442,10 @@ augroup GoLangRun autocmd! autocmd FileType go nmap <leader>r <Plug>(go-run) augroup end +augroup RustLangRun + autocmd! + autocmd FileType rust nmap <leader>r :Crun<CR> +augroup end nnoremap <leader>cd :cd %:p:h<cr> "terminal vim wont do weird things when you paste things in set pastetoggle=<F11> @@ -574,6 +584,26 @@ let g:WebDevIconsOS = 'unix' let g:tagbar_compact = 1 let g:tagbar_show_linenumbers = 2 let g:tagbar_width = 50 +let g:tagbar_ctags_bin = "/usr/bin/ctags-universal" +let g:tagbar_show_tag_linenumbers = 1 +let g:tagbar_show_tag_count = 1 +let g:tagbar_scopestrs = { + \ 'class': "\uf0e8", + \ 'const': "\uf8ff", + \ 'constant': "\uf8ff", + \ 'enum': "\uf702", + \ 'field': "\uf30b", + \ 'func': "\uf794", + \ 'function': "\uf794", + \ 'getter': "\ufab6", + \ 'implementation': "\uf776", + \ 'interface': "\uf7fe", + \ 'map': "\ufb44", + \ 'member': "\uf02b", + \ 'method': "\uf6a6", + \ 'setter': "\uf7a9", + \ 'variable': "\uf71b", + \ } highlight TagbarSignature ctermfg=DarkBlue "solidity ctags - by shuangjj let g:tagbar_type_solidity = { @@ -963,6 +993,7 @@ iab tehn then iab coutn count iab accoutn account iab applciation application +iab cosnt const "netrw let g:netrw_sort_by = 'date' @@ -1091,6 +1122,13 @@ augroup YCMDocGo \ 'syntax': &filetype \ } augroup END +augroup YCMDocRust + autocmd! + autocmd FileType rust let b:ycm_hover = { + \ 'command': 'GetDoc', + \ 'syntax': &filetype + \ } +augroup END let g:ycm_language_server = [ \ {'name': 'vim', @@ -1255,6 +1293,10 @@ augroup ALEPY autocmd FileType python let b:ale_linters = {'python': ['flake8']} autocmd FileType python let b:ale_fixers = {'python': ['autopep8']} augroup END +augroup ALERUBY + autocmd! + autocmd FileType python let b:ale_fixers = {'ruby': ['rubo']} +augroup END "latex let g:tex_flavor = 'latex' @@ -1361,6 +1403,23 @@ let g:vimwiki_list = [wiki] let g:vimwiki_global_ext = 0 " let g:vimwiki_list = [{'path': '~/devi/devi/work/vimwiki.git/master', 'syntax': 'markdown', 'ext': '.wiki'}] +" tldr +let g:tldr_enabled_categories = ["linux", "common", "windows"] +function! s:tldrdoc() + let l:vword = expand("<cword>") + call tldr#run(l:vword) +endfunction +command! -complete=shellcmd -nargs=0 TLDRDoc call s:tldrdoc() +nnoremap <leader>tt :<C-U>TLDRDoc<cr> +vnoremap <leader>tt :<C-U>TLDRDoc<cr> + +" cheat.sh +let g:CheatSheetDefaultMode = 0 +let g:CheatSheetDefaultSelection="word" +let g:CheatSheetReaderCmd='vert new' +let g:CheatPager='less --RAW-CONTROL-CHARS --ignore-case --status-column --LONG-PROMPT --HILITE-UNREAD --tabs=2' +let g:CheatSheetPagerStyle="native" + "this should be here at the end so nothing else could override it hi SpecialKey ctermbg=16 hi Pmenu ctermbg=233 diff --git a/.w3m/cgi-bin/agent_windows_10_win10 b/.w3m/cgi-bin/agent_windows_10_win10 new file mode 100755 index 0000000..36f3d64 --- /dev/null +++ b/.w3m/cgi-bin/agent_windows_10_win10 @@ -0,0 +1,15 @@ +#!/usr/bin/env sh +USER_AGENT="Mozilla/5.0 (Windows NT 10.0; Win64; x64) AppleWebKit/537.36 (KHTML, like Gecko) Chrome/42.0.2311.135 Safari/537.36 Edge/12.246" + +# open settings options +tmux send-keys "$W3M_HOTKEY_OPTIONS" +# jump to user agent +tmux send-keys "155$W3M_HOTKEY_LINK_BEGIN" +# clear user agent string +tmux send-keys 'Enter' 'C-u' +# new user agent string +tmux send-keys "$USER_AGENT" 'Enter' +# save changes +tmux send-keys "173$W3M_HOTKEY_LINK_BEGIN" 'Enter' +# refresh page +tmux send-keys "$W3M_HOTKEY_RELOAD" diff --git a/.w3m/config b/.w3m/config index 75528a1..4d92a24 100644 --- a/.w3m/config +++ b/.w3m/config @@ -96,7 +96,7 @@ ftppasswd ftppass_hostnamegen 0 pre_form_file ~/.w3m/pre_form siteconf_file ~/.w3m/siteconf -user_agent +user_agent ~/.w3m/cgi-bin/agent_windows_10_win10 no_referer 0 accept_language en;q=1.0 accept_encoding gzip, compress, bzip, bzip2, deflate @@ -74,11 +74,10 @@ alias w3m="torsocks w3m -graph" #alias clang="COLORMAKE_COMMAND=clang colormake" alias mv="mv -i" alias cp="cp -i" -alias nuke="rm -rf * .[!.]* ..?*" +alias nuke="rm -rf * .*" alias bruiser="bruiser --history ~/.bruiser/history.lua" alias digg="dig && clear" alias ogg="ogg123" -alias jupyterlocal="jupyter notebook --NotebookApp.allow_origin='https://colab.research.google.com' --port=8775" alias mupdf="/home/devi/extra/mupdf/build/release/mupdf-x11 -D red -P black -I" alias googler="~/extra/googler/googler --colors GKmexy -c us -l en --count 7 --exact " alias ddgr="ddgr --colorize always -r us-en -n 15" @@ -106,7 +105,7 @@ alias psqlrc="vim ~/scripts/.psqlrc" alias fixpsqlrc="cp ~/scripts/.psqlrc ~/.psqlrc" alias pgclirc="vim ~/scripts/.config/pgcli/config" alias fixpgclirc="cp ~/scripts/.config/pgcli/config ~/.config/pgcli/config" -alias jupyter="~/.local/bin/jupyter-notebook --no-browser" +alias jupyterlab="jupyter lab --no-browser --port 9989" alias iredisrc="vim ~/scripts/.iredisrc" alias fixiredisrc="cp ~/scripts/.iredisrc ~/.iredisrc" alias irssi="irssi -n terminaldweller" @@ -139,9 +138,16 @@ alias moshvps="mosh ubuntu@terminaldweller.com --ssh='ssh -p 1022'" alias proxychainsrc="vim ~/scripts/.proxychains/proxychains.conf" alias fixproxychainsrc="cp ~/scripts/.proxychains/proxychains.conf ~/.proxychains/proxychains.conf" alias zgit="proxychains git" +alias zssh="proxychains ssh" +alias zscp="proxychains scp" 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" alias cloud_one="ssh 130.185.121.80 -l ubuntu -p 1022" +alias zharf_sever="zssh 192.168.12.5 -l farzad" +alias k9sskin="vim ~/scripts/.k9s/skin.yml" +alias k9sconfig="vim ~/scripts/.k9s/config.yml" +alias fixk9sskin="cp ~/scripts/.k9s/skin.yml ~/.k9s/skin.yml" +alias fixk9sconfig="cp ~/scripts/.k9s/config.yml ~/.k9s/config.yml" #autosuggest ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold" @@ -248,6 +254,10 @@ 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 PATH=$PATH:/home/devi/dry +export PATH=$PATH:/home/devi/k9s +export PATH=$PATH:/home/devi/opam +export PATH=$PATH:/home/devi/devi/ghorg export EDITOR=vim export BROWSER=w3m @@ -353,6 +363,10 @@ fd() { git diff $@ --name-only | fzf -m --ansi --preview $preview } +function pod2w3m { + pod2html $1 | w3m -T text/html +} + setopt APPEND_HISTORY setopt EXTENDED_HISTORY setopt HIST_FIND_NO_DUPS @@ -436,3 +450,31 @@ _gs() { git stash list | fzf-down --reverse -d: --preview 'git show --color=always {1}' | cut -d: -f1 } + +fshow() { + local out shas sha q k + while out=$( + git log --graph --color=always \ + --format="%C(auto)%h%d %s %C(black)%C(bold)%cr" "$@" | + fzf --ansi --multi --no-sort --reverse --query="$q" --tiebreak=index \ + --print-query --expect=ctrl-d --toggle-sort=\`); do + q=$(head -1 <<< "$out") + k=$(head -2 <<< "$out" | tail -1) + shas=$(sed '1,2d;s/^[^a-z0-9]*//;/^$/d' <<< "$out" | awk '{print $1}') + [ -z "$shas" ] && continue + if [ "$k" = 'ctrl-d' ]; then + git diff --color=always $shas | less -R + else + for sha in $shas; do + git show --color=always $sha | less -R + done + fi + done +} +export LESS_TERMCAP_mb=$'\e[01;31m' # begin blinking +export LESS_TERMCAP_md=$'\e[01;38;5;74m' # begin bold +export LESS_TERMCAP_me=$'\e[0m' # end mode +export LESS_TERMCAP_se=$'\e[0m' # end standout-mode +export LESS_TERMCAP_so=$'\e[38;5;246m' # begin standout-mode - info box +export LESS_TERMCAP_ue=$'\e[0m' # end underline +export LESS_TERMCAP_us=$'\e[04;38;5;146m' # begin underline diff --git a/baseline/.tmux.conf b/baseline/.tmux.conf index ac22398..de0c3a6 100644 --- a/baseline/.tmux.conf +++ b/baseline/.tmux.conf @@ -1,5 +1,7 @@ set -g default-terminal "screen-256color" set-option -g prefix C-a +# dont wait for escape +set -sg escape-time 0 #key bindings bind | split-window -h diff --git a/baseline/.vimrc b/baseline/.vimrc index 94d49a1..aa63429 100644 --- a/baseline/.vimrc +++ b/baseline/.vimrc @@ -19,6 +19,7 @@ Plugin 'ludovicchabant/vim-gutentags' Plugin 'mbbill/undotree' Plugin 'tpope/vim-commentary' Plugin 'wellle/context.vim' +Plugin 'roxma/vim-tmux-clipboard' call vundle#end() filetype plugin indent on @@ -1 +1 @@ -/home/devi/delf/delf.py
\ No newline at end of file +/home/devi/devi/delf.git/master/delf.py
\ No newline at end of file @@ -8,31 +8,39 @@ import sys from capstone import * from capstone.x86 import * + def SigHandler_SIGINT(signum, frame): print() sys.exit(0) + class Argparser(object): def __init__(self): parser = argparse.ArgumentParser() parser.add_argument("--hex", type=str, help="the hex code") parser.add_argument("--sp", type=str, help="separator") - parser.add_argument("--dbg", action="store_true", help="debug", default=False) + parser.add_argument("--dbg", action="store_true", + help="debug", default=False) self.args = parser.parse_args() # write code here + + def premain(argparser): signal.signal(signal.SIGINT, SigHandler_SIGINT) - #here + # here code = bytes() if argparser.args.hex: - if argparser.args.sp: hex_str = argparser.args.hex.split(argparser.args.sp) - else: hex_str = argparser.args.hex.split(" ") + if argparser.args.sp: + hex_str = argparser.args.hex.split(argparser.args.sp) + else: + hex_str = argparser.args.hex.split(" ") code = [int(byte, 16) for byte in hex_str] md = Cs(CS_ARCH_X86, CS_MODE_64) for i in md.disasm(bytes(code), 0x0): print(hex(i.address).ljust(7), i.mnemonic.ljust(7), i.op_str) + def main(): argparser = Argparser() if argparser.args.dbg: @@ -46,5 +54,6 @@ def main(): else: premain(argparser) + if __name__ == "__main__": main() diff --git a/c/Dockerfile b/c/Dockerfile new file mode 100644 index 0000000..9d16824 --- /dev/null +++ b/c/Dockerfile @@ -0,0 +1,6 @@ +FROM debian:buster-slim +RUN apt update && apt upgrade -y +RUN apt install wget build-essential -y +COPY ./*.cpp ./*.hpp ./makefile /dummy/ +WORKDIR /dummy +RUN make exe CXX=g++ run diff --git a/git/wipe_irssi_passwords b/git/wipe_irssi_passwords index 26e9d58..69da189 100755 --- a/git/wipe_irssi_passwords +++ b/git/wipe_irssi_passwords @@ -5,7 +5,7 @@ import re def main(): - with open("./config", "r") as config_file: + with open("/home/devi/.irssi/config", "r") as config_file: lines = config_file.readlines() for line in lines: print(re.sub("password\\s*=\\s*\"(.*)\"", diff --git a/irssi/config b/irssi/config index be8aa33..af19c09 100644 --- a/irssi/config +++ b/irssi/config @@ -366,13 +366,15 @@ keyboard = ( { key = "meta-[M"; id = "command"; data = "mouse_xterm"; } ); ignores = ( - { level = "JOINS PARTS QUITS NICKS"; channels = ( "#go-nuts" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#docker" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#node.js" ); }, - { level = "JOINS PARTS QUITS NICKS"; channels = ( "#vagrant" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#ansible" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#dpdk" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#fdio-vpp" ); }, - { level = "JOINS PARTS QUITS NICKS"; channels = ( "#osm" ); }, - { level = "JOINS PARTS QUITS NICKS"; channels = ( "#alacritty" ); } + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#alacritty" ); }, + { 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 = ( "#qemu" ); }, + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#vagrant" ); } ); diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme index f1ce6c8..cd857b2 100644 --- a/irssi/solarized-powerline.theme +++ b/irssi/solarized-powerline.theme @@ -1,4 +1,5 @@ # vim: set expandtab: +# vim: filetype=perl # (Adapted from solarized-universal theme by Huy Z: https://github.com/huyz/irssi-colors-solarized) # Adaped by: Paul Saunders # later adapted by: Farzad Sadeghi https://github.com/terminaldweller @@ -75,11 +75,11 @@ LD_FLAGS+=$(EXTRA_LD_FLAGS) .DEFAULT:all -.PHONY:all clean help ASM SO TAGS WASM JS IR WAST A ADBG AST cppcheck +.PHONY:all clean help ASM SO TAGS WASM JS IR WAST A ADBG AST cppcheck DOCKER all:$(TARGET) -everything:$(TARGET) A ASM SO $(TARGET)-static $(TARGET)-dbg ADBG TAGS $(TARGET)-cov WASM JS IR WAST AST +everything:$(TARGET) A ASM SO $(TARGET)-static $(TARGET)-dbg ADBG TAGS $(TARGET)-cov WASM JS IR WAST AST DOCKER depend:.depend @@ -198,6 +198,9 @@ rundbg: $(TARGET)-dbg format: - clang-format -i $(SRCS) $(HDRS) +DOCKER: Dockerfile + docker build -t proto ./ + clean: - rm -f *.o *.s *.odbg *.ocov *.js *.ir *~ $(TARGET) $(TARGET).so $(TARGET)-static \ $(TARGET)-dbg $(TARGET).a $(TARGET)-cov *.wasm *.wast $(TARGET).adbg *.ast diff --git a/makefilecpp b/makefilecpp index 7bcb7fa..e3c5892 100644 --- a/makefilecpp +++ b/makefilecpp @@ -75,11 +75,11 @@ LD_FLAGS+=$(EXTRA_LD_FLAGS) .DEFAULT:all -.PHONY:all clean help ASM SO TAGS WASM JS exe IR WAST A ADBG AST cppcheck +.PHONY:all clean help ASM SO TAGS WASM JS exe IR WAST A ADBG AST cppcheck DOCKER all:exe -everything:$(TARGET) A ASM SO $(TARGET)-static $(TARGET)-dbg ADBG TAGS $(TARGET)-cov WASM JS IR WAST AST +everything:$(TARGET) A ASM SO $(TARGET)-static $(TARGET)-dbg ADBG TAGS $(TARGET)-cov WASM JS IR WAST AST DOCKER depend:.depend @@ -203,6 +203,9 @@ rundbg: $(TARGET)-dbg format: - clang-format -i $(SRCS) $(HDRS) +DOCKER: Dockerfile + docker buld -t proto ./ + clean: - rm -f *.o *.dis *.odbg *.ocov *.js *.ir *~ $(TARGET) $(TARGET).so $(TARGET)-static \ $(TARGET)-dbg $(TARGET).a $(TARGET)-cov *.wasm *.wast $(TARGET).adbg *.ast @@ -16,6 +16,6 @@ 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 +fall of hyperion--7:32:30 diff --git a/tmux/date.sh b/tmux/date.sh index 1c08e47..c0f1bcf 100755 --- a/tmux/date.sh +++ b/tmux/date.sh @@ -9,8 +9,11 @@ RESULT=$(date +"%a %D %H:%M") DAY="#[fg=colour255 bg=colour31]"$(echo $RESULT | gawk '{print $1}') DATE="#[fg=colour255 bg=colour31]"$(echo $RESULT | gawk '{print $2}') TIME="#[fg=colour255 bg=colour31]"$(echo $RESULT | gawk '{print $3}') -UTC_TIME="#[fg=colour255 bg=colour75]"$(date -u +"%H:%I") +UTC_TIME_RESULT=$(date -u +"%H:%M") +UTC_TIME="#[fg=colour255 bg=colour25]"$(echo GMT: $UTC_TIME_RESULT) # JDATE="#[fg=colour255 bg=colour29]"$(jdate | gawk '{print $2" "$3}') JDATE="#[fg=colour255 bg=colour29]"$(jdate | gawk '{print $2" "$3}') +WEATHER_INFO=$(curl "https://api.openweathermap.org/data/2.5/weather?q=Tehran&appid=a2fab6f29fbe16083cf382306c2abee4&units=metric"|jq ".main.temp") +WEATHER="#[fg=colour255 bg=colour32]"$(echo $WEATHER_INFO" C") -echo "#[fg=colour29 bg=colour16]$SEPARATOR_LEFT_BOLD$JDATE #[fg=colour31 bg=colour29]$SEPARATOR_LEFT_BOLD$DAY $SEPARATOR_LEFT_THIN $DATE $SEPARATOR_LEFT_THIN $TIME #[fg=colour75 bg=colour31]$SEPARATOR_LEFT_BOLD$UTC_TIME " +echo "#[fg=colour32 bg=colour16]$SEPARATOR_LEFT_BOLD$WEATHER#[fg=colour29 bg=colour32]$SEPARATOR_LEFT_BOLD$JDATE #[fg=colour31 bg=colour29]$SEPARATOR_LEFT_BOLD$DAY $SEPARATOR_LEFT_THIN $DATE $SEPARATOR_LEFT_THIN $TIME #[fg=colour25 bg=colour31]$SEPARATOR_LEFT_BOLD$UTC_TIME " diff --git a/tmux/vcs_info.sh b/tmux/vcs_info.sh index 1369b3d..2b2d857 100755 --- a/tmux/vcs_info.sh +++ b/tmux/vcs_info.sh @@ -29,7 +29,7 @@ function gitadditions { git rev-parse --git-dir > /dev/null 2>&1 if [[ $? == 0 ]]; then insertions=$(git --no-pager diff --numstat | awk '{sum1+=$1}END{print sum1}') - echo + $insertions + echo +$insertions fi } @@ -37,7 +37,7 @@ function gitdeletions { git rev-parse --git-dir > /dev/null 2>&1 if [[ $? == 0 ]]; then deletions=$(git --no-pager diff --numstat | awk '{sum2+=$2}END{print sum2}') - echo - $deletions + echo -$deletions fi } @@ -45,7 +45,7 @@ function git_untracked_info { git rev-parse --git-dir > /dev/null 2>&1 if [[ $? == 0 ]]; then untracked=$(git ls-files --others --exclude-standard | wc -w) - echo ⋯ $untracked + echo ⋯$untracked fi } @@ -57,10 +57,20 @@ function git_branch_info { fi } +function repo_info { + git rev-parse --git-dir > /dev/null 2>&1 + if [[ $? == 0 ]]; then + insertions=$(git --no-pager diff --numstat | awk '{sum1+=$1}END{print sum1}') + echo + else + : + fi +} + tmux_session_info=" #S:#I.#P" -branch_info="#[fg=colour24]#[fg=colour255 bg=colour65]"$(git_branch_info) +branch_info="#[fg=colour16]$(repo_info)#[fg=colour255 bg=colour39]"$(git_branch_info) untracked_info="#[fg=colour255 bg=colour244]"$(git_untracked_info) deletions_info="#[fg=colour255 bg=colour1]"$(gitdeletions) additions__info="#[fg=colour255 bg=colour22]"$(gitadditions) -echo "#[fg=colour255 bg=colour61]$shortened_path #[fg=colour61 bg=colour26]$SEPARATOR_RIGHT_BOLD#[fg=colour255 bg=colour26]$tmux_session_info #[fg=colour26 bg=colour65]$SEPARATOR_RIGHT_BOLD $branch_info #[fg=colour65 bg=colour22]$SEPARATOR_RIGHT_BOLD $additions__info #[fg=colour22 bg=colour1]$SEPARATOR_RIGHT_BOLD $deletions_info #[fg=colour1 bg=colour244]$SEPARATOR_RIGHT_BOLD $untracked_info #[fg=colour244 bg=colour16]$SEPARATOR_RIGHT_BOLD" +echo "#[fg=colour255 bg=colour29]$shortened_path #[fg=colour29 bg=colour26]$SEPARATOR_RIGHT_BOLD#[fg=colour255 bg=colour26]$tmux_session_info #[fg=colour26 bg=colour39]$SEPARATOR_RIGHT_BOLD $branch_info #[fg=colour39 bg=colour22]$SEPARATOR_RIGHT_BOLD $additions__info #[fg=colour22 bg=colour1]$SEPARATOR_RIGHT_BOLD $deletions_info #[fg=colour1 bg=colour244]$SEPARATOR_RIGHT_BOLD $untracked_info #[fg=colour244 bg=colour16]$SEPARATOR_RIGHT_BOLD" |