From a01da9fcfa49391481d99a299303e532e1c25e87 Mon Sep 17 00:00:00 2001 From: deadguy Date: Mon, 18 May 2020 06:42:32 -0300 Subject: [PATCH] majin go, majin go, majinga Z --- .config/bspwm/bspwmrc | 11 ++++---- .config/nvim/ftplugin/python.vim | 34 +++++++++++++++++----- .config/nvim/ftplugin/sh.vim | 9 ++---- .config/nvim/ftplugin/vimwiki.vim | 7 +++-- .config/nvim/init.vim | 5 ++-- .config/sxhkd/sxhkdrc | 9 ++++-- .config/zsh/.zprofile | 2 +- .config/zsh/.zshrc | 47 +++++++++++++------------------ .config/zsh/aliases.zsh | 7 ++--- .config/zsh/autocompletar.zsh | 2 +- .config/zsh/extras.zsh | 29 ------------------- .config/zsh/teclas.zsh | 6 ++-- .local/bin/grabar | 4 +-- .local/bin/lfview | 29 +++++++++---------- .local/bin/notas | 30 ++++++++------------ .local/sv/jack/run | 9 ------ .local/sv/lockscreen/run | 4 --- .xinitrc | 2 +- .zshenv | 30 +++++++++++--------- doc/xbpaketes | 22 +++++++++++---- 20 files changed, 136 insertions(+), 162 deletions(-) delete mode 100644 .config/zsh/extras.zsh delete mode 100755 .local/sv/jack/run delete mode 100755 .local/sv/lockscreen/run diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index ced252a..7ce5e7e 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -5,7 +5,7 @@ bspc rule -r "*" moni & -bspc config border_width 1 +bspc config border_width 1 bspc config window_gap 6 bspc config top_padding 0 bspc config left_padding 0 @@ -14,7 +14,7 @@ bspc config bottom_padding 0 bspc config split_ratio 0.50 # Opciones -bspc config gapless_monocle false +bspc config gapless_monocle true bspc config borderless_monocle false bspc config single_monocle true bspc config ignore_ewmh_focus true @@ -49,16 +49,15 @@ bspc rule -a mpv state=floating bspc rule -a obs state=floating bspc rule -a PdWindow state=floating bspc rule -a PatchWindow state=floating -bspc rule -a Alacritty:flota state=floating -bspc rule -a Sxiv:fontpreview state=floating +bspc rule -a Alacritty:flota state=floating +bspc rule -a Sxiv:fontpreview state=floating bspc rule -a Toplevel state=floating bspc rule -a Firefox state=floating bspc rule -a Display state=floating -bspc rule -a krita state=floating # Otros bspc rule -a Zathura state=tiled bspc rule -a Firefox:Navigator state=tiled, desktop='^2' -bspc rule -a Alacritty:multi desktop='^1' +bspc rule -a Alacritty:multi desktop='^1' stx & diff --git a/.config/nvim/ftplugin/python.vim b/.config/nvim/ftplugin/python.vim index b893d87..13f267d 100644 --- a/.config/nvim/ftplugin/python.vim +++ b/.config/nvim/ftplugin/python.vim @@ -1,14 +1,34 @@ -setlocal colorcolumn=79 +" Proper indentation for python files +set fileformat=unix +set softtabstop=4 " Pressing tab during editing operations inserts 4 spaces +set shiftwidth=4 " Number of spaces used for each step of an (auto)indent action, e.g. '>>'. +let python_highlight_all=1 " Enable python highlighting + +augroup PythonColorColumn +autocmd! + " When a Python file is read or the text changes in normal or insert mode, + " draw a column marking the maximum line length if a line exceeds this length + autocmd BufRead,TextChanged *.py call ShowColumnIfLineTooLong(80) +augroup END + +" Color the column marking the lengthLimit when the longest line in the file +" exceeds the lengthLimit +function! ShowColumnIfLineTooLong(lengthLimit) + " See https://stackoverflow.com/questions/2075276/longest-line-in-vim#2982789 + let maxLineLength = max(map(getline(1,'$'), 'len(v:val)')) + + if maxLineLength > a:lengthLimit + " Draw the vertical line at the first letter that exceeds the limit + execute "setlocal colorcolumn=" . (a:lengthLimit + 1) + else + setlocal colorcolumn="" + endif +endfunction augroup pystuff autocmd! autocmd BufNewFile *.py 0r ~/.config/nvim/templates/py.skeleton augroup END -nnoremap y :0,$!yapf -nnoremap i :!isort % -nnoremap = :ALEFix -nnoremap c I# - " Disable warnings about trailing whitespace for Python files. -let b:ale_warn_about_trailing_whitespace = 0 \ No newline at end of file +let b:ale_warn_about_trailing_whitespace = 0 diff --git a/.config/nvim/ftplugin/sh.vim b/.config/nvim/ftplugin/sh.vim index 550d165..d5a3898 100644 --- a/.config/nvim/ftplugin/sh.vim +++ b/.config/nvim/ftplugin/sh.vim @@ -1,8 +1,5 @@ -setl ts=4 -setl sts=4 -setl sw=4 -setl noet -setl tw=90 +setlocal shiftwidth=2 +setlocal expandtab if !exists("b:sh_indent_options") let b:sh_indent_options = {} @@ -10,4 +7,4 @@ endif let b:sh_indent_options['continuation-line'] = 4 -let b:ale_linters = ['shellcheck'] \ No newline at end of file +let b:ale_linters = ['shellcheck'] diff --git a/.config/nvim/ftplugin/vimwiki.vim b/.config/nvim/ftplugin/vimwiki.vim index e3ad7ba..0571a81 100644 --- a/.config/nvim/ftplugin/vimwiki.vim +++ b/.config/nvim/ftplugin/vimwiki.vim @@ -7,8 +7,9 @@ setlocal spell spelllang=es,en_us,cjk nnoremap :Vimwiki2HTML nnoremap :VimwikiMakeDiaryNote nnoremap :VimwikiDiaryGenerateLinks -nnoremap [S -nnoremap ]S +nnoremap [s +nnoremap ]s nnoremap z= -nnoremap zg +nnoremap z=1 +nnoremap zg inoremap u[s1z=`]au diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index d0c3b91..8f17514 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -2,7 +2,6 @@ scriptencoding utf-8 " Set utf-8 as default script encoding let g:loaded_python_provider=1 " Disable python 2 interface let g:python_host_skip_check=1 " Skip python 2 host check -let python_highlight_all=1 " full python syntax highlighting let g:python3_host_prog = '/bin/python3' let g:node_host_prog = '~/.local/share/npm/bin/neovim-node-host' let $GIT_EDITOR = 'nvr -cc split --remote-wait' @@ -14,6 +13,7 @@ if empty(glob('~/.local/share/nvim/site/autoload/plug.vim')) endif " }}} " Options {{{ +set path+=** " Full tab completion with subfolders and all set inccommand=nosplit " Live preview of substitutes and other similar commands set clipboard^=unnamedplus " system clipboard (requires +clipboard) set number " Line numbers on @@ -137,6 +137,7 @@ if !exists('autocommands_loaded') && has('autocmd') au InsertLeave * setlocal cursorline nopaste au InsertLeave,CompleteDone * if pumvisible() == 0 | pclose | endif au FocusLost,TabLeave * call PopOutOfInsertMode() + au WinLeave * setlocal nocursorline aug END aug skeletons @@ -284,7 +285,6 @@ nnoremap rn (coc-rename) "}}} " Wiki {{{ let g:vimwiki_list = [ - \{'path': '~/doc/chiptune', 'path_html': '~/doc/chiptune/web', 'template_path': '~/doc/chiptune/tpl', 'template_default': 'def', 'auto_toc': 1, 'auto_tags': 1, 'auto_export': 1}, \{'path': '~/doc/notas', 'auto_toc': 1, 'auto_tags': 1}, \{'path': '~/doc/blog', 'auto_toc': 1, 'auto_tags': 1, 'auto_diary_index': 1, 'diary_rel_path': '.', 'diary_index': 'blog', 'diary_header': 'Dailies' }] let g:vimwiki_valid_html_tags = 'b,i,s,u,sub,sup,kbd,br,hr,iframe,a' @@ -320,6 +320,7 @@ Plug 'jpalardy/vim-slime', {'for': ['python', 'foxdot']} Plug 'sheerun/vim-polyglot' Plug 'tmsvg/pear-tree' Plug 'tpope/vim-commentary' +Plug 'lambdalisue/gina.vim' Plug 'vimwiki/vimwiki', { 'branch': 'dev' } Plug 'srcery-colors/srcery-vim' call plug#end() diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc index 1392f6f..2ca14c6 100644 --- a/.config/sxhkd/sxhkdrc +++ b/.config/sxhkd/sxhkdrc @@ -36,8 +36,8 @@ super + {_,shift,ctrl} + u bspc node {@/ -B,@brother -B,@/ -E} # Run Applications -super + {b,q,m,s,v,n} - {$BROWSER,powermenu,monisel,dswitcher,pavucontrol,notas} +super + {b,q,m,s,v,n,p,t} + {$BROWSER,powermenu,monisel,dswitcher,pavucontrol,notas,pom,tutos} super + {a,x,i,z,c} alacritty {_,--class=flota,--class=flota -e connman-ncurses,--class=multi -e termux,class=flota -e neomutt +'inoremap :Snippets' +Mail +1bw +startinsert"} @@ -46,7 +46,10 @@ super + shift + x tmenux super + space - dmenu_run -p "Apps " + j4-dmenu-desktop --dmenu="dmenu -i -w 250" --no-generic + +super + r + dmenu_run -p "Run " super + {_,shift} + g {grabar,corte} diff --git a/.config/zsh/.zprofile b/.config/zsh/.zprofile index 501a663..4c55130 100644 --- a/.config/zsh/.zprofile +++ b/.config/zsh/.zprofile @@ -1 +1 @@ -[ -z $DISPLAY ] && [ "$(fgconsole)" -eq 1 ] && exec startx -- -keeptty -nolisten tcp \ No newline at end of file +[ -z $DISPLAY ] && [ "$(fgconsole)" -eq 1 ] && exec startx -- -keeptty -nolisten tcp diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 591adbe..5247461 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -27,9 +27,16 @@ setopt NOTIFY # Report status of background jobs immediately. unsetopt BG_NICE # Don't run all background jobs at a lower priority. unsetopt HUP # Don't kill jobs on shell exit. unsetopt CHECK_JOBS # Don't report on jobs when shell exit. +setopt AUTO_CD # Auto changes to a directory without typing cd. +setopt AUTO_PUSHD # Push the old directory onto the stack on cd. +setopt PUSHD_IGNORE_DUPS # Do not store duplicates in the stack. +setopt PUSHD_SILENT # Do not print the directory stack after pushd or popd. +setopt PUSHD_TO_HOME # Push to home directory when no argument is given. +setopt CDABLE_VARS # Change directory to a path stored in a variable. +setopt MULTIOS # Write to multiple descriptors. # }}} # Historial {{{ -export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help:* --version:* -v:man *:up:rtv *" +export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help:* --version:* -v:man *:up:tuir *" HISTFILE="$ZDOTDIR/histfile" HISTSIZE=10000 SAVEHIST=10000 @@ -45,49 +52,33 @@ setopt HIST_SAVE_NO_DUPS # Do not write a duplicate event to the history setopt HIST_VERIFY # Do not execute immediately upon history expansion. setopt HIST_BEEP # Beep when accessing non-existent history. # }}} -# Directorios {{{ -setopt AUTO_CD # Auto changes to a directory without typing cd. -setopt AUTO_PUSHD # Push the old directory onto the stack on cd. -setopt PUSHD_IGNORE_DUPS # Do not store duplicates in the stack. -setopt PUSHD_SILENT # Do not print the directory stack after pushd or popd. -setopt PUSHD_TO_HOME # Push to home directory when no argument is given. -setopt CDABLE_VARS # Change directory to a path stored in a variable. -setopt MULTIOS # Write to multiple descriptors. -setopt EXTENDED_GLOB # Use extended globbing syntax. -#}}} # Plugins y extras {{{ foreach programa ( - fzf/completion.zsh - fzf/key-bindings.zsh + doc/fzf/completion.zsh + doc/fzf/key-bindings.zsh + zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh ) { - source /usr/share/doc/$programa + source /usr/share/$programa } foreach extra ( - teclas.zsh - aliases.zsh - up.plugin.zsh lf-icons.zsh - zsh-autopair/autopair.zsh - zsh-system-clipboard/zsh-system-clipboard.zsh + teclas.zsh + up.plugin.zsh + zsh-autopair/autopair.plugin.zsh + zsh-system-clipboard/zsh-system-clipboard.plugin.zsh git-extras-completion.zsh autocompletar.zsh + aliases.zsh + zsh-history-substring-search/zsh-history-substring-search.plugin.zsh ) { source $ZDOTDIR/$extra } - typeset -g ZSH_SYSTEM_CLIPBOARD_TMUX_SUPPORT='true' - -source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh -source $ZDOTDIR/zsh-history-substring-search/zsh-history-substring-search.zsh source $XDG_DATA_HOME/lscolors.sh # }}} # Prompt {{{ -autoload -Uz promptinit && promptinit - function precmd() { - # Print a newline before the prompt, unless it's the - # first prompt in the process. if [ -z "$NEW_LINE_BEFORE_PROMPT" ]; then NEW_LINE_BEFORE_PROMPT=1 elif [ "$NEW_LINE_BEFORE_PROMPT" -eq 1 ]; then @@ -95,7 +86,7 @@ function precmd() { fi } -PS1="%(?..%{%F{red}%}(%?%)%{%f%} )%{%F{blue}%}%~ %{%f%}%# " +PS1="%(?..%{%F{red}%}(%?%)%{%f%} )%{%F{blue}%}%2~ %{%f%}%(!:#:) " function zle-keymap-select { if [[ ${KEYMAP} == vicmd ]] || diff --git a/.config/zsh/aliases.zsh b/.config/zsh/aliases.zsh index 0c1141e..e1be98c 100644 --- a/.config/zsh/aliases.zsh +++ b/.config/zsh/aliases.zsh @@ -6,6 +6,7 @@ alias \ m='neomutt' \ am='alsamixer' \ pm='pulsemixer' \ + nb='newsboat' \ v='$EDITOR' \ play='ncmpcpp' \ torr='tremc' \ @@ -97,6 +98,7 @@ alias \ dd='dd status=progress' \ dirs='dirs -v -p' \ dfc='dfc -dmT' \ + strim='mpv --jack-port="OBS Jack Input"' # Comandos alias \ @@ -111,8 +113,3 @@ alias \ rat='tar -xvJf' \ um='udevil mount' \ uu='udevil umount' - -# Directorios -alias \ - gb='cd ~/.local/bin' \ - g.='cd ~/.config' \ No newline at end of file diff --git a/.config/zsh/autocompletar.zsh b/.config/zsh/autocompletar.zsh index c52576d..a20de91 100644 --- a/.config/zsh/autocompletar.zsh +++ b/.config/zsh/autocompletar.zsh @@ -1,5 +1,5 @@ # Add zsh-completions to $fpath. -fpath=("${0:h}/zsh-completions/src" $fpath) +fpath=("${0:h}/usr/share/zsh/site-functions" $fpath) setopt COMPLETE_IN_WORD # Complete from both ends of a word. setopt ALWAYS_TO_END # Move cursor to the end of a completed word. diff --git a/.config/zsh/extras.zsh b/.config/zsh/extras.zsh deleted file mode 100644 index d2c28c1..0000000 --- a/.config/zsh/extras.zsh +++ /dev/null @@ -1,29 +0,0 @@ -# -*- mode: shell-script -*- -# vim:ft=zsh -# Completion Dots {{{ -# if you want red dots to be displayed while waiting for completion -COMPLETION_WAITING_DOTS="true" -if [[ $COMPLETION_WAITING_DOTS = true ]]; then - expand-or-complete-with-dots() { - # toggle line-wrapping off and back on again - [[ -n "$terminfo[rmam]" && -n "$terminfo[smam]" ]] && echoti rmam - print -Pn "%{%F{red}......%f%}" - [[ -n "$terminfo[rmam]" && -n "$terminfo[smam]" ]] && echoti smam - - zle expand-or-complete - zle redisplay - } - zle -N expand-or-complete-with-dots - bindkey "^I" expand-or-complete-with-dots -fi -# }}} -# FZF {{{ -_fzf_compgen_path() { - fd --hidden --follow --exclude ".git" . "$1" -} - -_fzf_compgen_dir() { - fd --type d --hidden --follow --exclude ".git" . "$1" -} -#}}} -# vim:foldmethod=marker:foldlevel=0 diff --git a/.config/zsh/teclas.zsh b/.config/zsh/teclas.zsh index 8f53f5c..af62a0d 100644 --- a/.config/zsh/teclas.zsh +++ b/.config/zsh/teclas.zsh @@ -54,13 +54,13 @@ key[PageDown]="$terminfo[knp]" # General use {{{ bindkey "^L" tmux-clear-screen bindkey '^X' run-with-sudo -bindkey '^U' backward-kill-line +# bindkey '^U' backward-kill-line # }}} # Insert {{{ bindkey -M viins '^K' up-history # ^K to previous command. bindkey -M viins '^J' down-history # ^J to next command. bindkey -M viins '^F' vi-forward-char # Go forward char or complete current completion. -bindkey -M viins '^B' backward-kill-word # Delete a WORD backward. +# bindkey -M viins '^B' backward-kill-word # Delete a WORD backward. bindkey -M viins '^Y' redo bindkey -M viins '^P' up-line-or-beginning-search bindkey -M viins '^N' down-line-or-beginning-search @@ -71,7 +71,7 @@ bindkey -M viins '^[[B' history-substring-search-down [[ -n "$key[Home]" ]] && bindkey -M viins -- "$key[Home]" beginning-of-line [[ -n "$key[End]" ]] && bindkey -M viins -- "$key[End]" end-of-line [[ -n "$key[Insert]" ]] && bindkey -M viins -- "$key[Insert]" overwrite-mode -[[ -n "$key[Backspace]" ]] && bindkey -M viins -- "$key[Backspace]" backward-delete-char +# [[ -n "$key[Backspace]" ]] && bindkey -M viins -- "$key[Backspace]" backward-delete-char [[ -n "$key[Delete]" ]] && bindkey -M viins -- "$key[Delete]" delete-char [[ -n "$key[Right]" ]] && bindkey -M viins -- "$key[Right]" forward-char [[ -n "$key[PageUp]" ]] && bindkey -M viins -- "$key[PageUp]" history-beginning-search-backward diff --git a/.local/bin/grabar b/.local/bin/grabar index 91e3f3d..f146f26 100755 --- a/.local/bin/grabar +++ b/.local/bin/grabar @@ -79,7 +79,7 @@ audio() { \ } askrecording() { \ - choice=$(printf "screencast\\nvideo\\naudio\\njack video\\njack audio" | dmenu -i -p "Select recording style ") + choice=$(printf "screencast\\nvideo\\naudio\\njack video\\njack audio" | dmenu -i -w 200 -p "Record ") case "$choice" in screencast) screencast;; video) mute;; @@ -90,7 +90,7 @@ askrecording() { \ } asktoend() { \ - response=$(printf "No\\nYes" | dmenu -i -p "Recording still active. End recording? ") && + response=$(printf "No\\nYes" | dmenu -i -w 300 -p "End recording? ") && [ "$response" = "Yes" ] && killrecording } diff --git a/.local/bin/lfview b/.local/bin/lfview index d8d3be4..4b13bd6 100755 --- a/.local/bin/lfview +++ b/.local/bin/lfview @@ -68,28 +68,28 @@ handle_extension() { jq --color-output . "${FILE_PATH}" && exit 5 python -m json.tool -- "${FILE_PATH}" && exit 5 ;; - conf) bat "${FILE_PATH}" && exit 0 ;; + conf) bat "${FILE_PATH}" && exit 0 ;; esac } handle_mime() { local mimetype="${1}" case "${mimetype}" in - text/html) lynx -dump "${FILE_PATH}" ;; + text/html) lynx -dump "${FILE_PATH}" ;; text/troff) man ./ "${FILE_PATH}" | col -b ;; text/* | */xml) - # Syntax highlight - if [ "$( stat --printf='%s' -- "${FILE_PATH}" )" -gt "${HIGHLIGHT_SIZE_MAX}" ]; then - exit 2 - fi - if [ "$( tput colors )" -ge 256 ]; then - local highlight_format='xterm256' - else - local highlight_format='ansi' - fi - highlight --replace-tabs="${HIGHLIGHT_TABWIDTH}" --out-format="${highlight_format}" \ - --style="${HIGHLIGHT_STYLE}" --force -- "${FILE_PATH}" - exit 2;; + # Syntax highlight + if [ "$( stat --printf='%s' -- "${FILE_PATH}" )" -gt "${HIGHLIGHT_SIZE_MAX}" ]; then + exit 2 + fi + if [ "$( tput colors )" -ge 256 ]; then + local highlight_format='xterm256' + else + local highlight_format='ansi' + fi + highlight --replace-tabs="${HIGHLIGHT_TABWIDTH}" --out-format="${highlight_format}" \ + --style="${HIGHLIGHT_STYLE}" --force -- "${FILE_PATH}" + exit 2;; application/zip) atool --list -- "${FILE_PATH}" ;; image/*) mediainfo "${FILE_PATH}" || exit 1;; video/* | audio/*|application/octet-stream) mediainfo "${FILE_PATH}" || exit 1;; @@ -102,7 +102,6 @@ handle_fallback() { exit 1 } - MIMETYPE="$( file --dereference --brief --mime-type -- "${FILE_PATH}" )" handle_extension handle_mime "${MIMETYPE}" diff --git a/.local/bin/notas b/.local/bin/notas index 030915e..5d51068 100755 --- a/.local/bin/notas +++ b/.local/bin/notas @@ -4,25 +4,19 @@ set -euf -o pipefail MAINDIR="$HOME/doc/" NOTAS="notas" DIARIO="blog" -CHIP="chiptune" - -DIRS=("$NOTAS" "$DIARIO" "$CHIP") +DIRS=("$NOTAS" "$DIARIO") SELPATH="$(printf '%s\n' "${DIRS[@]}" | dmenu -w 250 -p "Wiki ")" -wiki () { - cd "$MAINDIR/$SELPATH" - if command -v fd >/dev/null 2>&1; then - sel=$(fd -d 1 -e wiki | dmenu -w 250 -p "Blog ") - else - sel=$(find . -maxdepth 1 -type f -printf '%P\n' | sort -M | dmenu -w 250 -p "File ") - fi +cd "$MAINDIR/$SELPATH" +if command -v fd >/dev/null 2>&1; then + SEL=$(fd -d 1 -e wiki | dmenu -w 250 -p "File ") +else + SEL=$(find . -maxdepth 1 -type f -printf '%P\n' | sort -M | dmenu -w 250 -p "File ") +fi - if [[ $sel == "" ]]; then - exit 0 - else - alacritty --class=flota -e nvim "$sel" - fi -} - -wiki +if [[ $SEL == "" ]]; then + exit 0 +else + alacritty --class=flota -e nvim "$SEL" +fi diff --git a/.local/sv/jack/run b/.local/sv/jack/run deleted file mode 100755 index c6712b0..0000000 --- a/.local/sv/jack/run +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -jack_control start -jack_control ds alsa -jack_control dps device hw:PCH,0 -jack_control dps rate 44100 -jack_control dps nperiods 2 -jack_control dps period 1024 -sleep 10 diff --git a/.local/sv/lockscreen/run b/.local/sv/lockscreen/run deleted file mode 100755 index 0d3c73d..0000000 --- a/.local/sv/lockscreen/run +++ /dev/null @@ -1,4 +0,0 @@ -#!/bin/sh - -exec xcompmgr - diff --git a/.xinitrc b/.xinitrc index 861e133..fa26898 100644 --- a/.xinitrc +++ b/.xinitrc @@ -1,5 +1,4 @@ #!/bin/sh - [ -d /etc/X11/xinit/xinitrc.d ] && \ for f in /etc/X11/xinit/xinitrc.d/*; do [ -x "$f" ] && . "$f"; done && unset f @@ -7,6 +6,7 @@ xrdb -merge "$XDG_CONFIG_HOME"/X11/xresources setxkbmap -option caps:escape xsetroot -cursor_name left_ptr & randbg & +xcompmgr & equiset & xss-lock -l -- exeflock4 & diff --git a/.zshenv b/.zshenv index c8ad54a..2c26f7b 100644 --- a/.zshenv +++ b/.zshenv @@ -1,6 +1,19 @@ # Programas y Opciones del Sistema {{{ +if [ -n "$NVIM_LISTEN_ADDRESS" ]; then + export EDITOR="nvr -cc tabedit --remote-wait +'set bufhidden=wipe'" +else + export EDITOR="nvim" +fi + +if test -z "${XDG_RUNTIME_DIR}"; then + export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir + if ! test -d "${XDG_RUNTIME_DIR}"; then + mkdir "${XDG_RUNTIME_DIR}" + chmod 0700 "${XDG_RUNTIME_DIR}" + fi +fi + export TERMINAL="alacritty" -export EDITOR="nvim" export VISUAL="$EDITOR" export GIT_EDITOR="$EDITOR" export BROWSER="firefox" @@ -24,15 +37,7 @@ export BAT_THEME="TwoDark" export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" export QT_QPA_PLATFORMTHEME="qt5ct" -if test -z "${XDG_RUNTIME_DIR}"; then - export XDG_RUNTIME_DIR=/tmp/${UID}-runtime-dir - if ! test -d "${XDG_RUNTIME_DIR}"; then - mkdir "${XDG_RUNTIME_DIR}" - chmod 0700 "${XDG_RUNTIME_DIR}" - fi -fi - - export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" +export XAUTHORITY="$XDG_RUNTIME_DIR/Xauthority" export XDG_DATA_HOME="$HOME/.local/share" export XDG_CONFIG_HOME="$HOME/.config" export XDG_CACHE_HOME="$HOME/.cache" @@ -44,6 +49,7 @@ export SSH_ASKPASS="/bin/gnome-ssh-askpass" export PASSWORD_STORE_DIR="$XDG_DATA_HOME/pass" eval $(keychain --dir ~/.local/share/keychain --quiet --eval --noask --agents ssh,gpg id_rsa) +# export MAILCAPS="$XDG_DATA_HOME/mailcap" export NOTMUCH_CONFIG="$XDG_CONFIG_HOME/notmuch-config" export INPUTRC="$XDG_CONFIG_HOME/inputrc" export WGETRC="$XDG_CONFIG_HOME/wget/wgetrc" @@ -52,7 +58,6 @@ export JUPYTER_CONFIG_DIR="$XDG_CONFIG_HOME/jupyter" export WEECHAT_HOME="$XDG_CONFIG_HOME/weechat" export NPM_CONFIG_USERCONFIG="$XDG_CONFIG_HOME/npm/npmrc" export PYLINTHOME="$XDG_CACHE_HOME/pylint" -export MAILCAPS="$XDG_DATA_HOME/mailcap" export NODE_REPL_HISTORY="$XDG_DATA_HOME/node_repl_history" export RANDFILE="$XDG_DATA_HOME/rnd" export _JAVA_OPTIONS=-Djava.util.prefs.userRoot="$XDG_CONFIG_HOME/java" @@ -87,11 +92,10 @@ export LESS_TERMCAP_se="$(printf '%b' '')" export LESS_TERMCAP_us="$(printf '%b' '')" export LESS_TERMCAP_ue="$(printf '%b' '')" export LESSOPEN="| /usr/bin/highlight -O ansi %s 2>/dev/null" - export LESSHISTFILE="-" # }}} # Path {{{ typeset -U PATH path -path=(~/.local/bin ~/.config/yarn/bin ~/.local/share/npm/bin /opt/texlive/2020/bin/x86_64-linux $path[@]) +path=(~/.local/bin ~/.config/yarn/bin ~/.local/share/npm/bin $path[@]) # }}} # vim:foldmethod=marker:foldlevel=0 diff --git a/doc/xbpaketes b/doc/xbpaketes index 078550f..52b5838 100644 --- a/doc/xbpaketes +++ b/doc/xbpaketes @@ -1,4 +1,5 @@ -ImageMagick-7.0.10.9_1 +ImageMagick-7.0.10.11_1 +adwaita-qt-1.1.1_1 alacritty-0.4.2_3 alsa-firmware-1.2.1_1 alsa-plugins-1.2.2_1 @@ -13,7 +14,6 @@ audacity-2.3.3_1 autopep8-1.5.2_1 base-system-0.113_2 bat-0.15.0_1 -broot-0.13.4_1 bspwm-0.9.9_2 cadence-0.9.1_1 chrony-3.5_2 @@ -24,6 +24,7 @@ ctags-5.8_7 delta-0.0.17_1 dfc-3.1.1_1 dunst-1.4.1_1 +faac-1.30_1 fd-8.0.0_1 ffmpeg-4.2.2_3 figlet-2.2.5_6 @@ -45,7 +46,8 @@ hsetroot-1.0.5_1 htop-2.2.0_1 hub-2.14.2_1 i3lock-color-2.12_2 -intel-ucode-20191115_2 +intel-ucode-20200508_1 +isync-1.3.1_2 jq-1.6_1 keychain-2.8.5_1 krita-4.2.9_2 @@ -54,7 +56,7 @@ libX11-devel-1.6.9_1 libXft-devel-2.3.3_1 libXinerama-devel-1.1.4_1 librsvg-2.47.1_1 -linux5.6-5.6.11_1 +linux5.6-5.6.13_1 lynx-2.8.9.1_3 maim-5.6.3_1 mdadm-4.1_2 @@ -65,17 +67,21 @@ mpc-0.33_1 mpd-0.21.23_1 mps-youtube-0.2.8_3 mpv-0.32.0_2 +msmtp-1.8.10_1 ncmpcpp-0.8.2_9 ncurses-term-6.2_1 +neomutt-20200501_1 neovim-0.4.3_1 neovim-remote-2.4.0_1 +newsboat-2.19_1 nfs-utils-2.4.3_2 nmap-7.80_2 -nodejs-13.2.0_1 +nodejs-13.2.0_2 noto-fonts-cjk-20190416_1 noto-fonts-ttf-20190926_1 obs-25.0.7_1 p7zip-16.02_5 +pass-1.7.3_2 patch-2.7.6_4 pavucontrol-4.0_1 pd-0.50.2_1 @@ -98,6 +104,7 @@ python3-pip-20.0.2_1 python3-pycodestyle-2.5.0_2 python3-pyflakes-2.1.1_2 python3-vint-0.3.19_3 +qt5ct-0.41_1 sc3-plugins-3.10.0_2 setxkbmap-1.3.2_1 shellcheck-0.7.1_2 @@ -112,14 +119,17 @@ tmux-3.1b_1 toilet-0.3_2 transmission-2.94_5 tremc-0.9.1_1 +tuir-1.29.0_1 udevil-0.4.4_4 unclutter-xfixes-1.5_1 unrar-5.9.2_2 unzip-6.0_13 +vice-3.4_1 void-repo-nonfree-9_4 vpm-1.3_1 vsv-1.3.4_1 weechat-2.8_2 +weechat-python-2.8_2 wmctrl-1.07_5 wmutils-core-1.5_1 wmutils-opt-1.0_1 @@ -143,7 +153,7 @@ xss-lock-0.3.0_2 xtools-0.58_1 xz-5.2.5_1 yarn-1.22.4_1 -youtube-dl-2020.05.03_1 +youtube-dl-2020.05.08_1 zathura-0.4.5_2 zathura-cb-0.1.8_2 zathura-pdf-mupdf-0.3.5_2