Add changes from sgen

This commit is contained in:
Austen Adler 2020-03-17 08:40:26 -04:00
parent 19971c6298
commit 12ea7ea83b
4 changed files with 27 additions and 19 deletions

View File

@ -43,6 +43,9 @@ set sort_alias = alias
set reverse_alias = yes set reverse_alias = yes
source $alias_file source $alias_file
# Pipe like a sane person
set pipe_decode = yes
# Sort reverse order # Sort reverse order
set sort_aux=reverse-date-received set sort_aux=reverse-date-received
set sort=threads set sort=threads
@ -59,6 +62,8 @@ auto_view text/html
# macro pager \cb <pipe-entry>'tr -d "\n" | w3m'<enter> 'Follow links in w3m' # macro pager \cb <pipe-entry>'tr -d "\n" | w3m'<enter> 'Follow links in w3m'
# macro pager \cb <pipe-entry>'w3m'<enter> 'Follow links in w3m' # macro pager \cb <pipe-entry>'w3m'<enter> 'Follow links in w3m'
# macro pager \cb <pipe-entry>'pandoc -f html -t markdown | vim -'<enter> 'Open as markdown' # macro pager \cb <pipe-entry>'pandoc -f html -t markdown | vim -'<enter> 'Open as markdown'
# macro pager P <pipe-entry>'docker run pandoc pandoc -f html -t markdown' 'Open as markdown'
macro pager P <pipe-entry>'cat >>/tmp/eeee' 'Open as markdown'
set wait_key = no set wait_key = no

View File

@ -1,7 +1,10 @@
export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games" export PATH="$HOME/.local/bin:/usr/local/sbin:/usr/local/bin:/usr/sbin:/usr/bin:/sbin:/bin:/usr/games:/usr/local/games"
export PATH="${HOME}/go/bin:${PATH}"
[[ -d "${HOME}/.local/bin" ]] && export PATH="${HOME}/.local/bin:${PATH}"
#prompt_cmd() { #prompt_cmd() {
# PS1="$(~/git/cesium/cesium --mode ps1 --rc "$?" --shell bash)" # PS1="$(~/git/cesium/cesium --mode ps1 --rc "$?" --shell bash)"
# unset CESIUM_LAST_COMMAND_TIME # unset CESIUM_LAST_COMMAND_TIME
#} #}
#trap 'export CESIUM_LAST_COMMAND_TIME="$(date +%s)"' DEBUG #trap 'export CESIUM_LAST_COMMAND_TIME="$(date +%s)"' DEBUG
#PROMPT_COMMAND=prompt_cmd #PROMPT_COMMAND=prompt_cmd
export EDITOR=kak

View File

@ -1,6 +1,8 @@
#zmodload zsh/zprof #zmodload zsh/zprof
echo -ne '[ ]\r' echo -ne '[ ]\r'
for CONFIG (~/.zsh/*.zsh) source "$CONFIG" for i in ~/.zsh/*.zsh; do
source "$i"
done
autoload -U compinit autoload -U compinit
compinit compinit
setopt always_to_end # When completing from the middle of a word, move the cursor to the end of the word setopt always_to_end # When completing from the middle of a word, move the cursor to the end of the word
@ -51,15 +53,14 @@ dsl() {
dedir() { dedir() {
# Try removing the directory if it's empty, fail silently if you can't # Try removing the directory if it's empty, fail silently if you can't
rmdir "$1" 2>/dev/null && return rmdir "$1" 2>/dev/null && return
# Make a uuid to avoid name conflicts # Avoid name conflicts
# Ex: dediring sage when sage/sage fails because sage/sage is moved to . # Ex: dediring sage when sage/sage fails because sage/sage is moved to .
# but since sage/ exists, it can't be moved # but since sage/ exists, it can't be moved
local name=$(uuidgen) local TMP_DIR="$(mktemp -d --tmpdir=.)"
# Move the directory to the uuid mv -n "$1" "$TMP_DIR" || return 1
mv -n "$1" "$name" || return 1
# Move all files, use (N) in case there is no * or .* matches # Move all files, use (N) in case there is no * or .* matches
mv -n "$name"/{.,}*(N) . || return 2 mv -n "$TMP_DIR/$1"/{.,}*(N) . || return 2
rmdir "$name" || return 3 rmdir "$TMP_DIR" || return 3
} }
# Run multitail on logs # Run multitail on logs
mt() { mt() {
@ -132,18 +133,18 @@ if test -f /etc/gentoo-release; then
# Sudo echo so we have immediate results on weather sudo worked # Sudo echo so we have immediate results on weather sudo worked
sudo echo "Args: $*" sudo echo "Args: $*"
# Beep, verbose, ask # Beep, verbose, ask
sudo emerge --autounmask-write -Ava $* sudo emerge --autounmask-write -Ava "$@"
tput bel tput bel
} }
if ex eix-sync; then if ex eix-sync; then
alias update="sudo eix-sync; tput bel" alias update="sudo eix-sync; tput bel"
elif eix emaint; then elif ex emaint; then
alias update="sudo emaint sync -A; tput bel" alias update="sudo emaint sync -A; tput bel"
fi fi
upgrade() { upgrade() {
# Sudo echo so we have immediate results on weather sudo worked # Sudo echo so we have immediate results on weather sudo worked
sudo echo "Args: $*" sudo echo "Args: $*"
sudo emerge --update --newuse --deep --verbose --tree --keep-going=y --verbose-conflicts --alert --ask --binpkg-respect-use=y --binpkg-changed-deps=y --backtrack=30 $* @world sudo emerge --update --newuse --deep --verbose --tree --keep-going=y --verbose-conflicts --alert --ask --binpkg-respect-use=y --binpkg-changed-deps=y --backtrack=30 "$@" @world
tput bel tput bel
} }
elif test -f /etc/lsb-release; then elif test -f /etc/lsb-release; then
@ -187,9 +188,9 @@ if ex sudo; then
fi fi
alias -g PA='2>&1 | paste' alias -g PA='2>&1 | paste'
if ex rsync; then if ex rsync; then
alias -g c='rsync --no-inc-recursive --partial -ha --info=progress2 "$@"' alias -g c='rsync --no-inc-recursive --partial-dir=.rsync-partial -ha --info=progress2 "$@"'
alias -g cfat='rsync --no-inc-recursive --partial -hrlc --info=progress2 "$@"' alias -g cfat='rsync --no-inc-recursive --partial-dir=.rsync-partial -hrlc --info=progress2 "$@"'
alias cp='rsync --no-inc-recursive --partial -ha --info=progress2 "$@"' alias cp='rsync --no-inc-recursive --partial-dir=.rsync-partial -ha --info=progress2 "$@"'
fi fi
alias -g nify=" > /dev/null 2>&1 &" alias -g nify=" > /dev/null 2>&1 &"
alias -g nifyd=" > /dev/null 2>&1 & disown" alias -g nifyd=" > /dev/null 2>&1 & disown"
@ -337,18 +338,17 @@ if [[ -f ~/.zsh-git/custom-config/zshrc ]]; then
fi fi
function prompt_pre() { function prompt_pre() {
export CESIUM_LAST_COMMAND_TIME="$(date +%s)" CESIUM_LAST_COMMAND_TIME="$(date +%s)"
} }
function prompt_cmd() { function prompt_cmd() {
PS1="$(cesium --mode ps1 --rc "$?" --shell zsh)" PS1="$(CESIUM_LAST_COMMAND_TIME="$CESIUM_LAST_COMMAND_TIME" RC=$? cesium --mode ps1 --shell zsh)"
RPS1="$(cesium --mode rps1 --rc "$?" --shell zsh)" RPS1="$(CESIUM_LAST_COMMAND_TIME="$CESIUM_LAST_COMMAND_TIME" RC=$? cesium --mode rps1 --shell zsh)"
unset CESIUM_LAST_COMMAND_TIME unset CESIUM_LAST_COMMAND_TIME
} }
autoload -Uz add-zsh-hook
precmd_functions+=(prompt_cmd) precmd_functions+=(prompt_cmd)
autoload -Uz add-zsh-hook
add-zsh-hook preexec prompt_pre add-zsh-hook preexec prompt_pre
#function prompt_pre() { #function prompt_pre() {
# CESIUM_LAST_COMMAND_TIME="$(date +%s)" # CESIUM_LAST_COMMAND_TIME="$(date +%s)"
#} #}

View File

@ -298,7 +298,7 @@ endif
"The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim "The amazing Flappy Bird game | https://github.com/mattn/flappyvird-vim
"Plug 'https://gitea.austenwares.com/vim/vim-gnupg' "Plug 'https://gitea.austenwares.com/vim/vim-gnupg'
"GPG support | https://github.com/jamessan/vim-gnupg "GPG support | https://github.com/jamessan/vim-gnupg
Plug 'https://gitea.austenwares.com/vim/vim-bracketed-paste' "Plug 'https://gitea.austenwares.com/vim/vim-bracketed-paste'
"Automatic :set paste funcationality | https://github.com/ConradIrwin/vim-bracketed-paste "Automatic :set paste funcationality | https://github.com/ConradIrwin/vim-bracketed-paste
"Plug 'https://gitea.austenwares.com/vim/HiCursorWords' "Plug 'https://gitea.austenwares.com/vim/HiCursorWords'
"Highlight word under cursor automatically | http://www.vim.org/scripts/script.php?script_id=4306 "Highlight word under cursor automatically | http://www.vim.org/scripts/script.php?script_id=4306