From d232bd06dbea233ab009d75b3b61538735151706 Mon Sep 17 00:00:00 2001 From: deadguy Date: Wed, 3 Jun 2020 11:23:45 -0300 Subject: [PATCH] =?UTF-8?q?mantenimiento=20y=20cambios=20peque=C3=B1os?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .config/X11/xresources | 2 +- .config/alacritty.yml | 16 +-- .config/bspwm/bspwmrc | 21 ++-- .config/lf/lfrc | 6 +- .config/ncmpcpp/config | 40 +++---- .config/nvim/coc-settings.json | 48 +------- .config/nvim/ftplugin/sh.vim | 3 +- .config/nvim/ftplugin/vimwiki.vim | 3 +- .config/nvim/init.vim | 18 +-- .config/tmux/tmux.conf | 37 +++--- .config/zsh/.zshrc | 47 +++++--- .config/zsh/autocompletar.zsh | 15 +-- .config/zsh/teclas.zsh | 3 + .local/bin/celu | 2 +- .local/bin/cfg | 2 +- .local/bin/lfview | 2 - .local/bin/minve | 10 +- .local/bin/monis | 12 +- .local/bin/monisel | 60 ---------- .local/bin/notas | 35 +++--- .local/bin/paclist | 2 +- .local/bin/txbar | 2 +- .local/bin/unimon | 4 +- .../startpage/index.html | 113 ++++++++++++------ .zshenv | 4 +- doc/xbpaketes | 42 +++---- 26 files changed, 241 insertions(+), 308 deletions(-) delete mode 100755 .local/bin/monisel diff --git a/.config/X11/xresources b/.config/X11/xresources index b188e43..714721c 100644 --- a/.config/X11/xresources +++ b/.config/X11/xresources @@ -5,7 +5,7 @@ ! black *.color0: #0e0e0e -*.color8: #555555 +*.color8: #444444 ! red *.color1: #ff3333 diff --git a/.config/alacritty.yml b/.config/alacritty.yml index 1c9c27c..7868af7 100644 --- a/.config/alacritty.yml +++ b/.config/alacritty.yml @@ -84,15 +84,7 @@ live_config_reload: true mouse: hide_when_typing: true - -mouse_bindings: - - { mouse: Middle, action: Copy } - -key_bindings: - # (Windows, Linux, and BSD only) - - { key: Insert, mods: Shift, action: Paste } - - { key: Key0, mods: Control, action: ResetFontSize } - - { key: Equals, mods: Control, action: IncreaseFontSize } - - { key: Add, mods: Control, action: IncreaseFontSize } - - { key: Subtract, mods: Control, action: DecreaseFontSize } - - { key: Minus, mods: Control, action: DecreaseFontSize } \ No newline at end of file + url: + launcher: + program: firefox + args: [-new-tab] diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 0f54db1..c7b6532 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -1,11 +1,10 @@ -#!/usr/bin/env bash -set -euf -o pipefail +#!/bin/sh bspc rule -r "*" monis & -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 @@ -15,13 +14,14 @@ bspc config split_ratio 0.50 # Opciones bspc config gapless_monocle true -bspc config borderless_monocle false bspc config single_monocle true bspc config ignore_ewmh_focus true +bspc config pointer_follows_focus true +bspc config removal_adjustment true +bspc config borderless_monocle false bspc config remove_unplugged_monitors false bspc config remove_disabled_monitors false bspc config honor_size_hints false -bspc config pointer_follows_focus true bspc config directional_focus_tightness low bspc config automatic_scheme longest_side bspc config initial_polarity second_child @@ -33,7 +33,7 @@ bspc config pointer_action3 move # xrdb get_xrdb() { - xrdb -query | grep "$1" | awk '{print $2}' | tail -n1 + xrdb -query | awk -v pat="$1" '$0~pat {print $2}' } # Colores @@ -47,17 +47,14 @@ bspc rule -a Pavucontrol state=floating bspc rule -a Catia state=floating bspc rule -a Cadence state=floating 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 # Otros bspc rule -a Zathura state=tiled -bspc rule -a Alacritty:multi desktop='^1' +bspc rule -a Alacritty:multi desktop='^1' stx & diff --git a/.config/lf/lfrc b/.config/lf/lfrc index bda1eb3..d0fb1b6 100644 --- a/.config/lf/lfrc +++ b/.config/lf/lfrc @@ -20,9 +20,9 @@ set icons if [ $w -le 80 ]; then lf -remote "send $id set ratios 1:1" elif [ $w -le 160 ]; then - lf -remote "send $id set ratios 1:2:2" + lf -remote "send $id set ratios 2:2" else - lf -remote "send $id set ratios 1:2:3" + lf -remote "send $id set ratios 2:4" fi }} @@ -228,6 +228,7 @@ map y map c map / map r +map e cmap cmd-escape @@ -260,6 +261,7 @@ map pi paste-interactive map pr paste-rsync map o &mimeopen $f map O $mimeopen --ask $f +map e $vix $f map cx $chmod +x "$f" map bg $setbg $f map U %du -sh $f diff --git a/.config/ncmpcpp/config b/.config/ncmpcpp/config index e79bb20..ea74601 100644 --- a/.config/ncmpcpp/config +++ b/.config/ncmpcpp/config @@ -5,15 +5,15 @@ ncmpcpp_directory = "~/.config/ncmpcpp" visualizer_fifo_path = "/tmp/mpd.fifo" visualizer_output_name = "mpd spectrum" visualizer_type = "wave" -visualizer_in_stereo = yes +visualizer_in_stereo = no visualizer_color = "red,yellow,green,cyan,blue,red,yellow,green,cyan,blue,red,yellow,green,cyan,blue,red" -visualizer_sync_interval = 10 +visualizer_sync_interval = 15 visualizer_look = "º|" # COLORS colors_enabled = yes discard_colors_if_item_is_selected = yes -alternative_ui_separator_color = yellow +alternative_ui_separator_color = black main_window_color = white header_window_color = cyan volume_color = red @@ -23,18 +23,16 @@ empty_tag_color = blue state_flags_color = red # SONG -song_list_format = "$5%n {$8%t}|{$2►$2}|{$5►$8 %f} $R$5{$4%a}|{$8} {$7 %l}" -song_status_format = {$8%t}{$8 "%b"}|{$6 "%a"}$8 -song_window_title_format = "{%a - }{%t}{ [%b]}|{%f}" +song_status_format = "{%a - %t}" +song_list_format = "{%a - %t} $R {%l}" +song_window_title_format = "{%a - }{%t}|{%f}" song_columns_list_format = "(30)[blue]{a} (40)[red]{t|f} (30)[cyan]{br} (4f)[green]{lr}" # PREFIX -now_playing_prefix = "$6>> " -now_playing_suffix = " $6<<" -selected_item_prefix = "$9" -selected_item_suffix = "$9" -current_item_prefix = "$(white)$r" -current_item_suffix = "$/r$(end)" +now_playing_prefix = "$(8)" +now_playing_suffix = "$0" +selected_item_prefix = "$(11)" +current_item_prefix = "$(11)$r" browser_playlist_prefix = "$7list$9" current_item_inactive_column_prefix = "$(red)$r" current_item_inactive_column_suffix = "$/r$(end)" @@ -45,7 +43,7 @@ progressbar_color = blue progressbar_elapsed_color = blue # VIEWS -user_interface = alternative +user_interface = classic playlist_display_mode = classic browser_display_mode = classic search_engine_display_mode = columns @@ -59,20 +57,20 @@ media_library_sort_by_mtime = yes media_library_albums_split_by_date = yes # UI -titles_visibility = no -header_visibility = no +locked_screen_width_part = 50 header_text_scrolling = yes statusbar_visibility = yes -display_bitrate = no autocenter_mode = yes -centered_cursor = no jump_to_now_playing_song_at_start = yes enable_window_title = yes +titles_visibility = no +header_visibility = no +display_bitrate = no +centered_cursor = no playlist_show_remaining_time = no display_remaining_time = no playlist_separate_albums = no ask_for_locked_screen_width_part = no -locked_screen_width_part = 50 empty_tag_marker ="--" # OPTIONS @@ -80,13 +78,13 @@ lines_scrolled = 1 mouse_support = yes mouse_list_scroll_whole_page = yes cyclic_scrolling = yes +use_console_editor = yes +incremental_seeking = yes +external_editor = nvim ignore_leading_the = no allow_for_physical_item_deletion = no -use_console_editor = yes -external_editor = nvim data_fetching_delay = no ask_before_clearing_playlists = no -incremental_seeking = yes # LYRICS follow_now_playing_lyrics = no diff --git a/.config/nvim/coc-settings.json b/.config/nvim/coc-settings.json index 8849433..8ea9c40 100644 --- a/.config/nvim/coc-settings.json +++ b/.config/nvim/coc-settings.json @@ -1,20 +1,5 @@ { - "coc.preferences.currentFunctionSymbolAutoUpdate": true, - "coc.preferences.extensionUpdateCheck": "never", - "coc.preferences.colorSupport": true, "diagnostic.displayByAle": true, - "diagnostic.refreshOnInsertMode": true, - "diagnostic.refreshAfterSave": true, - "diagnostic.checkCurrentLine": true, - "diagnostic.maxWindowHeight": 20, - "diagnostic.errorSign": "✖", - "diagnostic.warningSign": "⚠", - "diagnostic.infoSign": "●", - "diagnostic.hintSign": "○", - "emmet.includeLanguages": { - "html.handlebars": "html", - "javascript": "javascriptreact" - }, "explorer.width": 25, "explorer.icon.expanded": "🞃", "explorer.icon.collapsed": "🞂", @@ -30,45 +15,14 @@ "b": "search" }, "explorer.quitOnOpen": true, - "explorer.datetime.format": "yyyy/MM/dd HH:mm", + "explorer.datetime.format": "yyyy-MM-dd HH:mm", "list.source.files.command": "fd", "list.source.files.args": ["-t", "f", "-S", "-2m", "-F", "-H"], "list.source.grep.args": ["--vimgrep", "--hiden", "--no-heading"], "list.source.mru.ignoreGitIgnore": true, "list.previewSplitRight": true, - "suggest.enablePreview": true, - "suggest.snippetIndicator": " ⮞", - "suggest.triggerCompletionWait": 100, "suggest.echodocSupport": true, "suggest.maxPreviewWidth": 100, - "suggest.completionItemKindLabels": { - "keyword": "\uf1de", - "variable": "\ue79b", - "value": "\uf89f", - "operator": "\u03a8", - "function": "\u0192", - "reference": "\ufa46", - "constant": "\uf8fe", - "method": "\uf09a", - "struct": "\ufb44", - "class": "\uf0e8", - "interface": "\uf417", - "text": "\ue612", - "enum": "\uf435", - "enumMember": "\uf02b", - "module": "\uf40d", - "color": "\ue22b", - "property": "\ue624", - "field": "\uf9be", - "unit": "\uf475", - "event": "\ufacd", - "file": "\uf723", - "folder": "\uf114", - "snippet": "\ue60b", - "typeParameter": "\uf728", - "default": "\uf29c" - }, - "signature.triggerSignatureWait": 100, "session.saveOnVimLeave": false, "snippets.extends": { "javascriptreact": ["javascript"], diff --git a/.config/nvim/ftplugin/sh.vim b/.config/nvim/ftplugin/sh.vim index d5a3898..d2a883f 100644 --- a/.config/nvim/ftplugin/sh.vim +++ b/.config/nvim/ftplugin/sh.vim @@ -1,5 +1,4 @@ -setlocal shiftwidth=2 -setlocal expandtab +setlocal shiftwidth=4 tabstop=4 softtabstop=4 expandtab if !exists("b:sh_indent_options") let b:sh_indent_options = {} diff --git a/.config/nvim/ftplugin/vimwiki.vim b/.config/nvim/ftplugin/vimwiki.vim index 4279d91..1f57158 100644 --- a/.config/nvim/ftplugin/vimwiki.vim +++ b/.config/nvim/ftplugin/vimwiki.vim @@ -7,6 +7,5 @@ setlocal spell spelllang=es,en_us,cjk nnoremap [s nnoremap ]s nnoremap z= -nnoremap z=1 +nnoremap z=1 nnoremap zg -inoremap u[s1z=`]au diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index c1f193b..a2e523c 100644 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -2,7 +2,9 @@ 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 g:python3_host_prog = '/bin/python3' +if filereadable('bin/python3') + let g:python3_host_prog = '/bin/python3' +endif let g:node_host_prog = '~/.local/share/npm/bin/neovim-node-host' let $GIT_EDITOR = 'nvr -cc split --remote-wait' @@ -121,7 +123,7 @@ if !exists('autocommands_loaded') && has('autocmd') aug term_stuff au TermOpen * setlocal nonumber norelativenumber laststatus=0 - au TermOpen * setlocal signcolumn=no noruler nocursorline + au TermOpen * setlocal signcolumn=no noruler nocursorline scrolloff=0 aug END aug miscs @@ -232,7 +234,7 @@ nmap (ale_previous_wrap) nmap (ale_next_wrap) " }}} " CoC {{{ -let g:coc_global_extensions = ['coc-lists', 'coc-highlight', 'coc-explorer', 'coc-snippets', 'coc-python', 'coc-tsserver', 'coc-emmet', 'coc-css', 'coc-html', 'coc-json'] +let g:coc_global_extensions = ['coc-lists', 'coc-highlight', 'coc-explorer', 'coc-snippets', 'coc-python', 'coc-tsserver', 'coc-css', 'coc-html', 'coc-json'] " Lists nnoremap :CocList -S --ignore-case helptags @@ -245,9 +247,6 @@ nnoremap :CocCommand explorer " Config nnoremap :CocConfig -" to confirm completion -inoremap pumvisible() ? "\" : "\" - inoremap \ pumvisible() ? coc#_select_confirm() : \ coc#expandableOrJumpable() ? "\=coc#rpc#request('doKeymap', ['snippets-expand-jump',''])\" : @@ -261,6 +260,9 @@ endfunction let g:coc_snippet_next = '' +" to confirm completion +inoremap pumvisible() ? "\" : "\" + " Use to trigger completion. inoremap coc#refresh() @@ -269,7 +271,7 @@ nnoremap gd (coc-definition) nnoremap gr (coc-references) " Use K to show documentation in preview window. -nnoremap K :call show_documentation() +nnoremap D :call show_documentation() function! s:show_documentation() if (index(['vim','help'], &filetype) >= 0) @@ -348,7 +350,7 @@ highlight User7 ctermfg=234 ctermbg=251 guibg=NONE guifg=#407e4a let g:modes={ \ 'n' : ['%3*', 'NORMAL'], - \ 'no' : ['%3*', 'NORMAL·OPERATOR PENDING'], + \ 'no' : ['%3*', 'N·OPERATOR PENDING'], \ 'v' : ['%5*', 'VISUAL'], \ 'V' : ['%5*', 'V·LINE'], \ '' : ['%5*', 'V·BLOCK'], diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 35bacc7..9340a15 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -3,22 +3,23 @@ set -g default-terminal 'tmux-256color' set -as terminal-overrides ',alacritty:Tc' set -as terminal-overrides ',*:Smulx=\E[4::%p1%dm' # undercurl support set -as terminal-overrides ',*:Setulc=\E[58::2::%p1%{65536}%/%d::%p1%{256}%/%{255}%&%d::%p1%{255}%&%d%;m' # underscore colours - needs tmux-3.0 +set -g history-limit 102400 set -g set-clipboard on -setw -gq utf8 on set -g mouse on +set -gq utf8 on set -gq status-utf8 on set -sg escape-time 10 -set -g history-limit 102400 # Ventanas -setw -g automatic-rename on +set -g automatic-rename on set -g renumber-windows on set -g allow-rename on set -g base-index 1 # Panes -setw -g pane-base-index 1 -setw -g aggressive-resize on +set -g pane-base-index 1 +set -g aggressive-resize on +set -wg main-pane-width 85 # Notificaciones set -g monitor-activity on @@ -28,24 +29,24 @@ set -g visual-silence off set -g bell-action none # Vi -setw -g mode-keys vi +set -g mode-keys vi set -g status-keys vi # Statusbar -setw -g pane-border-status bottom -setw -g pane-border-format '─' -setw -g automatic-rename-format '#{s/zsh//:pane_current_command}' -setw -g pane-border-style 'fg=#080808' -setw -g pane-active-border-style 'fg=#080808' +set -g pane-border-status bottom +set -g pane-border-format '──' +set -g automatic-rename-format '#{s/zsh//:pane_current_command}' +set -g pane-border-style fg=black +set -g pane-active-border-style fg=black set -g set-titles on -set -g status-interval 10 +set -g status-interval 60 set -g mode-style fg=black,bg=yellow set -g message-command-style bg=colour0,fg=colour13 -set -g message-style bg=default,fg=default +set -g message-style 'bg=#151515,fg=white,italics' set -g status-style bg=default,fg=colour7 -set -g set-titles-string "#T" +set -g set-titles-string "#S > #T" set -g status-left '' -set -g status-right '#(txbar) #[fg=colour134]%a %d #[fg=colour167]%R #[fg=colour10]#S:#[fg=colour14]#I.#P' +set -g status-right '#(txbar) #[fg=colour134]%a %d #[fg=colour167]%R' set -g window-status-separator ' ' set -g window-status-current-style fg=colour3 set -g window-status-activity-style bg=default,fg=colour15,italics @@ -67,7 +68,7 @@ bind-key D detach-client bind-key T command-prompt -I "#W" "rename-window '%%'" bind-key S command-prompt -I "#S" "rename-session '%%'" bind-key M command-prompt -p man: "split-window -fh 'man %1'" -bind-key R source-file $HOME/.tmux.conf \; display "Config Reloaded" +bind-key R source-file $XDG_CONFIG_HOME/tmux/tmux.conf \; display "Config Reloaded" # Dividir bind-key | split-window -h -c "#{pane_current_path}" @@ -89,10 +90,8 @@ bind -n M-Left select-pane -L bind -n M-Right select-pane -R # Ventanas -bind-key -r BSpace swap-window -t -1 -bind-key -r Space swap-window -t +1 -bind-key Enter new-window bind-key Tab choose-window +bind-key Enter new-window bind-key d display-panes bind-key w choose-tree -Zw "swap-window -t '%%'" bind-key s choose-tree -Zw "swap-pane -t '%%'" diff --git a/.config/zsh/.zshrc b/.config/zsh/.zshrc index 7d680c7..743b6ec 100644 --- a/.config/zsh/.zshrc +++ b/.config/zsh/.zshrc @@ -1,20 +1,8 @@ # -*- mode: shell-script -*- # vim:ft=zsh # Opciones principales {{{ -autoload -Uz is-at-least -if [[ ${ZSH_VERSION} != 5.1.1 && ${TERM} != "dumb" ]]; then - if is-at-least 5.2; then - autoload -Uz bracketed-paste-url-magic - zle -N bracketed-paste bracketed-paste-url-magic - else - if is-at-least 5.1; then - autoload -Uz bracketed-paste-magic - zle -N bracketed-paste bracketed-paste-magic - fi - fi - autoload -Uz url-quote-magic - zle -N self-insert url-quote-magic -fi +autoload -Uz bracketed-paste-url-magic +zle -N bracketed-paste bracketed-paste-url-magic setopt RM_STAR_WAIT setopt COMBINING_CHARS # Combine accents with the base character. @@ -75,6 +63,7 @@ foreach extra ( ) { source $ZDOTDIR/$extra } +HISTORY_SUBSTRING_SEARCH_ENSURE_UNIQUE=1 typeset -g ZSH_SYSTEM_CLIPBOARD_TMUX_SUPPORT='true' source $XDG_DATA_HOME/lscolors.sh # }}} @@ -87,8 +76,34 @@ function precmd() { fi } -PS1="%(?..%{%F{red}%}(%?%)%{%f%} )%{%F{blue}%}%2~ %{%f%}%(!:#:) " -SPROMPT="zsh: correct %F{red}'%R'%f to %F{green}'%r'%f [%B%Uy%u%bes, %B%Un%u%bo, %B%Ue%u%bdit, %B%Ua%u%bbort]? " +setopt PROMPT_SUBST + +# Anonymous function to avoid leaking variables. +function () { + # Check for tmux by looking at $TERM, because $TMUX won't be propagated to any + # nested sudo shells but $TERM will. + local TMUXING=$([[ "$TERM" =~ "tmux" ]] && echo tmux) + if [ -n "$TMUXING" -a -n "$TMUX" ]; then + # In a a tmux session created in a non-root or root shell. + local LVL=$(($SHLVL - 1)) + else + # Either in a root shell created inside a non-root tmux session, + # or not in a tmux session. + local LVL=$SHLVL + fi + if [[ $EUID -eq 0 ]]; then + local SUFFIX='%F{yellow}%n%f'$(printf '%%F{yellow}\uf460%.0s%%f' {1..$LVL}) + else + local SUFFIX=$(printf '\uf460%.0s%%f' {1..$LVL}) + fi +export PS1="%(?..%{%F{red}%}(%?%)%{%f%} )%F{green}${SSH_TTY:+%n@%m}%f%B${SSH_TTY:+:}%b%F{blue}%B%2~%b%F{yellow}%B%(1j.*.)%b%f %B${SUFFIX}%b " + if [[ -n "$TMUXING" ]]; then + # Outside tmux, ZLE_RPROMPT_INDENT ends up eating the space after PS1, and + # prompt still gets corrupted even if we add an extra space to compensate. + export ZLE_RPROMPT_INDENT=0 + fi +} +export SPROMPT="zsh: correct %F{red}'%R'%f to %F{green}'%r'%f [%B%Uy%u%bes, %B%Un%u%bo, %B%Ue%u%bdit, %B%Ua%u%bbort]? " function zle-keymap-select { if [[ ${KEYMAP} == vicmd ]] || diff --git a/.config/zsh/autocompletar.zsh b/.config/zsh/autocompletar.zsh index f2e7703..a18ebc1 100644 --- a/.config/zsh/autocompletar.zsh +++ b/.config/zsh/autocompletar.zsh @@ -8,6 +8,7 @@ setopt AUTO_MENU # Show completion menu on a successive tab press. setopt AUTO_LIST # Automatically list choices on ambiguous completion. setopt AUTO_PARAM_SLASH # If completed parameter is a directory, add a trailing slash. setopt EXTENDED_GLOB # Needed for file modification glob modifiers with compinit +setopt NO_NOMATCH # [default] unmatched patterns are left unchanged unsetopt MENU_COMPLETE # Do not autoselect the first completion entry. unsetopt FLOW_CONTROL # Disable start/stop characters in shell editor. @@ -21,19 +22,18 @@ fi unset _comp_files zstyle ':completion:*' matcher-list '' '+m:{[:lower:]}={[:upper:]}' '+m:{[:upper:]}={[:lower:]}' '+m:{_-}={-_}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*' +zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} zstyle -e ':completion:*' special-dirs '[[ $PREFIX = (../)#(..) ]] && reply=(..)' +zstyle ':completion:*:complete:(cd|pushd):*' tag-order 'local-directories named-directories' +zstyle ':completion:*' group-name '' +zstyle ':completion:*:descriptions' format '%F{yellow}%d %f' +zstyle ':completion:*' menu select zstyle ':completion::complete:*' use-cache on zstyle ':completion::complete:*' cache-path "$XDG_CACHE_HOME/zcompcache" -zstyle ':completion:*:*:*:*:*' menu select zstyle ':completion:*:matches' group 'yes' zstyle ':completion:*:options' description 'yes' zstyle ':completion:*:options' auto-description '%d' -zstyle ':completion:*:corrections' format '%F{green}%d (errors: %e) %f' -zstyle ':completion:*:descriptions' format '%F{yellow}%d %f' -zstyle ':completion:*:messages' format '%F{purple}%d %f' -zstyle ':completion:*:warnings' format '%F{red}no matches found %f' zstyle ':completion:*:default' list-prompt '%S%M matches%s' -zstyle ':completion:*' group-name '' zstyle ':completion:*' verbose yes zstyle ':completion:*' completer _complete _match _approximate zstyle ':completion:*:match:*' original only @@ -41,11 +41,8 @@ zstyle ':completion:*:approximate:*' max-errors 1 numeric zstyle -e ':completion:*:approximate:*' max-errors 'reply=($((($#PREFIX+$#SUFFIX)/3>7?7:($#PREFIX+$#SUFFIX)/3))numeric)' zstyle ':completion:*:functions' ignored-patterns '(_*|pre(cmd|exec))' zstyle ':completion:*:*:-subscript-:*' tag-order indexes parameters -zstyle ':completion:*:default' list-colors ${(s.:.)LS_COLORS} -zstyle ':completion:*:complete:(cd|pushd):*' tag-order 'local-directories named-directories' zstyle ':completion:*:*:cd:*:directory-stack' menu yes select zstyle ':completion:*:-tilde-:*' group-order 'named-directories' 'path-directories' 'users' 'expand' -zstyle ':completion:*' squeeze-slashes true zstyle ':completion:*:history-words' stop yes zstyle ':completion:*:history-words' remove-all-dups yes zstyle ':completion:*:history-words' list false diff --git a/.config/zsh/teclas.zsh b/.config/zsh/teclas.zsh index af62a0d..def0fe2 100644 --- a/.config/zsh/teclas.zsh +++ b/.config/zsh/teclas.zsh @@ -16,6 +16,7 @@ foreach carga ( surround select-bracketed select-quoted + edit-command-line ) { autoload -U $carga } @@ -31,6 +32,7 @@ foreach widge ( select-quoted tmux-clear-screen run-with-sudo + edit-command-line ) { zle -N $widge } @@ -67,6 +69,7 @@ bindkey -M viins '^N' down-line-or-beginning-search bindkey -M viins '^U' history-incremental-pattern-search-backward bindkey -M viins '^[[A' history-substring-search-up bindkey -M viins '^[[B' history-substring-search-down +bindkey -M viins '^x^x' edit-command-line [[ -n "$key[Home]" ]] && bindkey -M viins -- "$key[Home]" beginning-of-line [[ -n "$key[End]" ]] && bindkey -M viins -- "$key[End]" end-of-line diff --git a/.local/bin/celu b/.local/bin/celu index 7835e5c..9773fbb 100755 --- a/.local/bin/celu +++ b/.local/bin/celu @@ -1,7 +1,7 @@ #!/bin/sh case $1 in - on) simple-mtpfs --device 1 /mnt/cel/ && sleep 5 && simple-mtpfs --device 1 /mnt/cel/;; + on) simple-mtpfs --device 1 /mnt/cel/ ;; off) fusermount -u /mnt/cel/ ;; *) echo "Can't help you with that" ;; esac diff --git a/.local/bin/cfg b/.local/bin/cfg index 625239c..8d83025 100755 --- a/.local/bin/cfg +++ b/.local/bin/cfg @@ -13,7 +13,7 @@ function () { 'shell' '~/.config/zsh/.zshrc' 'dunst' '~/.config/dunst/dunstrc' 'music' '~/.config/ncmpcpp/config' - 'tmux' '~/.tmux.conf' + 'tmux' '~/.config/tmux/tmux.conf' 'xinit' '~/.xinitrc' 'alias' '~/.config/zsh/aliases.zsh' 'term' '~/.config/alacritty.yml' diff --git a/.local/bin/lfview b/.local/bin/lfview index 8bc6676..bade1a1 100755 --- a/.local/bin/lfview +++ b/.local/bin/lfview @@ -1,7 +1,6 @@ #!/bin/sh set -C -f -u -#IFS=$'\n' IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}" # ANSI color codes are supported. @@ -18,7 +17,6 @@ IFS="$(printf '%b_' '\n')"; IFS="${IFS%_}" # Script arguments FILE_PATH="${1}" # Full path of the highlighted file - FILE_EXTENSION="${FILE_PATH##*.}" FILE_EXTENSION_LOWER=$(echo "${FILE_EXTENSION}" | tr '[:upper:]' '[:lower:]') diff --git a/.local/bin/minve b/.local/bin/minve index 3703dd3..1ee7369 100755 --- a/.local/bin/minve +++ b/.local/bin/minve @@ -8,7 +8,7 @@ icon="$XDG_DATA_HOME/icons/Marwaita-Dark/24x24/categories/preferences-system-win case $1 in hide) if [ "$lines" -ge 15 ]; then - notify-send "15 windows are already hidden" "You should consider closing some before hiding even more." + notify-send -i "$icon" "15 windows are already hidden" "You should consider closing some before hiding even more." else focusedNode=$(bspc query -N -n .focused) focusedID=$(bspc query -D -d --names) @@ -22,12 +22,12 @@ hide) ;; dmenu) [ -z "$file" ] && exit - lineNumber=$(awk '{print $2,$3}' "$file" | dmenu -i -p ' ') + sel=$(awk '{print $2,$3}' "$file" | dmenu -i -p ' ') - selectedID=$(awk -v pat="$lineNumber" '$0~pat {print $1}' "$file") - selectedDesktop=$(awk -v pat="$lineNumber" '$0~pat {print $2}' "$file") + selectedID=$(awk -v pat="$sel" '$0~pat {print $1}' "$file") + selectedDesktop=$(awk -v pat="$sel" '$0~pat {print $2}' "$file") bspc desktop -f "$selectedDesktop" xdo show "$selectedID" - sed -i "/${lineNumber}/d" "$file" + sed -i "/${sel}/d" "$file" ;; esac diff --git a/.local/bin/monis b/.local/bin/monis index 1dfad26..719d1b8 100755 --- a/.local/bin/monis +++ b/.local/bin/monis @@ -1,7 +1,7 @@ #!/bin/sh -M=$(xrandr -q | awk '/ connected/ {print $1}') -NUM=$(echo "$M" | wc -l) +M=$(bspc query -M --names) +NUM=$(echo "$M" | awk 'END{print NR}') ettin() { sec=$(echo "$M" | awk NR==2) @@ -12,8 +12,14 @@ ettin() { bspc rule -a Firefox:Navigator state=tiled, desktop='^6' } +cyclops() { + xrandr --output LVDS1 --primary --auto --scale 1.0x1.0 "$(echo "$M" | awk '! /LVDS1/ {print "--output", $1, "--off"}' | paste -sd ' ')" + bspc monitor -d 1 2 3 4 5 6 7 8 9 10 + bspc rule -a Firefox:Navigator state=tiled, desktop='^2' +} + if [ "$NUM" = 1 ]; then - unimon + cyclops elif [ "$NUM" = 2 ]; then ettin fi diff --git a/.local/bin/monisel b/.local/bin/monisel deleted file mode 100755 index 877b9bd..0000000 --- a/.local/bin/monisel +++ /dev/null @@ -1,60 +0,0 @@ -#!/bin/sh - -twoscreen() { # If there are two screens. - mirror=$(printf "no\\nyes" | dmenu -i -w 300 -p "Mirror displays? ") - # Mirror displays using native resolution of external display and a scaled - # version for the internal display - if [ "$mirror" = "yes" ]; then - external=$(echo "$screens" | dmenu -i -w 320 -p "Optimize resolution for: ") - internal=$(echo "$screens" | grep -v "$external") - - res_external=$(xrandr --query | sed -n "/^$external/,/\+/p" | \ - tail -n 1 | awk '{print $1}') - res_internal=$(xrandr --query | sed -n "/^$internal/,/\+/p" | \ - tail -n 1 | awk '{print $1}') - - res_ext_x=$(echo "$res_external" | sed 's/x.*//') - res_ext_y=$(echo "$res_external" | sed 's/.*x//') - res_int_x=$(echo "$res_internal" | sed 's/x.*//') - res_int_y=$(echo "$res_internal" | sed 's/.*x//') - - scale_x=$(echo "$res_ext_x / $res_int_x" | bc -l) - scale_y=$(echo "$res_ext_y / $res_int_y" | bc -l) - - xrandr --output "$external" --auto --scale 1.0x1.0 \ - --output "$internal" --auto --same-as "$external" \ - --scale "$scale_x"x"$scale_y" - else - primary=$(echo "$screens" | dmenu -i -w 320 -p "Select primary display: ") - secondary=$(echo "$screens" | grep -v "$primary") - direction=$(printf "left\\nright" | dmenu -i -w 500 -p "What side of $primary should $secondary be on? ") - xrandr --output "$primary" --auto --scale 1.0x1.0 --output "$secondary" --"$direction"-of "$primary" --auto --scale 1.0x1.0 - fi - } - -morescreen() { # If there are more than two screens. - primary=$(echo "$screens" | dmenu -i -w 320 -p "Select primary display: ") - secondary=$(echo "$screens" | grep -v "$primary" | dmenu -i -w 320 -p "Select secondary display: ") - direction=$(printf "left\\nright" | dmenu -i -w 500 -p "What side of $primary should $secondary be on? ") - tertiary=$(echo "$screens" | grep -v "$primary" | grep -v "$secondary" | dmenu -i -w 320 -p "Select third display: ") - xrandr --output "$primary" --auto --output "$secondary" --"$direction"-of "$primary" --auto --output "$tertiary" --"$(printf "left\\nright" | grep -v "$direction")"-of "$primary" --auto - } - -multimon() { # Multi-monitor handler. - case "$(echo "$screens" | wc -l)" in - 2) twoscreen ;; - *) morescreen ;; - esac ;} - -postrun() { - setbg - bspc monitor "$(bspc query -M | awk NR==1)" -d 1 2 3 4 5 - bspc monitor "$(bspc query -M | awk NR==2)" -d 6 7 8 9 10 - } - -# Get all connected screens. -screens=$(xrandr -q | awk '/ connected/ {print $1}') - -multimon - -postrun diff --git a/.local/bin/notas b/.local/bin/notas index d63fe9d..0fdd9c6 100755 --- a/.local/bin/notas +++ b/.local/bin/notas @@ -1,31 +1,30 @@ #!/bin/sh diario() { - diario="$HOME/doc/blog" - menublog=$(printf "Hoy\\nMañana\\nArchivo" | dmenu -w 120 -p " ") - if [ "$menublog" = "Hoy" ]; then - alacritty --class=flota -e nvim "$diario/$(date -I)".wiki - elif [ "$menublog" = "Mañana" ]; then - alacritty --class=flota -e nvim "$diario/$(date --date='tomorrow' +%F)".wiki - else - cd "$diario" || exit - archivo - fi + cd "$HOME/doc/blog" || exit + menublog=$(printf "Hoy\\nMañana\\nAyer\\nArchivo" | dmenu -w 120 -p " ") + case $menublog in + "Hoy") alacritty --class=flota -e nvim "$(date -I)".wiki ;; + "Mañana") alacritty --class=flota -e nvim "$(date --date='tomorrow' +%F)".wiki ;; + "Ayer") alacritty --class=flota -e nvim "$(date --date='yesterday' +%F)".wiki ;; + "Archivo") archivo ;; + esac } notas() { - notas="$HOME/doc/notas" + cd "$HOME/doc/notas" || exit menunota=$(printf "Nueva\\nArchivo" | dmenu -w 120 -p " ") - if [ "$menunota" = "Nueva" ]; then - alacritty --class=flota -e nvim "$notas/$(date -I)".wiki - else - cd "$notas" || exit - archivo - fi + case $menunota in + "Nueva") + nombre="$(dmenu -p "Titulo: ")" 2> /dev/null + alacritty --class=flota -e nvim "$nombre".wiki + ;; + "Archivo") archivo ;; + esac } archivo(){ - selarch=$(fd -d 1 -e wiki | sort -M | dmenu -w 200 -p " ") + selarch=$(fd -d 1 -e wiki | sort -Mr | dmenu -w 200 -p " ") if [ "$selarch" = "" ]; then exit 0 else diff --git a/.local/bin/paclist b/.local/bin/paclist index 2278c67..626a5e0 100755 --- a/.local/bin/paclist +++ b/.local/bin/paclist @@ -1,3 +1,3 @@ #!/bin/sh -xbps-query -vm > ~/doc/xbpaketes +xpkg -m > ~/doc/xbpaketes diff --git a/.local/bin/txbar b/.local/bin/txbar index 62e4fdf..4f78f10 100755 --- a/.local/bin/txbar +++ b/.local/bin/txbar @@ -23,7 +23,7 @@ if [ -d /sys/class/power_supply/BAT0 ]; then printf "%s\n $HEART $current_charge" fi -if ping -q -w 1 -c 1 "$(ip r | grep -m 1 default | cut -d ' ' -f 3)" >/dev/null +if ping -q -w 1 -c 1 "$(ip r | awk '/default/ {print $3}')" >/dev/null then net="$(awk 'NR == 3 { print substr($3, 1, length($3) - 1) }' /proc/net/wireless)" printf "%s\n #[fg=colour177]$WIFI${net} " diff --git a/.local/bin/unimon b/.local/bin/unimon index fc31411..c91c1d9 100755 --- a/.local/bin/unimon +++ b/.local/bin/unimon @@ -1,9 +1,11 @@ #!/bin/sh -M=$(xrandr -q | awk '/ connected/ {print $1}') +M=$(bspc query -M --names) cyclops() { xrandr --output LVDS1 --primary --auto --scale 1.0x1.0 "$(echo "$M" | awk '! /LVDS1/ {print "--output", $1, "--off"}' | paste -sd ' ')" + bspc config remove_disabled_monitors + bspc config remove_unplugged_monitors bspc monitor -d 1 2 3 4 5 6 7 8 9 10 bspc rule -a Firefox:Navigator state=tiled, desktop='^2' } diff --git a/.mozilla/firefox/thsxpwyd.testing-1586723279098/startpage/index.html b/.mozilla/firefox/thsxpwyd.testing-1586723279098/startpage/index.html index 13cd407..f515c7b 100644 --- a/.mozilla/firefox/thsxpwyd.testing-1586723279098/startpage/index.html +++ b/.mozilla/firefox/thsxpwyd.testing-1586723279098/startpage/index.html @@ -1,42 +1,77 @@ - - Hola Si - - - -
-
-
-
-
-
-
  • Unixporn
    • -
  • Void Linux
    • -
  • Neovim
    • -
  • Wallpapers
    • -
  • Argentina
    • -
    -
    -
  • Questionable Content
    • -
  • Empowered
    • -
  • Rocket Chat
    • -
  • Discord
    • -
  • Google Images
    • -
    -
    -
  • Arch Wiki
    • -
  • Dotfiles
    • -
  • Void Packages
    • -
  • Void Wiki
    • -
  • Github
    • -
  • Gmail
    • -
    -
    -
  • Youtube
    • -
  • Bandcamp
    • -
  • Twitch
    • -
    -
    - + + Hola Si + + + +
    +
    +
    +
    +
    +
    +
  • + Unixporn +
    • +
  • + Void Linux +
    • +
  • + Neovim +
    • +
  • + Wallpapers +
    • +
  • + Argentina +
    • +
    +
    +
  • + Questionable Content +
    • +
  • + Empowered +
    • +
  • Rocket Chat
    • +
  • + Discord +
    • +
  • + Google Images +
    • +
    +
    +
  • Arch Wiki
    • +
  • + Dotfiles +
    • +
  • + Void Packages +
    • +
  • Void Wiki
    • +
  • Gmail
    • +
    +
    +
  • Youtube
    • +
  • Bandcamp
    • +
  • Twitch
    • +
    +
    + diff --git a/.zshenv b/.zshenv index 87a2f20..48c1343 100644 --- a/.zshenv +++ b/.zshenv @@ -29,6 +29,7 @@ export BAT_THEME="TwoDark" export GTK2_RC_FILES="$XDG_CONFIG_HOME/gtk-2.0/gtkrc-2.0" export QT_QPA_PLATFORMTHEME="qt5ct" +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" @@ -74,7 +75,7 @@ export FZF_VIM_LOG=$(git config --get alias.l | awk '{$1=""; print $0;}' | tr -d # }}} # Less {{{ export LESSCHARSET=UTF-8 -export LESS=-R +export LESS=-MR export LESS_TERMCAP_mb="$(printf '%b' '')" export LESS_TERMCAP_md="$(printf '%b' '')" export LESS_TERMCAP_me="$(printf '%b' '')" @@ -83,6 +84,7 @@ 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 LESSPROMPT='?f%f .?ltLine %lt:?pt%pt\%:?btByte %bt:-...' export LESSHISTFILE="-" # }}} # Path {{{ diff --git a/doc/xbpaketes b/doc/xbpaketes index 4eb58ba..bc1c3e0 100644 --- a/doc/xbpaketes +++ b/doc/xbpaketes @@ -1,4 +1,4 @@ -ImageMagick-7.0.10.11_1 +ImageMagick-7.0.10.14_1 adwaita-qt-1.1.1_1 alacritty-0.4.2_3 alsa-firmware-1.2.1_1 @@ -10,13 +10,14 @@ alsa-plugins-samplerate-1.2.2_1 alsa-plugins-speex-1.2.2_1 alsa-utils-1.2.2_1 atool-0.39.0_5 -audacity-2.3.3_1 +audacity-2.4.1_1 autopep8-1.5.2_1 base-system-0.113_2 -bat-0.15.0_1 +bat-0.15.3_1 bc-1.07.1_5 bspwm-0.9.9_2 cadence-0.9.1_1 +cantarell-fonts-0.201_1 chrony-3.5_2 connman-1.38_2 connman-ncurses-1.0_3 @@ -27,7 +28,7 @@ dfc-3.1.1_1 dunst-1.4.1_1 elogind-243.4_2 faac-1.30_1 -fd-8.0.0_1 +fd-8.1.1_1 fdk-aac-devel-2.0.1_1 fdkaac-1.0.0_2 ffmpeg-4.2.3_1 @@ -41,11 +42,10 @@ git-extras-5.1.0_1 git-libsecret-2.26.2_1 gnome-ssh-askpass-8.2p1_1 gnupg2-2.2.20_1 -google-fonts-ttf-20190605_1 grub-i386-efi-2.04_3 grub-x86_64-efi-2.04_3 haveged-1.9.8_1 -highlight-3.56_1 +highlight-3.57_1 hsetroot-1.0.5_1 htop-2.2.0_1 hub-2.14.2_1 @@ -60,8 +60,9 @@ lf-r14_1 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.13_1 +libressl-devel-3.0.2_2 +librsvg-2.48.4_1 +linux5.6-5.6.14_1 lynx-2.8.9.1_3 maim-5.6.3_1 mdadm-4.1_2 @@ -74,7 +75,7 @@ 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 +ncurses-term-6.2_2 neomutt-20200501_1 neovim-0.4.3_1 neovim-remote-2.4.0_1 @@ -84,12 +85,13 @@ nmap-7.80_2 nodejs-13.2.0_2 noto-fonts-cjk-20190416_1 noto-fonts-ttf-20190926_1 -obs-25.0.7_1 +obs-25.0.8_1 p7zip-16.02_5 pass-1.7.3_2 patch-2.7.6_4 pavucontrol-4.0_1 perl-File-MimeInfo-0.29_1 +perl-HTML-Parser-3.72_8 pinentry-gtk-1.1.0_6 pinentry-tty-1.1.0_6 pkg-config-0.29.2_2 @@ -98,7 +100,7 @@ powertop-2.12_1 pulseaudio-13.0_1 pulsemixer-1.5.1_1 pylint-2.4.4_2 -python3-3.8.2_1 +python3-3.8.3_1 python3-BeautifulSoup4-4.8.2_1 python3-ipython-7.13.0_1 python3-isort-4.3.21_2 @@ -107,8 +109,8 @@ python3-lxml-4.4.3_1 python3-mccabe-0.6.1_3 python3-mypy-0.761_1 python3-pip-20.0.2_1 -python3-pycodestyle-2.5.0_2 -python3-pyflakes-2.1.1_2 +python3-pycodestyle-2.6.0_1 +python3-pyflakes-2.2.0_1 python3-vint-0.3.19_3 python3-yapf-0.29.0_1 qt5ct-0.41_1 @@ -124,28 +126,22 @@ sxiv-26_1 texlive-bin-2020_1 tmux-3.1b_1 toilet-0.3_2 -transmission-2.94_5 +transmission-3.00_1 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 +unzip-6.0_14 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 xbacklight-1.2.3_1 xclip-0.13_1 xcompmgr-1.1.8_1 xdo-0.5.7_1 -xdotool-3.20160805.1_2 -xdpyinfo-1.3.2_2 xev-1.2.3_2 xf86-video-intel-2.99.917.899_2 xinput-1.6.3_1 @@ -157,7 +153,7 @@ xrdb-1.2.0_2 xset-1.2.4_1 xsetroot-1.1.2_1 xss-lock-0.3.0_2 -xtools-0.58_1 +xtools-0.59_1 xz-5.2.5_1 yarn-1.22.4_1 youtube-dl-2020.05.08_1 @@ -169,5 +165,3 @@ zita-ajbridge-0.8.4_1 zsh-5.8_1 zsh-completions-0.31.0_1 zsh-syntax-highlighting-0.7.1_1 -cantarell-fonts-0.201_1 -xtitle-0.4.4_1