diff --git a/.config/alacritty.yml b/.config/alacritty.yml index a1e3a95..77fb4fd 100644 --- a/.config/alacritty.yml +++ b/.config/alacritty.yml @@ -51,7 +51,7 @@ colors: # Normal colors normal: - black: '#2c2c2c' + black: '#2e2e2e' red: '#ef2f27' green: '#519f50' yellow: '#faa030' @@ -63,7 +63,7 @@ colors: # Bright colors bright: black: '#666666' - red: '#f75341' + red: '#eb6655' green: '#98bc37' yellow: '#ffe64d' blue: '#008bbd' @@ -71,8 +71,6 @@ colors: cyan: '#6fc3df' white: '#fcfcfc' -background_opacity: 0.92 - selection: semantic_escape_chars: "" save_to_clipboard: true diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc index 4dee133..601d197 100755 --- a/.config/bspwm/bspwmrc +++ b/.config/bspwm/bspwmrc @@ -1,7 +1,6 @@ #!/bin/sh bspmonis & -randbg & bspc rule -r "*" @@ -18,8 +17,6 @@ bspc config gapless_monocle true bspc config ignore_ewmh_focus true bspc config pointer_follows_focus true bspc config removal_adjustment true -bspc config single_monocle false -bspc config borderless_monocle false bspc config remove_unplugged_monitors false bspc config remove_disabled_monitors false bspc config honor_size_hints false @@ -52,6 +49,5 @@ bspc rule -a Firefox state=floating bspc rule -a Zathura state=tiled bspc rule -a gzdoom state=fullscreen -xcompmgr & unclutter --jitter 30 --timeout 3 --ignore-scrolling & $TERMINAL & diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc index a96c927..3f6d926 100644 --- a/.config/dunst/dunstrc +++ b/.config/dunst/dunstrc @@ -26,7 +26,7 @@ title = Dunst # Define window title class = Dunst # Define window class - shrink = yes # Shrink window, or set to 0 + shrink = yes # Shrink window, or set to 0 idle_threshold = 120 # Keep messages for how long follow = mouse # Where to display notifications stack_duplicates = true # Merge multiple similar notifications @@ -59,7 +59,7 @@ dmenu = /usr/bin/dmenu -p dunst: browser = /usr/bin/firefox -new-tab icon_position = right # Align icons left/right/off - max_icon_size = 52 + max_icon_size = 24 # Paths to default icons. icon_path = /home/deadguy/.local/share/icons/Haiku/scalable/actions:/home/deadguy/.local/share/icons/Haiku/scalable/animations:/home/deadguy/.local/share/icons/Haiku/scalable/apps:/home/deadguy/.local/share/icons/Haiku/scalable/categories:/home/deadguy/.local/share/icons/Haiku/scalable/devices:/home/deadguy/.local/share/icons/Haiku/scalable/emblems:/home/deadguy/.local/share/icons/Haiku/scalable/emotes:/home/deadguy/.local/share/icons/Haiku/scalable/mimetypes:/home/deadguy/.local/share/icons/Haiku/scalable/places:/home/deadguy/.local/share/icons/Haiku/scalable/status:/home/deadguy/.local/share/icons/Haiku/scalable/stock diff --git a/.config/htop/htoprc b/.config/htop/htoprc index d80e2c3..16b13d7 100644 --- a/.config/htop/htoprc +++ b/.config/htop/htoprc @@ -1,9 +1,10 @@ # Beware! This file is rewritten by htop when settings are changed in the interface. # The parser is also very primitive, and not human-friendly. -fields=0 48 17 18 38 39 40 2 46 47 49 1 +fields=0 48 47 46 2 17 49 18 38 1 sort_key=38 sort_direction=1 -hide_threads=1 +tree_sort_key=47 +tree_sort_direction=1 hide_kernel_threads=0 hide_userland_threads=0 shadow_other_users=0 @@ -12,15 +13,24 @@ show_program_path=1 highlight_base_name=1 highlight_megabytes=1 highlight_threads=1 +highlight_changes=1 +highlight_changes_delay_secs=5 +find_comm_in_cmdline=1 +strip_exe_from_cmdline=1 +show_merged_command=0 tree_view=1 +tree_view_always_by_pid=0 header_margin=1 detailed_cpu_time=1 -cpu_count_from_zero=0 -update_process_names=0 +cpu_count_from_one=1 +show_cpu_usage=1 +show_cpu_frequency=0 +update_process_names=1 account_guest_in_cpu_meter=0 color_scheme=0 +enable_mouse=0 delay=15 left_meters=AllCPUs left_meter_modes=1 -right_meters=Tasks Memory LoadAverage Battery -right_meter_modes=2 2 2 2 +right_meters=Tasks Memory Swap CPU +right_meter_modes=2 2 2 1 diff --git a/.config/neomutt/neomuttrc b/.config/neomutt/neomuttrc index 703e3bb..b42e312 100644 --- a/.config/neomutt/neomuttrc +++ b/.config/neomutt/neomuttrc @@ -6,6 +6,7 @@ source neomuttrc.d/powerline.neomuttrc unset help set mailcap_path = ~/.config/neomutt/mailcap +set mime_type_query_command = "file --mime-type -b %s" set sort = threads set sort_aux = reverse-last-date-received set strict_threads diff --git a/.config/neomutt/neomuttrc.d/powerline.neomuttrc b/.config/neomutt/neomuttrc.d/powerline.neomuttrc index fa3ec1f..5f6c9f8 100644 --- a/.config/neomutt/neomuttrc.d/powerline.neomuttrc +++ b/.config/neomutt/neomuttrc.d/powerline.neomuttrc @@ -13,9 +13,9 @@ set vfolder_format = " %N %?n?%3n& ? %8m  · %f" set attach_format = "%u%D  %T%-75.75d %?T?%& ? %5s · %m/%M" # no addressed to me, to me, group, cc, sent by me, mailing list -set to_chars="" +set to_chars="" # unchanged mailbox, changed, read only, attach mode -set status_chars = " " +set status_chars = " " ifdef crypt_chars set crypt_chars = " " set flag_chars = " " diff --git a/.config/nvim/after/ftplugin/css.vim b/.config/nvim/after/ftplugin/css.vim deleted file mode 100644 index cb50a73..0000000 --- a/.config/nvim/after/ftplugin/css.vim +++ /dev/null @@ -1,2 +0,0 @@ -let b:ale_linters = ['stylelint'] -let b:ale_fixers = ['stylelint'] diff --git a/.config/nvim/after/ftplugin/html.vim b/.config/nvim/after/ftplugin/html.vim deleted file mode 100644 index 6a20171..0000000 --- a/.config/nvim/after/ftplugin/html.vim +++ /dev/null @@ -1,2 +0,0 @@ -" let b:ale_linters = ['tidy'] -" let b:ale_fixers = ['prettier'] diff --git a/.config/nvim/after/ftplugin/markdown.vim b/.config/nvim/after/ftplugin/markdown.vim index 5abbdae..37f6070 100644 --- a/.config/nvim/after/ftplugin/markdown.vim +++ b/.config/nvim/after/ftplugin/markdown.vim @@ -1,12 +1,11 @@ setlocal nonumber norelativenumber laststatus=0 showmode setlocal signcolumn=no textwidth=80 wrap sw=2 -setlocal tabstop=2 expandtab softtabstop=2 linebreak +setlocal tabstop=2 noexpandtab softtabstop=0 linebreak setlocal autoindent ruler colorcolumn=80 setlocal spell spelllang=es,en_us,cjk setlocal formatoptions& -setlocal formatoptions+=tqn +setlocal formatoptions+=tqnw setlocal formatlistpat=^\\s*\\(\\d\\+\\\|[a-z]\\)[\\].)]\\s* -set complete+=kspell " Spellcheck nnoremap [s diff --git a/.config/nvim/after/ftplugin/tex.vim b/.config/nvim/after/ftplugin/tex.vim index 4a21a4d..c38c638 100644 --- a/.config/nvim/after/ftplugin/tex.vim +++ b/.config/nvim/after/ftplugin/tex.vim @@ -1,2 +1,2 @@ -setlocal spell spelllang=es_AR,en_us +setlocal spell spelllang=es,en_us inoremap u[s1z=`]au diff --git a/.config/nvim/after/ftplugin/vim.vim b/.config/nvim/after/ftplugin/vim.vim index cad5b94..b2be616 100644 --- a/.config/nvim/after/ftplugin/vim.vim +++ b/.config/nvim/after/ftplugin/vim.vim @@ -1 +1 @@ -let b:ale_linters = ['vint'] +" let b:ale_linters = ['vint'] diff --git a/.config/nvim/after/ftplugin/zsh.vim b/.config/nvim/after/ftplugin/zsh.vim index ed6f38f..6f78fab 100644 --- a/.config/nvim/after/ftplugin/zsh.vim +++ b/.config/nvim/after/ftplugin/zsh.vim @@ -1,2 +1 @@ setlocal shiftwidth=2 - diff --git a/.config/nvim/after/plugin/coc.vim b/.config/nvim/after/plugin/coc.vim index 1fc558a..09c8474 100644 --- a/.config/nvim/after/plugin/coc.vim +++ b/.config/nvim/after/plugin/coc.vim @@ -54,6 +54,8 @@ else inoremap (pumvisible() ? (col('.') > 1 ? 'i' : 'i') : '') . \ '=pumvisible() ? "\C-n>\C-p>\Down>" : ""' " open user completion menu closing previous if open and opening new menu without changing the text - inoremap (pumvisible() ? (col('.') > 1 ? 'i' : 'i') : '') . + inoremap (pumvisible() ? (col('.') > 1 ? 'i' : 'i') : '') . \ '=pumvisible() ? "\C-n>\C-p>\Down>" : ""' + + packadd AutoComplPop endif diff --git a/.config/nvim/autoload/dead/colores.vim b/.config/nvim/autoload/dead/colores.vim index c5c8f69..b80e19f 100644 --- a/.config/nvim/autoload/dead/colores.vim +++ b/.config/nvim/autoload/dead/colores.vim @@ -6,6 +6,7 @@ function! dead#colores#MyHighlights() abort endfunction function! dead#colores#Maquillaje() abort + highlight! Normal guibg=NONE highlight! VertSplit ctermbg=NONE ctermfg=0 cterm=NONE guibg=NONE guifg=#080808 gui=NONE highlight! TabLineFill ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=#ef2f27 gui=NONE highlight! TablineSel ctermbg=NONE ctermfg=234 guibg=NONE guifg=#008bbd @@ -18,6 +19,11 @@ function! dead#colores#Maquillaje() abort highlight! DiffAdded guifg=#333333 highlight! PmenuThumb guifg=#333333 + highlight! SpellBad ctermfg=203 cterm=underline guifg=#ff5f5f + highlight! link SpellLocal SpellBad + highlight! link SpellRare SpellBad + highlight! link SpellCap SpellBad + highlight! link Folded Comment highlight! link NonText VertSplit diff --git a/.config/nvim/autoload/dead/functions.vim b/.config/nvim/autoload/dead/functions.vim index 9419a06..ffe0d60 100644 --- a/.config/nvim/autoload/dead/functions.vim +++ b/.config/nvim/autoload/dead/functions.vim @@ -1,24 +1,23 @@ function! dead#functions#PopOutOfInsertMode() abort - if v:insertmode - call feedkeys("\\") - endif + if v:insertmode + call feedkeys("\\") + endif endfunction function! dead#functions#Relativize(v) abort - if &number - let &relativenumber = a:v - let &cursorline = a:v - endif + if &number + let &cursorline = a:v + endif endfunction function! dead#functions#JumpToNextHeading(direction, count) - let col = col(".") - silent execute a:direction == "up" ? '?^#' : '/^#' - if a:count > 1 - silent execute "normal! " . repeat("n", a:direction == "up" && col != 1 ? a:count : a:count - 1) - endif - silent execute "normal! " . col . "|" - unlet col + let col = col(".") + silent execute a:direction == "up" ? '?^#' : '/^#' + if a:count > 1 + silent execute "normal! " . repeat("n", a:direction == "up" && col != 1 ? a:count : a:count - 1) + endif + silent execute "normal! " . col . "|" + unlet col endfunction function! dead#functions#NewMail() diff --git a/.config/nvim/autoload/dead/statusline.vim b/.config/nvim/autoload/dead/statusline.vim index 168aab3..cd663b2 100644 --- a/.config/nvim/autoload/dead/statusline.vim +++ b/.config/nvim/autoload/dead/statusline.vim @@ -78,7 +78,7 @@ function! dead#statusline#LinterStatus() abort let l:all_errors = l:counts.error + l:counts.style_error let l:all_non_errors = l:counts.total - l:all_errors return l:counts.total == 0 ? '' : printf( - \ ' :%d  :%d', + \ ' :%d  :%d', \ l:all_non_errors, \ l:all_errors \) diff --git a/.config/nvim/plugin/fm.vim b/.config/nvim/plugin/fm.vim index ac49614..177c0ef 100644 --- a/.config/nvim/plugin/fm.vim +++ b/.config/nvim/plugin/fm.vim @@ -1,5 +1,6 @@ let g:netrw_dirhistmax=0 let g:netrw_banner = 0 +let g:netrw_liststyle= 3 let g:fzf_layout = { 'window': { 'width': 0.8, 'height': 0.8 } } diff --git a/.config/nvim/plugin/mappings/insert.vim b/.config/nvim/plugin/mappings/insert.vim index feee1ad..7cd59c2 100644 --- a/.config/nvim/plugin/mappings/insert.vim +++ b/.config/nvim/plugin/mappings/insert.vim @@ -5,9 +5,16 @@ inoremap u inoremap u -" Better nav for omnicomplete -inoremap ("\") -inoremap ("\") +" Navigate the complete menu items like CTRL+n / CTRL+p would. +inoremap pumvisible() ? "" :"" +inoremap pumvisible() ? "" : "" + +" Select the complete menu item like CTRL+y would. +inoremap pumvisible() ? "" : "" +inoremap pumvisible() ? "" :"" + +" Cancel the complete menu item like CTRL+e would. +inoremap pumvisible() ? "" : "" " Exit insert, dd line, enter insert inoremap ddi diff --git a/.config/nvim/plugin/settings.vim b/.config/nvim/plugin/settings.vim index 7f9681a..9ce9a32 100644 --- a/.config/nvim/plugin/settings.vim +++ b/.config/nvim/plugin/settings.vim @@ -34,7 +34,6 @@ set softtabstop=2 set shiftround set linebreak set breakindent -set expandtab set nosmarttab set title set redrawtime=500 @@ -43,6 +42,7 @@ set nowritebackup set undofile set undolevels=1000 set undoreload=10000 +set complete+=kspell set completeopt=menu,menuone,noinsert,noselect set listchars+=precedes:<,extends:> set diffopt+=algorithm:histogram,indent-heuristic diff --git a/.config/tmux/tmux.conf b/.config/tmux/tmux.conf index 9199130..c5152ad 100644 --- a/.config/tmux/tmux.conf +++ b/.config/tmux/tmux.conf @@ -95,11 +95,12 @@ bind-key Tab choose-window bind-key Enter new-window bind-key Space last-window bind-key w choose-tree -Zw "swap-window -t '%%'" +bind-key p choose-tree -Zw "swap-pane -t '%%'" bind-key W command-prompt -I "#W" "rename-window '%%'" # Copy/paste. Seleccionar texto con el mouse lo copia automaticamente al clipboard bind-key b list-buffers -bind-key P choose-buffer +bind-key B choose-buffer bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe-and-cancel "xclip -in -selection clipboard" bind-key -T copy-mode-vi 'v' send -X begin-selection bind-key -T copy-mode-vi 'y' send -X copy-pipe-and-cancel 'xclip -in -selection clipboard' diff --git a/.config/zsh/conf/03_aliases.zsh b/.config/zsh/conf/03_aliases.zsh index 1934429..2919856 100644 --- a/.config/zsh/conf/03_aliases.zsh +++ b/.config/zsh/conf/03_aliases.zsh @@ -12,6 +12,7 @@ alias \ nb='newsboat -q' \ py='python ' \ ttx='txtnish timeline' \ + ytv='straw-viewer' \ vdf='nvim -d' \ irc='catgirl' \ play='mpd && ncmpcpp' \ @@ -53,7 +54,6 @@ alias \ hxa='hx add -v' \ hxu='hx add -vu' \ hxc='hx commit' \ - hxp='hx push' \ hxs='hx status' \ hxl='hx log --stat' \ hxd='hx rm -r --cached' \ diff --git a/.local/bin/bspmonis b/.local/bin/bspmonis index ef2669d..49a96cc 100755 --- a/.local/bin/bspmonis +++ b/.local/bin/bspmonis @@ -4,11 +4,26 @@ NUM=$(bspc query -M --names | awk 'END {print NR}') if [ "$NUM" = 1 ]; then bspc monitor -d 1 2 3 4 5 6 7 8 9 10 + bspc config top_padding 0 + bspc config bottom_padding 0 + bspc config single_monocle true + bspc config borderless_monocle true bspc rule -a Firefox:Navigator state=tiled desktop='^2' + hsetroot -solid #080808 elif [ "$NUM" = 2 ]; then pri=$(bspc query -M --names | awk NR==1) sec=$(bspc query -M --names | awk NR==2) bspc monitor "$pri" -d 1 2 3 4 5 bspc monitor "$sec" -d 6 7 8 9 10 + bspc config -m "$pri" top_padding 0 + bspc config -m "$pri" bottom_padding 0 + bspc config -m "$sec" top_padding 3 + bspc config -m "$sec" bottom_padding 23 + bspc config single_monocle false + bspc config borderless_monocle false bspc rule -a Firefox:Navigator state=tiled desktop='^6' + randbg & fi + +bspc config left_padding 0 +bspc config right_padding 0 diff --git a/.local/bin/notifocus b/.local/bin/notifocus index 38d9fdb..226c661 100755 --- a/.local/bin/notifocus +++ b/.local/bin/notifocus @@ -1,3 +1,3 @@ #!/bin/sh -dunstify -a BSPWM -u low -r 5769 -t 1000 "$(bspc query -D -d --names)" +dunstify -a BSPWM -u low -r 5769 -t 1000 -i "/home/deadguy/.local/share/icons/Haiku/scalable/devices/video-display.svg" "$(bspc query -D -d --names)" diff --git a/.local/sv/wallpaper/run b/.local/sv/wallpaper/run index 42559d9..d86ee25 100755 --- a/.local/sv/wallpaper/run +++ b/.local/sv/wallpaper/run @@ -1,3 +1,5 @@ #!/bin/sh -exec snooze -H \* -s 1h -t ./timefile sh -c 'randbg ; touch ./timefile' +conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }') + +[ "$conectados" = 2 ] && exec snooze -H \* -s 1h -t ./timefile sh -c 'randbg ; touch ./timefile' || exit diff --git a/.zshenv b/.zshenv index 9652228..60e8136 100644 --- a/.zshenv +++ b/.zshenv @@ -33,19 +33,15 @@ eval $(keychain --dir ~/.local/share/keychain --quiet --eval --noask --agents ss export NOTMUCH_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/notmuch-config" export WGETRC="${XDG_CONFIG_HOME:-$HOME/.config}/wget/wgetrc" -export WEECHAT_HOME="${XDG_CONFIG_HOME:-$HOME/.config}/weechat" export NPM_CONFIG_USERCONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/npm/npmrc" export NODE_REPL_HISTORY="${XDG_DATA_HOME:-$HOME/.local/share}/node_repl_history" export RANDFILE="${XDG_DATA_HOME:-$HOME/.local/share}/rnd" export GOPATH="${XDG_DATA_HOME:-$HOME/.local/share}/go" -export ANSIBLE_CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}/ansible/ansible.cfg" -export HISTFILE="${XDG_DATA_HOME:-$HOME/.local/share}/bash/history" export HIGHLIGHT_OPTIONS='--out-format="ansi" --style="pablo"' export GTK2_RC_FILES="${XDG_CONFIG_HOME:-$HOME/.config}/gtk-2.0/gtkrc-2.0" export QT_QPA_PLATFORMTHEME="gtk3" export LYNX_LSS="${XDG_CONFIG_HOME:-$HOME/.config}/lynx.lss" export ELINKS_CONFDIR="${XDG_CONFIG_HOME:-$HOME/.config}/elinks" -export NNTPSERVER="news.tilde.club" _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_DATA_HOME:-$HOME/.local/share}/java " _JAVA_OPTIONS+="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true " diff --git a/doc/xbpaketes b/doc/xbpaketes index 2b82600..9af4323 100644 --- a/doc/xbpaketes +++ b/doc/xbpaketes @@ -5,7 +5,6 @@ alsa-plugins-jack alsa-plugins-pulseaudio alsa-utils android-udev-rules -ansible atool base-system bat @@ -16,7 +15,6 @@ catgirl chrony cpupower cryptsetup -ctags delta delve dfc @@ -30,7 +28,6 @@ ffmpeg figlet file-roller firefox -fluidsynth freepats fzf gcc @@ -56,7 +53,6 @@ intel-ucode isync iwd jack -jq keychain krita lf @@ -75,6 +71,7 @@ mpd mpv msmtp ncmpcpp +ncurses-devel ncurses-term neomutt neovim @@ -87,10 +84,8 @@ notmuch noto-fonts-cjk noto-fonts-emoji noto-fonts-ttf -obs openjdk11 p7zip -pandoc pass patch pinentry-gtk @@ -101,15 +96,12 @@ powertop pulseaudio pulsemixer python3 -python3-ansible-lint python3-pip -python3-tkinter +python3-urwid qjackctl ripgrep rkhunter rofi -rpi-imager -sc3-plugins setxkbmap shellcheck shfmt @@ -117,27 +109,23 @@ simple-mtpfs slrn snooze socklog-void +straw-viewer sxhkd sxiv texlive-bin thermald -timidity tmux toilet transmission tremc udevil -udisks2 unclutter-xfixes unrar unzip void-repo-nonfree vsv -weechat -weechat-python xbacklight xclip -xcompmgr xdg-utils xdo xev