diff options
| -rw-r--r-- | .gitconfig | 18 | ||||
| -rw-r--r-- | .tmux.conf | 2 | ||||
| -rw-r--r-- | .vimrc | 10 | ||||
| -rw-r--r-- | .zshrc | 4 | ||||
| -rw-r--r-- | irssi/config | 33 | ||||
| -rw-r--r-- | irssi/solarized-powerline.theme | 4 |
6 files changed, 62 insertions, 9 deletions
@@ -16,21 +16,22 @@ lg1 = lg1-specific --all lg2 = lg2-specific --all lg3 = lg3-specific --all + lg10 = forest lg1-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' lg2-specific = log --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset)%C(auto)%d%C(reset)%n'' %C(white)%s%C(reset) %C(dim white)- %an%C(reset)' - lg3-specific = log --simplify-by-decoration --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' + lg3-specific = log --simplify-by-decoration --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold cyan)%aD%C(reset) %C(bold green)(%ar)%C(reset) %C(bold cyan)(committed: %cD)%C(reset) %C(auto)%d%C(reset)%n'' %C(white)%s%C(reset)%n'' %C(dim white)- %an <%ae> %C(reset) %C(dim white)(committer: %cn <%ce>)%C(reset)' # delimiter used as column seperator - delim = | + delim = ^ # example thompson1 - lg4 = log --all --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' + lg4 = log --all --graph --abbrev-commit --decorate --format=format:'%C(bold blue)%h%C(reset) - %C(bold green)(%ar)%C(reset) %C(white)%s%C(reset) %C(dim white)- %an%C(reset)%C(auto)%d%C(reset)' # modified thompson1 example lg5 = log --all --graph --color --abbrev-commit --decorate --format=format:'^%C(bold blue)%<(7,trunc)%h%C(reset)^%C(bold green)%<(21,trunc)%ar%C(reset)^%C(white)%<(40,trunc)%s%C(reset)^%C(dim white)%<(25,trunc)%an%C(reset)^%C(auto)%d%C(reset)' # set a column for the graph thompson1-new-col = 1 - tably = !bash -c '" \ + tably = !bash -c '" \ declare -A col_length; \ delim=$(git config alias.delim); \ git_log_cmd=$(git config alias.$1); \ @@ -111,3 +112,12 @@ done <<< $(seq 2 1 ${git_tre_col:-1};seq 1;seq $((${git_tre_col:-1}+1)) 1 $i_max); \ echo -e \"$cont_all\"; \ "' "git-tably" + +[color "diff"] + meta = blue +[pager] + log = diff-highlight | less + show = diff-highlight | less + diff = diff-highlight | less +[interactive] + diffFilter = diff-highlight @@ -29,6 +29,8 @@ set-option -g set-titles on set -g focus-events on # dont wait for escape set -sg escape-time 0 +# bind-key -g C-a last-window +# bind-key a send-prefix set -g default-command /usr/bin/zsh set -g default-shell /usr/bin/zsh @@ -1062,9 +1062,10 @@ let g:ctrlp_map = '<c-p>' let g:ctrlp_cmd = 'CtrlP' let g:ctrlp_show_hidden = 1 let g:ctrlp_root_markers = ['.root'] +let g:ctrlp_custom_ignore = '\v[\/](node_modules|target|dist)|(\.(swp|ico|git|svn))$' if executable('rg') set grepprg=rg\ --color=never - let g:ctrlp_user_command = 'rg %s --files --hidden --color=never --glob "!node_modules"' + let g:ctrlp_user_command = 'rg %s --files --hidden --color=never --glob "!node_modules,!*.swp,!*.swo"' let g:ctrlp_use_caching = 0 endif @@ -1459,13 +1460,18 @@ augroup ALELUA autocmd FileType lua let b:ale_linters = {'lua': ['luacheck']} autocmd FileType lua let b:ale_fixers = {'lua': ['lua-format']} augroup END -let b:ale_sh_shfmt_options = "-l -w" +" let b:ale_sh_shfmt_options = '-w -p -i=2 -bn -ci -sr -kp' +let b:ale_sh_shfmt_options = "-w -" let b:ale_sh_shellcheck_options = '-x' augroup ALESH autocmd! autocmd FileType sh let b:ale_linters = {'sh': ['shellcheck']} autocmd FileType sh let b:ale_fixers = {'sh': ['shfmt']} augroup END +augroup ALECSS + autocmd! + autocmd FileType css let b:ale_fixers = {'css': ['prettier']} +augroup END "latex let g:tex_flavor = 'latex' @@ -20,6 +20,8 @@ autoload -U compinit && compinit -u eval `dircolors ~/.dir_colors` # _evalcache dircolors ~/.dir_colors +alias gd="git diff --color-words" + alias w3m="torsocks w3m -o auto_image=FALSE -graph" alias rm="rm -I --one-file-system --preserve-root=all" alias vv="vim" @@ -214,6 +216,8 @@ alias ytfzf="proxychains4 -q -f ~/proxies/ice/proxychains.conf ytfzf" alias newsboat="proxychains4 -q -f ~/proxies/ice/proxychains.conf newsboat" alias dud="du -hcD --max-depth=1 | sort -hr | colcol | column -t" alias bbox="busybox" +alias gitconfigrc="vim ~/scripts/.gitconfig" +alias fixgitconfigrc="cp ~/scripts/.gitconfig ~/.gitconfig" #autosuggest ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold,underline" diff --git a/irssi/config b/irssi/config index 541aecf..bfb983e 100644 --- a/irssi/config +++ b/irssi/config @@ -16,7 +16,7 @@ servers = ( chatnet = "FRRouting.slack.com"; port = "6667"; password = ""; - use_tls = "no"; + use_tls = "yes"; tls_verify = "no"; autoconnect = "yes"; }, @@ -43,6 +43,33 @@ servers = ( tls_cert = "~/.irssi/certs/nick.pem"; tls_verify = "yes"; autoconnect = "yes"; + }, + { + address = "irc.rizon.net"; + chatnet = "Rizon"; + port = "6697"; + use_tls = "yes"; + tls_cert = "~/.irssi/certs/nick.pem"; + tls_verify = "yes"; + autoconnect = "yes"; + }, + { + address = "ssl.ircnet.io"; + chatnet = "IRCNet"; + port = "6697"; + use_tls = "yes"; + tls_cert = "~/.irssi/certs/nick.pem"; + tls_verify = "yes"; + autoconnect = "yes"; + }, + { + address = "185.112.147.110"; + chatnet = "Undernet-ZNC"; + port = "1025"; + password = ""; + use_tls = "yes"; + tls_verify = "no"; + autoconnect = "yes"; } ); @@ -59,6 +86,9 @@ chatnets = { "FRRouting.slack.com" = { type = "IRC"; }; bitlbee = { type = "IRC"; }; LiberaChat = { type = "IRC"; sasl_mechanism = "EXTERNAL"; }; + Rizon = { type = "IRC"; }; + IRCNet = { type = "IRC"; }; + "Undernet-ZNC" = { type = "IRC"; }; }; channels = ( @@ -467,3 +497,4 @@ ignores = ( { level = "JOINS PARTS QUITS NICKS"; channels = ( "#linux" ); }, { level = "JOINS PARTS QUITS NICKS"; channels = ( "#tor" ); } ); +logs = { }; diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme index 31744c3..7bc04e4 100644 --- a/irssi/solarized-powerline.theme +++ b/irssi/solarized-powerline.theme @@ -418,7 +418,7 @@ formats = { msg_private_query = "{privmsgnick $nickalign$nickcolor$0$nicktrunc}$2"; }; "fe-common/irc" = { - away = "%k%z00d700AWAY %N%k%N"; + away = "%k%z00d700AWAY %Z00d700%0%N"; banlist = "%p%z00d700BANS %z00d700 $[-3]0 %8 {ichannelhilight $1} %N%8%n%k%N {ban $2}"; banlist_long = "%p%z00d700BANS %z00d700 $[-3]0 %8 {ichannelhilight $1} {comment by {inick $3}%0%k, $4 secs ago} %N%8%n%k%N {ban $2}"; chanmode_change = "%k%z008700MODE %N%Z008700%N {channelhilight $0} %Zeeeeee%n {mode $1}%n by {nick $2}"; @@ -445,7 +445,7 @@ formats = { server_chanmode_change = "%k%z8787ff SERVERMODE %k%8 {channelhilight $0} {mode $1} by {nick $2}"; topic = "%k%z00d700TOPIC %Z00d700%0%N {channel $0}%N $1"; topic_info = "%k%z00d700TOPIC %Z00d700%0%N {nick $0}%N {nickhost $2} $1"; - unaway = "%k%z00d700AWAY %N%k%N END"; + unaway = "%k%z00d700AWAY %Z00d700%0%N END"; usermode_change = "%z008700%ZeeeeeeMODE %N%Z008700%N {mode $0}%N for %0{mynick $1}%N"; who = "%z00d700%kWHO %z005f87%k {inick $[!9]1} %Z005f87 %k$0 %0%g Status: $[!3]2 $[-2]3 hops %N%k%N {nickhost $4@$5} {comment $6}"; whois = "%z00d700%kWHOIS %Z00d700%0%n {nick $0} {nickhost $1@$2}%:{whois ircname $3}"; |