diff options
author | terminaldweller <thabogre@gmail.com> | 2021-05-26 19:00:46 +0000 |
---|---|---|
committer | terminaldweller <thabogre@gmail.com> | 2021-05-26 19:00:46 +0000 |
commit | 9bb49d1352c970f666cbf44b0eec11817b2ccb4f (patch) | |
tree | 2173d672774aa6710e65a80c7ea2764be63e12c0 | |
parent | merge (diff) | |
download | scripts-9bb49d1352c970f666cbf44b0eec11817b2ccb4f.tar.gz scripts-9bb49d1352c970f666cbf44b0eec11817b2ccb4f.zip |
fixed the w3m script problems. now using exa. some other small stuff
Diffstat (limited to '')
-rw-r--r-- | .config/lsd/config.yaml | 115 | ||||
-rw-r--r-- | .tmux.conf | 1 | ||||
-rw-r--r-- | .vimrc | 4 | ||||
-rwxr-xr-x[-rw-r--r--] | .w3m/build.sh | 2 | ||||
-rwxr-xr-x | .w3m/cgi-bin/goto_tmux_clipboard.cgi | 2 | ||||
-rwxr-xr-x | .w3m/cgi-bin/restore_session.cgi | 2 | ||||
-rw-r--r-- | .zshrc | 190 | ||||
-rw-r--r-- | baseline/.tmux.conf | 3 | ||||
-rw-r--r-- | irssi/config | 131 | ||||
-rw-r--r-- | irssi/solarized-powerline.theme | 108 | ||||
-rw-r--r-- | irssi/startup | 20 | ||||
-rwxr-xr-x | vim/install.sh | 2 |
12 files changed, 330 insertions, 250 deletions
diff --git a/.config/lsd/config.yaml b/.config/lsd/config.yaml new file mode 100644 index 0000000..eb8e667 --- /dev/null +++ b/.config/lsd/config.yaml @@ -0,0 +1,115 @@ +# == Classic == +# This is a shorthand to override some of the options to be backwards compatible +# with `ls`. It affects the "color"->"when", "sorting"->"dir-grouping", "date" +# and "icons"->"when" options. +# Possible values: false, true +classic: false + +# == Blocks == +# This specifies the columns and their order when using the long and the tree +# layout. +# Possible values: permission, user, group, size, size_value, date, name, inode +blocks: + - permission + - user + - group + - size + - date + - name + - inode + +# == Color == +# This has various color options. (Will be expanded in the future.) +color: + # When to colorize the output. + # When "classic" is set, this is set to "never". + # Possible values: never, auto, always + when: always + +# == Date == +# This specifies the date format for the date column. The freeform format +# accepts an strftime like string. +# When "classic" is set, this is set to "date". +# Possible values: date, relative, +<date_format> +date: date + +# == Dereference == +# Whether to dereference symbolic links. +# Possible values: false, true +dereference: false + +# == Display == +# What items to display. Do not specify this for the default behavior. +# Possible values: all, almost-all, directory-only +# display: all + +# == Icons == +icons: + # When to use icons. + # When "classic" is set, this is set to "never". + # Possible values: always, auto, never + when: auto + # Which icon theme to use. + # Possible values: fancy, unicode + theme: fancy + # Separator between icon and the name + # Default to 1 space + separator: ' ' + + +# == Ignore Globs == +# A list of globs to ignore when listing. +# ignore-globs: +# - .git + +# == Indicators == +# Whether to add indicator characters to certain listed files. +# Possible values: false, true +indicators: false + +# == Layout == +# Which layout to use. "oneline" might be a bit confusing here and should be +# called "one-per-line". It might be changed in the future. +# Possible values: grid, tree, oneline +layout: grid + +# == Recursion == +recursion: + # Whether to enable recursion. + # Possible values: false, true + enabled: false + # How deep the recursion should go. This has to be a positive integer. Leave + # it unspecified for (virtually) infinite. + # depth: 3 + +# == Size == +# Specifies the format of the size column. +# Possible values: default, short, bytes +size: default + +# == Sorting == +sorting: + # Specify what to sort by. + # Possible values: extension, name, time, size, version + column: name + # Whether to reverse the sorting. + # Possible values: false, true + reverse: false + # Whether to group directories together and where. + # When "classic" is set, this is set to "none". + # Possible values: first, last, none + dir-grouping: none + +# == No Symlink == +# Whether to omit showing symlink targets +# Possible values: false, true +no-symlink: false + +# == Total size == +# Whether to display the total size of directories. +# Possible values: false, true +total-size: false + +# == Symlink arrow == +# Specifies how the symlink arrow display, chars in both ascii and utf8 +symlink-arrow: ⇒ @@ -91,6 +91,7 @@ bind -T copy-mode-vi 'y' send -X copy-selection-and-cancel bind ] paste-buffer bind Space choose-buffer # bind C-l send-keys 'C-l' +bind -n C-h clear-history #move windows # bind-key -n C-S-Left swap-window -t -1 @@ -76,7 +76,7 @@ set rtp+=~/.vim/bundle/Vundle.vim set rtp+=/usr/bin/fzf " set rtp+=/home/bloodstalker/extra/llvm-clang-4/build/bin/clangd " set rtp+=/usr/local/bin/pyls -let g:polyglot_disabled = ['go.plugin'] +let g:polyglot_disabled = ['go.plugin','markdown.plugin'] call vundle#begin() Plugin 'vim-airline/vim-airline' @@ -207,7 +207,7 @@ Plugin 'hail2u/vim-css3-syntax' call vundle#end() filetype plugin indent on -let g:gfm_syntax_enable_always = 0 +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 diff --git a/.w3m/build.sh b/.w3m/build.sh index 5b68f06..cc705da 100644..100755 --- a/.w3m/build.sh +++ b/.w3m/build.sh @@ -2,4 +2,4 @@ set -x set -e -cd ~ && git clone https://github.com/tats/w3m && cd w3m && ./configure --with-ssl && sudo make install -j4 +cd ~ && git clone https://github.com/tats/w3m && cd w3m && ./configure --with-ssl --with-imagelib=imlib2 --with-termlib=terminfo && sudo make install -j4 diff --git a/.w3m/cgi-bin/goto_tmux_clipboard.cgi b/.w3m/cgi-bin/goto_tmux_clipboard.cgi index fe91b57..591c21a 100755 --- a/.w3m/cgi-bin/goto_tmux_clipboard.cgi +++ b/.w3m/cgi-bin/goto_tmux_clipboard.cgi @@ -22,7 +22,7 @@ #GOTO url in clipboard in current page. If the clipboard has a #"non url string/nothing" an blank page is shown. -printf "%s\r\n" "W3m-control: GOTO $(tmux paste-buffer)"; +echo "W3m-control: GOTO $(tmux show-buffer)"; #delete the buffer (element in history) created between the current page and #the searched page by calling this script. printf "W3m-control: DELETE_PREVBUF\r\n" diff --git a/.w3m/cgi-bin/restore_session.cgi b/.w3m/cgi-bin/restore_session.cgi index aa0ba41..4e30311 100755 --- a/.w3m/cgi-bin/restore_session.cgi +++ b/.w3m/cgi-bin/restore_session.cgi @@ -32,7 +32,7 @@ echo "#!/usr/bin/env sh" > "$RESTORE_SESSSION" echo "torsocks w3m -graph \\" >> "$RESTORE_SESSSION" # remove dupes without sorting, add -N flag at beginning and append trailing slash to each url awk '!x[$0]++' "$HOME/.w3m/RestoreSession.txt" | while read -r line ; do echo "-N '$line' \\" >> "$RESTORE_SESSSION" ; done -echo "2>/dev/null" >> "$RESTORE_SESSSION" +# echo "2>/dev/null" >> "$RESTORE_SESSSION" chmod +x "$RESTORE_SESSSION" ## OUTPUT SCRIPT FILE EXAMPLE ~/.w3m/bin/w3mlastsession @@ -1,31 +1,24 @@ # Path to your oh-my-zsh installation. - export ZSH=/home/bloodstalker/.oh-my-zsh + export ZSH=/home/devi/.oh-my-zsh ZSH_THEME="devi" COMPLETION_WAITING_DOTS="true" -plugins=(git svn zsh-syntax-highlighting autojump virtualenv virtualenvwrapper cargo nvm npm docker rustup zle-vi-visual zsh-autosuggestions zsh-kubectl-prompt kubectl docker-compose) +plugins=(git svn zsh-syntax-highlighting autojump virtualenv virtualenvwrapper cargo nvm npm docker rustup zsh-autosuggestions zsh-kubectl-prompt kubectl docker-compose vagrant) -export PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/home/bloodstalker/.local/bin:/home/bloodstalker/bin" +export PATH="/usr/local/bin:/usr/local/sbin:/usr/bin:/usr/sbin:/home/devi/.local/bin:/home/devi/bin" source $ZSH/oh-my-zsh.sh -[[ -s /home/bloodstalker/.autojump/etc/profile.d/autojump.sh ]] && source /home/bloodstalker/.autojump/etc/profile.d/autojump.sh +[[ -s /home/devi/.autojump/etc/profile.d/autojump.sh ]] && source /home/devi/.autojump/etc/profile.d/autojump.sh autoload -U compinit && compinit -u -alias devihome=/home/bloodstalker/devi/hell -alias devihome1=/home/bloodstalker/devi/hell1 -alias devihome2=/home/bloodstalker/devi/hell2 -alias devihome3=/home/bloodstalker/devi/hell3 -alias "$SHELL"="echo $SHELL" -#alias clang="/home/bloodstalker/llvm/llvm/build/bin/clang" -#alias clang++="/home/bloodstalker/llvm/llvm/build/bin/clang++" -#alias llvm-config="/home/bloodstalker/llvm/llvm/build/bin/llvm-config" -#alias "clang-query"="/home/bloodstalker/llvm/llvm/build/bin/clang-query" -alias la="ls -A" +alias ls="exa" +alias la="exa -a" +alias ll="exa -abghHliSmxGF --git -@" +alias lss="exa -S" alias ee="nautilus ." -#aliias "clang-format"="/home/bloodstalker/llvm/llvm/build/bin/clang-format" alias updaterc="cp ~/scripts/.zshrc ~/.zshrc" alias fixvimrc='cp ~/scripts/.vimrc ~/.vimrc' alias fixtmuxrc='cp ~/scripts/.tmux.conf ~/.tmux.conf' @@ -33,7 +26,6 @@ alias fixtmuxpowerline='cp ~/scripts/default.sh ~/tmux-powerline/themes/default. alias fixctagsrc='cp ~/scripts/.ctags ~/.ctags' alias fixtvrc='cp ~/scripts/.tvrc ~/.tvrc' alias tmuxpowerline='vim ~/scripts/default.sh' -alias lss="ls -s" alias speedtest="curl -o /dev/null http://speedtest.sea01.softlayer.com/downloads/test100.zip" alias zshrc="vim ~/scripts/.zshrc" alias vimrc="vim ~/scripts/.vimrc" @@ -41,7 +33,7 @@ alias tmuxrc="vim ~/scripts/.tmux.conf" alias zshtheme="vim ~/scripts/devi.zsh-theme" alias quit="exit" alias xx="dtrx" -alias angband="/home/bloodstalker/angband-4.1.0/angband-master/src/angband" +alias angband="/home/devi/angband-4.1.0/angband-master/src/angband" alias startdocker="sudo systemctl start docker" alias vv="vim" alias mm="cmatrix -s -C blue" @@ -69,7 +61,7 @@ alias fixqtrc="cp ~/scripts/qtbrowser/config.py ~/.config/qutebrowser/config.py" alias dropcextra="cp ~/scripts/c/devi_extra.h ./devi_extra.h" alias dropcmain="cp ~/scripts/c/main.c ./" alias dropcppmain="cp ~/scripts/c/main.cpp ./" -alias telebot="/home/bloodstalker/scripts/telebot.py > /dev/null 2>&1 &" +alias telebot="/home/devi/scripts/telebot.py > /dev/null 2>&1 &" alias dw="~/df/df_linux/df" alias clean="clear" alias lynx="lynx -lss ~/scripts/lynx.lss -cfg ~/scripts/lynx.cfg -prettysrc" @@ -87,7 +79,7 @@ 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/bloodstalker/extra/mupdf/build/release/mupdf-x11 -D red -P black -I" +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" alias pirate-get="pirate-get -S ~/magnets/" @@ -117,7 +109,7 @@ alias fixpgclirc="cp ~/scripts/.config/pgcli/config ~/.config/pgcli/config" alias jupyter="~/.local/bin/jupyter-notebook --no-browser" alias iredisrc="vim ~/scripts/.iredisrc" alias fixiredisrc="cp ~/scripts/.iredisrc ~/.iredisrc" -alias irssi="irssi -n bloodstalker" +alias irssi="irssi -n terminaldweller" alias joplinkeymap="vim ~/scripts/.config/joplin/keymap.json" alias fixjoplinkeymap="cp ~/scripts/.config/joplin/keymap.json ~/.config/joplin/keymap.json" alias mpv="/mnt/c/ProgramData/chocolatey/lib/mpv.install/tools/mpv.exe" @@ -131,6 +123,9 @@ alias fixirssiconfig="cp ~/scripts/irssi/config ~/.irssi/config" alias fixirssitheme="cp ~/scripts/irssi/solarized-powerline.theme ~/.irssi/solarized-powerline.theme" alias fixirssistartup="cp ~/scripts/irssi/startup ~/.irssi/startup" alias w3mlastsession="~/.w3m/bin/w3mlastsession" +alias lsdrc="vim ~/scripts/.config/lsd/config.yaml" +alias fixlsdrc="cp ~/scripts/.config/lsd/config.yaml ~/.config/lsd/config.yaml" +alias vagrant="PATH=$PATH:/mnt/c/Windows/System32:/mnt/c/Windows/System32/WindowsPowerShell/v1.0 vagrant" #autosuggest ZSH_AUTOSUGGEST_HIGHLIGHT_STYLE="fg=#5f5fff,bg=#000000,bold" @@ -139,7 +134,7 @@ ZSH_AUTOSUGGEST_USE_ASYNC=1 ZSH_AUTOSUGGEST_BUFFER_MAX_SIZE=30 function lemon { - /home/bloodstalker/scripts/lemonbar.sh | lemonbar -f "DejaVu Sans Mono for Powerline:size=11" -g "x16" + /home/devi/scripts/lemonbar.sh | lemonbar -f "DejaVu Sans Mono for Powerline:size=11" -g "x16" } function docpp { @@ -184,9 +179,11 @@ function pid { #fi REPORTTIME=4 -STARDICT_DATA_DIR="/home/bloodstalker/.stardict" +STARDICT_DATA_DIR="/home/devi/.stardict" export STARDICT_DATA_DIR -export DISPLAY=":0" +export DISPLAY="192.168.1.103:0" +export LIBGL_ALWAYS_INDIRECT=1 +export VAGRANT_WSL_ENABLE_WINDOWS_ACCESS="1" export WWW_HOME="duckduckgo.com" alias def="sdcv --color" #goenv @@ -196,13 +193,14 @@ export PATH="$GOENV_ROOT/bin:$PATH" export LESS='-R' export LESSOPEN='|~/scripts/lesscolor.sh %s' # libtrash settings -export LD_PRELOAD=/usr/local/lib/libtrash.so.3.5 -alias trashon=”export TRASH_OFF=NO” -alias trashoff=”export TRASH_OFF=YES” +# export LD_PRELOAD=/usr/local/lib/libtrash.so.3.5 +# alias trashon=”export TRASH_OFF=NO” +# alias trashoff=”export TRASH_OFF=YES” export BAT_THEME="Solarized (light)" -export FZF_DEFAULT_OPTS="--color fg:7,bg:0,hl:31,fg+:24,bg+:0,hl+:63,info:208,prompt:196,spinner:24,pointer:24,marker:22" +export FZF_TMUX_OPTS="-p 70%,70%" +export FZF_DEFAULT_OPTS="--color fg:7,bg:0,hl:31,fg+:24,bg+:0,hl+:63,info:34,prompt:27,spinner:24,pointer:24,marker:22" export YTFZF_HIST=1 export YTFZF_LOOP=0 @@ -221,73 +219,46 @@ function fixtheme { source ~/.zshrc } -export PATH=$PATH:/home/bloodstalker/extra/cov-analysis-linux64-2019.03/bin -#export PATH=:$PATH:/home/bloodstalker/extra/llvm-6/build/bin -#export PATH=:$PATH:/home/bloodstalker/devi/abbatoir/hole145/llvm7/build/bin -#export PATH=:$PATH:/home/bloodstalker/extra/llvm-clang-4/build/bin -#export PATH=:$PATH:/home/bloodstalker/extra/llvm-clang-4/build/lib -export PATH=:$PATH:/home/bloodstalker/extra/llvm-11/llvm-project/build/bin -export PATH=:$PATH:/home/bloodstalker/extra/llvm-11/llvm-project/build/lib -export PATH=:$PATH:/home/bloodstalker/arcanist/arcanist/bin -export PATH=:$PATH:/home/bloodstalker/devi/abbatoir/hole58/solidity_0.4.18/build/solc -export PATH=:$PATH:/home/bloodstalker/binaryen/bin -export PATH=:$PATH:/home/bloodstalker/extra/go-ethereum/build/bin -export PATH=:$PATH:/home/bloodstalker/.cargo/bin -export PATH=:$PATH:/home/bloodstalker/extra/parity/target/release -export PATH=:$PATH:/home/bloodstalker/extra/wasm-jit-prototype/build/bin -export PATH=:$PATH:/home/bloodstalker/scripts/bin -export PATH=:$PATH:/home/bloodstalker/extra/android-ndk/android-ndk-r16b -export PATH=:$PATH:/home/bloodstalker/.cargo/bin/racer -export PATH=:$PATH:/home/bloodstalker/extra/phantomjs-2.1.1-linux-i686/bin -export PATH=:$PATH:/home/bloodstalker/rigetti/forest-sdk_2.0.1-linux-barebones -export PATH=:$PATH:/home/bloodstalker/extra/tg/bin -export PATH=:$PATH:/home/bloodstalker/extra/Nim/bin -export PATH=:$PATH:/home/bloodstalker/extra/geckodriver -export PATH=:$PATH:/home/bloodstalker/extra/cppcheck -export PATH=:$PATH:/home/bloodstalker/extra/binaryen-version_91 -export PATH=:$PATH:/home/bloodstalker/extra/wabt-1.0.13/ -export PATH=:$PATH:/home/bloodstalker/devi/tabbed/tabbed-0.6 -export PATH=:$PATH:/home/bloodstalker/.dvm/bin -#emscripten -export PATH=:$PATH:/home/bloodstalker/extra/emscripten -export PATH=:$PATH:/home/bloodstalker/extra/emscripten/clang/tag-e1.39.11/build_tag-e1.39.11_64/bin -export PATH=:$PATH:/home/bloodstalker/extra/emscripten/node/8.9.1_64bit/bin -export PATH=:$PATH:/home/bloodstalker/extra/emscripten/emscripten/tag-1.39.11 -export PATH=:$PATH:/home/bloodstalker/devi/protoc/protoc-3.13.0-linux-x86_64/bin -export PATH=:$PATH:/home/devi/protobuf/bin/ -export PATH=:$PATH:/home/devi/ytfzf/ -export PATH=:$PATH:/home/devi/k3s/ -export PATH=:$PATH:/home/devi/kompose +export PATH=$PATH:/home/devi/.cargo/bin +export PATH=$PATH:/home/devi/scripts/bin +export PATH=$PATH:/home/devi/.fzf/bin +export PATH=$PATH:/home/devi/.ghcup/bin +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 EDITOR=vim export BROWSER=w3m -export VAGRANT_WSL_ENABLE_WINDOWS_ACCESS="1" function dig { globalholecounter=0 - if test "$(ls -A "/home/bloodstalker/devi/abbatoir")"; then + if test "$("ls" -A "/home/devi/devi/abbatoir")"; then while [ 1 ]; do - if [ -d "/home/bloodstalker/devi/abbatoir/hole$globalholecounter" ]; then + if [ -d "/home/devi/devi/abbatoir/hole$globalholecounter" ]; then # if its not empty - if test "$(ls -A "/home/bloodstalker/devi/abbatoir/hole$globalholecounter")"; then + if test "$("ls" -A "/home/devi/devi/abbatoir/hole$globalholecounter")"; then : # if its empty else - cd /home/bloodstalker/devi/abbatoir/hole$globalholecounter + cd /home/devi/devi/abbatoir/hole$globalholecounter break fi else - mkdir /home/bloodstalker/devi/abbatoir/hole$globalholecounter - cd /home/bloodstalker/devi/abbatoir/hole$globalholecounter + mkdir /home/devi/devi/abbatoir/hole$globalholecounter + cd /home/devi/devi/abbatoir/hole$globalholecounter echo $globalholecounter break fi ((globalholecounter++)) done else - mkdir /home/bloodstalker/devi/abbatoir - mkdir /home/bloodstalker/devi/abbatoir/hole$globalholecounter - cd /home/bloodstalker/devi/abbatoir/hole$globalholecounter + mkdir /home/devi/devi/abbatoir + mkdir /home/devi/devi/abbatoir/hole$globalholecounter + cd /home/devi/devi/abbatoir/hole$globalholecounter fi } @@ -328,14 +299,14 @@ export KEYTIMEOUT=1 export VIRTUAL_ENV_DISABLE_PROMPT=yes #nvm -export NVM_DIR="/home/bloodstalker/.nvm" +export NVM_DIR="/home/devi/.nvm" [ -s "$NVM_DIR/nvm.sh" ] && . "$NVM_DIR/nvm.sh" # OPAM configuration -. /home/bloodstalker/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true +. /home/devi/.opam/opam-init/init.zsh > /dev/null 2> /dev/null || true # Nix -. /home/bloodstalker/.nix-profile/etc/profile.d/nix.sh +# . /home/devi/.nix-profile/etc/profile.d/nix.sh # fixes the weird delete key behaviour in vi mode #bindkey "[3~" delete-char @@ -379,14 +350,71 @@ setopt SHARE_HISTORY setopt AUTO_CD setopt AUTO_PUSHD -eval "$(goenv init -)" -export PATH="$GOROOT/bin:$PATH" -export PATH="$PATH:$GOPATH/bin" +# eval "$(goenv init -)" +# export PATH="$GOROOT/bin:$PATH" +# export PATH="$PATH:$GOPATH/bin" function fzf_postit() { - cat ~/scripts/postit | fzf --bind 'enter:execute(tmux set-buffer {})+accept' + cat ~/scripts/postit | fzf-tmux -p 70%,70% -- --bind 'enter:execute(tmux set-buffer {})+accept' } +[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh + # this should be here before the end bindkey ' bindkey -s '' 'fzf_postit
' + +is_in_git_repo() { + git rev-parse HEAD > /dev/null 2>&1 +} + +fzf-down() { + fzf --height 50% --min-height 20 --border --bind ctrl-/:toggle-preview "$@" +} + +_gf() { + is_in_git_repo || return + git -c color.status=always status --short | + fzf-down -m --ansi --nth 2..,.. \ + --preview '(git diff --color=always -- {-1} | sed 1,4d; cat {-1})' | + cut -c4- | sed 's/.* -> //' +} + +_gb() { + is_in_git_repo || return + git branch -a --color=always | grep -v '/HEAD\s' | sort | + fzf-down --ansi --multi --tac --preview-window right:70% \ + --preview 'git log --oneline --graph --date=short --color=always --pretty="format:%C(auto)%cd %h%d %s" $(sed s/^..// <<< {} | cut -d" " -f1)' | + sed 's/^..//' | cut -d' ' -f1 | + sed 's#^remotes/##' +} + +_gt() { + is_in_git_repo || return + git tag --sort -version:refname | + fzf-down --multi --preview-window right:70% \ + --preview 'git show --color=always {}' +} + +_gh() { + is_in_git_repo || return + git log --date=short --format="%C(green)%C(bold)%cd %C(auto)%h%d %s (%an)" --graph --color=always | + fzf-down --ansi --no-sort --reverse --multi --bind 'ctrl-s:toggle-sort' \ + --header 'Press CTRL-S to toggle sort' \ + --preview 'grep -o "[a-f0-9]\{7,\}" <<< {} | xargs git show --color=always' | + grep -o "[a-f0-9]\{7,\}" +} + +_gr() { + is_in_git_repo || return + git remote -v | awk '{print $1 "\t" $2}' | uniq | + fzf-down --tac \ + --preview 'git log --oneline --graph --date=short --pretty="format:%C(auto)%cd %h%d %s" {1}' | + cut -d$'\t' -f1 +} + +_gs() { + is_in_git_repo || return + git stash list | fzf-down --reverse -d: --preview 'git show --color=always {1}' | + cut -d: -f1 +} diff --git a/baseline/.tmux.conf b/baseline/.tmux.conf index 2c4ab08..ac22398 100644 --- a/baseline/.tmux.conf +++ b/baseline/.tmux.conf @@ -1,4 +1,4 @@ -set -g default-terminal "tmux-256color" +set -g default-terminal "screen-256color" set-option -g prefix C-a #key bindings @@ -21,6 +21,7 @@ bind -T copy-mode-vi 'y' send -X copy-selection-and-cancel #bind -T copy-mode-vi 'V' rectangle-toggle bind ] paste-buffer bind Space choose-buffer +bind -n C-h clear-history #move windows bind-key -n C-S-Left swap-window -t -1 diff --git a/irssi/config b/irssi/config index cfb392d..bcb68b0 100644 --- a/irssi/config +++ b/irssi/config @@ -1,118 +1,37 @@ servers = ( - { address = "irc.dal.net"; chatnet = "DALnet"; port = "6667"; }, - { address = "irc.efnet.org"; chatnet = "EFNet"; port = "6667"; }, - { address = "irc.esper.net"; chatnet = "EsperNet"; port = "6667"; }, - { - address = "chat.freenode.net"; - chatnet = "Freenode"; - port = "6667"; - }, { - address = "irc.gamesurge.net"; - chatnet = "GameSurge"; - port = "6667"; + address = "irc.gitter.im"; + chatnet = "gitter"; + port = "6697"; + password = ""; + use_tls = "yes"; + tls_verify = "yes"; + autoconnect = "yes"; }, - { address = "eu.irc6.net"; chatnet = "IRCnet"; port = "6667"; }, - { address = "open.ircnet.net"; chatnet = "IRCnet"; port = "6667"; }, { - address = "irc.ircsource.net"; - chatnet = "IRCSource"; - port = "6667"; - }, - { address = "irc.netfuze.net"; chatnet = "NetFuze"; port = "6667"; }, - { address = "irc.oftc.net"; chatnet = "OFTC"; port = "6667"; }, - { - address = "irc.quakenet.org"; - chatnet = "QuakeNet"; + address = "terminaldweller.com"; + chatnet = "FRRouting.slack.com"; port = "6667"; - }, - { address = "irc.rizon.net"; chatnet = "Rizon"; port = "6667"; }, - { address = "silc.silcnet.org"; chatnet = "SILC"; port = "706"; } + password = ""; + use_tls = "no"; + tls_verify = "no"; + autoconnect = "yes"; + } ); chatnets = { - DALnet = { - type = "IRC"; - max_kicks = "4"; - max_msgs = "20"; - max_whois = "30"; - }; - EFNet = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "4"; - max_whois = "1"; - }; - EsperNet = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "4"; - max_whois = "1"; - }; - Freenode = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "4"; - max_whois = "1"; - }; - GameSurge = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "1"; - max_whois = "1"; - }; - IRCnet = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "1"; - max_whois = "1"; - }; - IRCSource = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "4"; - max_whois = "1"; - }; - NetFuze = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "1"; - max_whois = "1"; - }; + libera = { type = "IRC"; nick = "terminaldweller"; }; OFTC = { type = "IRC"; max_kicks = "1"; max_msgs = "1"; max_whois = "1"; }; - QuakeNet = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "1"; - max_whois = "1"; - }; - Rizon = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "1"; - max_whois = "1"; - }; - SILC = { type = "SILC"; }; - Undernet = { - type = "IRC"; - max_kicks = "1"; - max_msgs = "1"; - max_whois = "1"; - }; + gitter = { type = "IRC"; nick = "terminaldweller"; }; + "app.slack.com" = { type = "IRC"; nick = "terminaldweller"; }; + "FRRRouting.slack.com" = { type = "IRC"; }; + "FRRouting.slack.com" = { type = "IRC"; }; }; channels = ( - { name = "#lobby"; chatnet = "EsperNet"; autojoin = "No"; }, - { name = "#freenode"; chatnet = "Freenode"; autojoin = "No"; }, - { name = "#irssi"; chatnet = "Freenode"; autojoin = "No"; }, - { name = "#gamesurge"; chatnet = "GameSurge"; autojoin = "No"; }, - { name = "#irssi"; chatnet = "IRCNet"; autojoin = "No"; }, - { name = "#ircsource"; chatnet = "IRCSource"; autojoin = "No"; }, - { name = "#netfuze"; chatnet = "NetFuze"; autojoin = "No"; }, - { name = "#oftc"; chatnet = "OFTC"; autojoin = "No"; }, - { name = "silc"; chatnet = "SILC"; autojoin = "No"; }, { name = "#go-nuts"; chatnet = "freenode"; autojoin = "yes"; }, - { name = "#docker"; chatnet = "freenode"; autojoin = "yes"; } + { name = "#docker"; chatnet = "freenode"; autojoin = "yes"; }, + { name = "#dpdk"; chatnet = "libera"; autojoin = "yes"; } ); aliases = { @@ -404,8 +323,8 @@ settings = { core = { real_name = ""; user_name = "devi"; - nick = "bloodstalker"; - use_proxy = "yes"; + nick = "terminaldweller"; + use_proxy = "no"; proxy_address = "192.168.1.108"; proxy_port = "3128"; proxy_string = "CONNECT %s:%d HTTP/1.0\012\012"; @@ -444,6 +363,6 @@ ignores = ( { 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 = ( "#alacritty" ); }, - { level = "JOINS PARTS QUITS NICKS"; channels = ( "#osm" ); } + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#osm" ); }, + { level = "JOINS PARTS QUITS NICKS"; channels = ( "#alacritty" ); } ); diff --git a/irssi/solarized-powerline.theme b/irssi/solarized-powerline.theme index c214262..4bb8d6e 100644 --- a/irssi/solarized-powerline.theme +++ b/irssi/solarized-powerline.theme @@ -89,8 +89,10 @@ abstracts = { # nick is printed nick = "%Zeeeeee{nickcolor $*}"; mynick = "%Zeeeeee{nickcolor $*}"; - inick = "%Zeeeeee{nickcolor $*}"; # Inverted - imynick = "%Zeeeeee{nickcolor $*}"; # Inverted + inick = "%Zeeeeee{nickcolor $*}"; + # Inverted + imynick = "%Zeeeeee{nickcolor $*}"; + # Inverted # nick host is printed # (that's the "email" address of a user) @@ -363,57 +365,71 @@ abstracts = { formats = { "fe-common/core" = { - daychange = " %g-----%k-%W-%n Day changed to %%D %W-%k-%g-----%n"; - join = "%k%z00af5fJOIN %8 {ichannelhilight $2} %0%Z00d700%0 {inick $0}%0 %N%8%n%k%N {chanhost_hilight $1}"; - line_start_irssi = "%k%zff0000IRSSI%N%Zff0000 %N"; - new_topic = "%k%z00d700TOPIC %8 {ichannelhilight $1} by {inick $0}%8 $2"; - nick_changed = "%k%z00d700RENAME %Z00d700%0 {nick $0} %Zff8700 {nick $1} %N%8%n%k%N"; - part = "%k%z00d700PART %8 {ichannelhilight $2}%N %0%Z005f87 %N{inick $0}%0 %k%Zeeeeee {reason $3}"; - quit = "%0%Z005f00%k%z005f00QUIT %N {inick $0}%0 %Zeeeeee %N%n%k%N {reason $2}"; + daychange = " %g-----%k-%W-%n Day changed to %%D %W-%k-%g-----%n"; + join = "%k%z00af5fJOIN %8 {ichannelhilight $2} %0%Z00d700%0 {inick $0}%0 %N%8%n%k%N {chanhost_hilight $1}"; + line_start_irssi = "%k%zff0000IRSSI%N%Zff0000 %N"; + new_topic = "%k%z00d700TOPIC %8 {ichannelhilight $1} by {inick $0}%8 $2"; + nick_changed = "%k%z00d700RENAME %Z00d700%0 {nick $0} %Zff8700 {nick $1} %N%8%n%k%N"; + part = "%k%z00d700PART %8 {ichannelhilight $2}%N %0%Z005f87 %N{inick $0}%0 %k%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 {mynick $0} %Zff8700 {mynick $1} %N%8%n%k%N"; + own_msg = "{ownmsgnick $nickalign$2 {ownnick $nickcolor$0$nicktrunc}}$1"; + own_msg_channel = "{ownmsgnick $nickalign$3 {ownnick $nickcolor$0$nicktrunc}{msgchannel $1}}$2"; + own_msg_private_query = "{ownprivmsgnick $nickalign{ownprivnick $nickcolor$2$nicktrunc}}$1"; + pubmsg_me = "{pubmsgmenick $nickalign$2 {menick $0$nicktrunc}}$1"; + pubmsg_me_channel = "{pubmsgmenick $nickalign$3 {menick $0$nicktrunc}{msgchannel $1}}$2"; + pubmsg_hilight = "{pubmsghinick $0 $nickalign$3 $1$nicktrunc}$2"; + pubmsg_hilight_channel = "{pubmsghinick $0 $nickalign$4 $1$nicktrunc{msgchannel $2}}$3"; + pubmsg = "{pubmsgnick $nickalign$2 {pubnick $nickcolor$0$nicktrunc}}$1"; + pubmsg_channel = "{pubmsgnick $nickalign$3 {pubnick $nickcolor$0$nicktrunc}{msgchannel $1}}$2"; + msg_private_query = "{privmsgnick $nickalign$nickcolor$0$nicktrunc}$2"; }; "fe-common/irc" = { - away = "%k%z00d700AWAY %N%k%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}"; - channel_created = "%k%N Channel {channelhilight $0} created $1"; - channel_mode = "%k%N mode/{channelhilight $0} {mode $1}"; - ctcp_default_reply = "%W%0%N $0- "; - ctcp_ping_reply = "%k%z005f87 CTCP {hilight PING} reply %n%Z005f87%N {nick $0} %y%N%n $1.$[-3.0]2 seconds "; - ctcp_reply = "%k%z005f87 CTCP {hilight $0} reply %n%Z005f87%N {nick $1} %y%N $2 "; - ctcp_reply_channel = "%k%z005f87 CTCP {hilight $0} reply %n%Z005f87%N {nick $1} %y%N {channel $3} %y%N $2"; - ctcp_requested = "%k%z005f87%8%8 CTCP {hilight $2} from {mynick $4} %n%Z005f87%N by {hilight $0} {comment $1} %y%N $3"; - default_event = "%N%k %N%n$1"; + away = "%k%z00d700AWAY %N%k%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}"; + channel_created = "%k%N Channel {channelhilight $0} created $1"; + channel_mode = "%k%N mode/{channelhilight $0} {mode $1}"; + ctcp_default_reply = "%W%0%N $0- "; + ctcp_ping_reply = "%k%z005f87 CTCP {hilight PING} reply %n%Z005f87%N {nick $0} %y%N%n $1.$[-3.0]2 seconds "; + ctcp_reply = "%k%z005f87 CTCP {hilight $0} reply %n%Z005f87%N {nick $1} %y%N $2 "; + ctcp_reply_channel = "%k%z005f87 CTCP {hilight $0} reply %n%Z005f87%N {nick $1} %y%N {channel $3} %y%N $2"; + ctcp_requested = "%k%z005f87%8%8 CTCP {hilight $2} from {mynick $4} %n%Z005f87%N by {hilight $0} {comment $1} %y%N $3"; + default_event = "%N%k %N%n$1"; default_event_server = "%k%z00d700$0 %N%k %N%n$1"; - ebanlist = "%p%z00d700BANS %k exception %8 {ichannelhilight $0} %N%8%n%k%N {ban $1}"; - ebanlist_long = "%p%z00d700BANS %k exception %8 {ichannelhilight $0} {comment by {inick $2}%0%k, $3 secs ago} %N%8%n%k%N {ban $1}"; - end_of_who = "%z00d700%kWHO %N%k%N END"; - end_of_whois = "%z00d700%kWHOIS %N%k%N END"; - end_of_whowas = "%z00d700%kWHOWAS %N%k%N END"; - netsplit = "%k%1%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2"; - netsplit_join = "%k%1 NETSPLIT %k%8%N Joins: $0"; - netsplit_join_more = "%k%1 NETSPLIT %k%8%N Joins: $0 (+$1 more)"; - netsplit_more = "%k%1%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2 (+$3 more, use /NETSPLIT to show all of them)"; - no_topic = "%k%N No topic set for {channelhilight $0}"; - own_ctcp = "%k%z005f87 CTCP {hilight $2-} {inick $0} %n%Z005f87%N"; + ebanlist = "%p%z00d700BANS %k exception %8 {ichannelhilight $0} %N%8%n%k%N {ban $1}"; + ebanlist_long = "%p%z00d700BANS %k exception %8 {ichannelhilight $0} {comment by {inick $2}%0%k, $3 secs ago} %N%8%n%k%N {ban $1}"; + end_of_who = "%z00d700%kWHO %N%k%N END"; + end_of_whois = "%z00d700%kWHOIS %N%k%N END"; + end_of_whowas = "%z00d700%kWHOWAS %N%k%N END"; + netsplit = "%k%1%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2"; + netsplit_join = "%k%1 NETSPLIT %k%8%N Joins: $0"; + netsplit_join_more = "%k%1 NETSPLIT %k%8%N Joins: $0 (+$1 more)"; + netsplit_more = "%k%1%8%8 NETSPLIT %k%0%8 {iserver $0} %z00d700%8 {iserver $1}%8 %N%8%n%k%N Quits: $2 (+$3 more, use /NETSPLIT to show all of them)"; + no_topic = "%k%N No topic set for {channelhilight $0}"; + own_ctcp = "%k%z005f87 CTCP {hilight $2-} {inick $0} %n%Z005f87%N"; server_chanmode_change = "%k%1 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"; - 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 %N%k%n {nick $0} {nickhost $1@$2}%:{whois ircname $3}"; - whowas = "%z00d700%kWHOWAS %N%k%n {nick $0} {nickhost $1@$2}%:{whois was $3}"; + 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"; + 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 %N%k%n {nick $0} {nickhost $1@$2}%:{whois ircname $3}"; + whowas = "%z00d700%kWHOWAS %N%k%n {nick $0} {nickhost $1@$2}%:{whois was $3}"; + own_action = "$nickalign{ownaction $0$nicktrunc}$1"; + action_private = "$nickalign{pvtaction $0$nicktrunc}$2"; + action_private_query = "$nickalign{pvtaction_query $0$nicktrunc}$2"; + action_public = "$nickalign{pubaction $0$nicktrunc}$1"; }; "Irssi::Script::adv_windowlist" = { - awl_display_header = ""; - awl_display_key = " %0$N $H$C$S %n"; - awl_display_key_active = "%9%W%Z008700%0%8 %zeeeeee$N $H$C$S%8 %0%8%8%9%n"; - awl_display_key_visible = "%Z005fff %m$N %k $H$C$S %8%8%n"; - awl_display_nokey = " %0$N %U$C%U %n"; - awl_display_nokey_active = "%k%z005f87 %k$N %k %U$C%U %8%8%n"; + awl_display_header = ""; + awl_display_key = " %0$N $H$C$S %n"; + awl_display_key_active = "%9%W%Z008700%0%8 %zeeeeee$N $H$C$S%8 %0%8%8%9%n"; + awl_display_key_visible = "%Z005fff %m$N %k $H$C$S %8%8%n"; + awl_display_nokey = " %0$N %U$C%U %n"; + awl_display_nokey_active = "%k%z005f87 %k$N %k %U$C%U %8%8%n"; awl_display_nokey_visible = "%k%z5f5fff %m$N %k %U$C%U %8%8%n"; - awl_separator = ""; + awl_separator = ""; }; }; diff --git a/irssi/startup b/irssi/startup index e18f450..c09f401 100644 --- a/irssi/startup +++ b/irssi/startup @@ -1,11 +1,11 @@ -/load proxy -/SET use_proxy ON -/SET proxy_address 192.168.1.108 -/SET proxy_port 3128 -/SET -clear proxy_string -/SET proxy_string_after conn %s %d -/EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n -/SET -clear proxy_password +/* /load proxy */ +/* /SET use_proxy ON */ +/* /SET proxy_address 192.168.1.108 */ +/* /SET proxy_port 3128 */ +/* /SET -clear proxy_string */ +/* /SET proxy_string_after conn %s %d */ +/* /EVAL SET proxy_string CONNECT %s:%d HTTP/1.0\n\n */ +/* /SET -clear proxy_password */ -/connect irc.freenode.net -/connect OFTC +/connect irc.oftc.net +/connect irc.libera.chat diff --git a/vim/install.sh b/vim/install.sh index 5114105..f8dd9a8 100755 --- a/vim/install.sh +++ b/vim/install.sh @@ -1,6 +1,6 @@ #!/usr/bin/env sh -VIM_VERSION=8.2.2536 +VIM_VERSION=8.2.2885 sudo apt remove --purge vim vim-runtime vim-gnome vim-tiny vim-gui-common sudo rm -rf /usr/local/share/vim /usr/bin/vim |