Varios cambios a cosas que ya me olvide porque estuve ocupado.

este es el ultimo commit antes de instalar el ssd. deseenme suerte.

.config/X11/xinitrc

@@ -1,8 +1,7 @@
 #!/bin/sh
 
-setxkbmap -model pc105 -layout latam,latam -variant ,cmk_ed_ks -option caps:escape,grp:shifts_toggle,grp_led:caps
 xsetroot -cursor_name left_ptr &
-sctd &
+sct 5200
 xrdb -merge "$XDG_CONFIG_HOME/X11/xresources"
 
 conectados=$(xrandr | awk '( $2 == "connected" ) { count++ } END { print count }')

.config/copy to etc/00-keyboard.conf

@@ -4,7 +4,8 @@
 Section "InputClass"
         Identifier "system-keyboard"
         MatchIsKeyboard "on"
-        Option "XkbLayout" "latam"
+        Option "XkbLayout" "latam,latam"
         Option "XkbModel" "pc105"
-        Option "XkbOptions" "terminate:ctrl_alt_bksp"
+	Option "XkbVariant" ",cmk_ed_ks"
+        Option "XkbOptions" "caps:escape,terminate:ctrl_alt_bksp,grp:shifts_toggle,grp_led:caps"
 EndSection

.config/nvim/autoload/dead/colores.vim

@@ -15,12 +15,12 @@ endfunction
 
 function! dead#colores#Barra() abort
     highlight User1 ctermbg=NONE ctermfg=251  cterm=none guibg=NONE guifg=#333333
-    highlight User2 ctermbg=NONE ctermfg=234  cterm=none guibg=NONE guifg=#c4384b gui=bold
+    highlight User2 ctermbg=NONE ctermfg=1    cterm=bold guibg=NONE guifg=#c4384b gui=bold
-    highlight User3 ctermbg=4    ctermfg=234  cterm=none guibg=NONE guifg=#008bb4 gui=bold
+    highlight User3 ctermbg=NONE ctermfg=12   cterm=bold guibg=NONE guifg=#008bb4 gui=bold
-    highlight User4 ctermbg=251  ctermfg=234  cterm=none guibg=NONE guifg=#C0C0C0 gui=bold
+    highlight User4 ctermbg=NONE ctermfg=7    cterm=bold guibg=NONE guifg=#C0C0C0 gui=bold
-    highlight User5 ctermbg=4    ctermfg=234  cterm=none guibg=NONE guifg=#e64eff gui=bold
+    highlight User5 ctermbg=NONE ctermfg=5    cterm=bold guibg=NONE guifg=#e64eff gui=bold
-    highlight User6 ctermbg=9    ctermfg=234  cterm=none guibg=NONE guifg=#fbad34 gui=bold
+    highlight User6 ctermbg=NONE ctermfg=11   cterm=bold guibg=NONE guifg=#fbad34 gui=bold
-    highlight User7 ctermbg=251  ctermfg=234  cterm=none guibg=NONE guifg=#407e4a gui=bold
+    highlight User7 ctermbg=NONE ctermfg=2    cterm=bold guibg=NONE guifg=#407e4a gui=bold
-    highlight User8 ctermbg=NONE ctermfg=NONE cterm=NONE guibg=NONE guifg=#c4ab39
+    highlight User8 ctermbg=NONE ctermfg=3    cterm=bold guibg=NONE guifg=#c4ab39
-    highlight User9 ctermbg=NONE ctermfg=251  cterm=NONE guibg=NONE guifg=#666666
+    highlight User9 ctermbg=NONE ctermfg=102  cterm=bold guibg=NONE guifg=#666666
 endfunction

.config/nvim/init.vim

@@ -34,11 +34,6 @@ let mapleader="\<SPACE>"
 let maplocalleader=','
 
 if exists('$DISPLAY')
-    aug Colores
-        au!
-        au ColorScheme * call dead#colores#Barra()
-        au ColorScheme * call dead#colores#Maquillaje()
-    aug END
     set termguicolors
     let g:srcery_transparent_background = 1
     let g:srcery_italic = 1
@@ -46,6 +41,11 @@ if exists('$DISPLAY')
     let g:srcery_underline = 1
     let g:srcery_undercurl = 1
 endif
+aug Colores
+    au!
+    au ColorScheme * call dead#colores#Barra()
+    au ColorScheme * call dead#colores#Maquillaje()
+aug END
 let g:srcery_underline_match_paren = 1
 colorscheme srcery
 

.config/nvim/plugin/gitgutter.vim

@@ -6,9 +6,3 @@ let g:gitgutter_set_sign_backgrounds = 1
 let g:gitgutter_grep = 'rg --color=never'
 
 let g:fugitive_summary_format = "%an\t%s"
-
-nmap {g       <Plug>(GitGutterPrevHunk)zz
-nmap }g       <Plug>(GitGutterNextHunk)zz
-nmap <Space>+ <Plug>(GitGutterStageHunk)
-nmap <Space>- <Plug>(GitGutterUndoHunk)
-nmap <Space>p <Plug>(GitGutterPreviewHunk)

.config/nvim/plugin/mappings/git.vim

@@ -1,9 +1,9 @@
 nmap <leader>tt :GitGutterLineHighlightsToggle<CR>
-nmap ghp <Plug>(GitGutterPreviewHunk)
+nmap <leader>+ <Plug>(GitGutterStageHunk)
-nmap ghu <Plug>(GitGutterUndoHunk)
+nmap <leader>- <Plug>(GitGutterUndoHunk)
-nmap ghs <Plug>(GitGutterStageHunk)
+nmap <leader>p <Plug>(GitGutterPreviewHunk)
-nmap {c <Plug>(GitGutterPrevHunk)
+nmap {g <Plug>(GitGutterPrevHunk)zz
-nmap }c <Plug>(GitGutterNextHunk)
+nmap }g <Plug>(GitGutterNextHunk)zz
 
 nnoremap <silent> <Leader>ff :G<CR>
 nnoremap <silent> <Leader>fc :GCheckout<CR>

.config/zsh/.zshrc

@@ -25,7 +25,7 @@ setopt MULTIOS              # Write to multiple descriptors.
 setopt AUTO_PARAM_SLASH     # Tab completing directory appends a slash
 setopt PROMPT_SUBST
 
- hash tmux 2>/dev/null && source "${ZDOTDIR}"/tmux.zsh
+hash tmux 2>/dev/null && source "${ZDOTDIR}"/tmux.zsh
 
 foreach programa (
 	doc/fzf/completion.zsh

.config/zsh/conf/00_prompt.zsh

@@ -4,6 +4,11 @@ function precmd() {
   elif [ "$NEW_LINE_BEFORE_PROMPT" -eq 1 ]; then
     echo "\n"
   fi
+  print -Pn "\e]0;zsh %(1j,%j job%(2j|s|); ,)%2~\a"
+}
+
+function preexec {
+  printf "\033]0;%s\a" "$1"
 }
 
 autoload -Uz vcs_info

.config/zsh/conf/03_aliases.zsh

@@ -1,22 +1,23 @@
 # Programas
 alias \
 		v='$EDITOR' \
-		x='xui' \
+		x='xbps-menu' \
 		m='neomutt' \
 		z='zathura' \
-		b='bombadillo' \
 		g='git' \
-		vv='vi' \
+		vv='nvi' \
-		se='doas vi' \
+		se='doas nvim' \
 		am='alsamixer -c 1' \
 		pm='pulsemixer' \
 		nb='newsboat -q' \
 		py='python ' \
+		irc='catgirl' \
 		ttx='txtnish timeline' \
 		ytv='straw-viewer' \
 		vdf='nvim -d' \
 		sxiv='sxiv-rifle' \
 		play='mpd && ncmpcpp' \
+		news='neomutt -G' \
 		mumble='barnard -certificate ~g./barnard/dgy.pem -insecure -password Texto-plano' \
 		pyserv='python -m http.server'
 
@@ -94,8 +95,11 @@ alias \
 		ping='ping -c 5' \
 		dd='dd status=progress' \
 		dfc='dfc -dmT' \
-		wget="wget --no-hsts" \
+		wget='wget --no-hsts'
-		links="links -g"
+
+if [[ -z $DISPLAY ]]; then
+		alias links='links -g'
+fi
 
 # Comandos
 alias \

.local/bin/cartero

@@ -3,12 +3,15 @@
 pgrep -x mbsync > /dev/null && exit
 ping -q -c 1 1.1.1.1 > /dev/null || exit
 
-ICON="$XDG_DATA_HOME/icons/Haiku/scalable/apps/claws-mail.svg"
+DATA="${XDG_DATA_HOME:-$HOME/.local/share}"
+CONFIG="${XDG_CONFIG_HOME:-$HOME/.config}"
+
+ICON="$DATA/icons/Haiku/scalable/apps/claws-mail.svg"
 
 syncandnotify() {
 	acc="$(echo "$account" | sed "s/.*\///")"
-	mbsync -c "$XDG_CONFIG_HOME"/isync/mbsyncrc "$acc"
+	mbsync -c "$CONFIG"/isync/mbsyncrc "$acc"
-	new=$(find "$XDG_DATA_HOME/mail/$acc/INBOX/new/" "$XDG_DATA_HOME/mail/$acc/Inbox/new/" "$XDG_DATA_HOME/mail/$acc/inbox/new/" -type f -newer "$XDG_CONFIG_HOME/neomutt/.mailsynclastrun" 2> /dev/null)
+	new=$(find "$DATA/mail/$acc/INBOX/new/" "$DATA/mail/$acc/Inbox/new/" "$DATA/mail/$acc/inbox/new/" -type f -newer "$CONFIG/neomutt/.mailsynclastrun" 2> /dev/null)
 	newcount=$(echo "$new" | sed '/^\s*$/d' | wc -l)
 	if [ "$newcount" -gt "0" ]; then
 		for file in $new; do
@@ -16,13 +19,15 @@ syncandnotify() {
 			from=$(awk '/^From: / && ++n ==1,/^\<.*\>:/' "$file" | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | awk '{ $1=""; if (NF>=3)$NF=""; print $0 }' | sed 's/^[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//')
 			subject=$(awk '/^Subject: / && ++n == 1,/^\<.*\>: / && ++i == 2' "$file" | head -n-1 | perl -CS -MEncode -ne 'print decode("MIME-Header", $_)' | sed 's/^Subject: //' | sed 's/^{[[:blank:]]*[\"'\''\<]*//;s/[\"'\''\>]*[[:blank:]]*$//' | tr -d '\n')
 
-			[ -n $DISPLAY ] && notify-send --app-name="neomutt" -i "$ICON" "Mensaje nuevo para $acc" "$from: $subject" &
+			if [ -n $DISPLAY ]; then
+				notify-send --app-name="neomutt" -i "$ICON" "Mensaje nuevo para $acc" "$from: $subject" &
+			fi
 		done
 	fi
 }
 
 if [ "$#" -eq "0" ]; then
-	accounts="$(awk '/^Channel/ {print $2}' "$XDG_CONFIG_HOME/isync/mbsyncrc")"
+	accounts="$(awk '/^Channel/ {print $2}' "$CONFIG/isync/mbsyncrc")"
 else
 	for arg in "$@"; do
 		[ "${arg%${arg#?}}" = '-' ] && opts="${opts:+${opts} }${arg}" && shift 1
@@ -37,4 +42,4 @@ done
 wait
 notmuch new 2> /dev/null
 
-touch "$XDG_CONFIG_HOME/neomutt/.mailsynclastrun"
+touch "$CONFIG/neomutt/.mailsynclastrun"

.local/bin/linkhandler

@@ -9,7 +9,12 @@ case "$1" in
 	*mkv|*webm|*mp4|*youtube.com/watch*|*youtube.com/playlist*|*youtu.be*|*hooktube.com*|*bitchute.com*)
 		setsid -f mpv -quiet "$1" >/dev/null 2>&1 ;;
 	*png|*jpg|*jpe|*jpeg|*gif)
-		curl -sL "$1" > "/tmp/$(echo "$1" | sed "s/.*\///")" && sxiv -N "flota" -bpa "/tmp/$(echo "$1" | sed "s/.*\///")"  >/dev/null 2>&1 & ;;
+		if [ -z $DISPLAY ]; then
+			curl -sL "$1" > "/tmp/$(echo "$1" | sed "s/.*\///")" && fbi "/tmp/$(echo "$1" | sed "s/.*\///")"  >/dev/null 2>&1 &
+	else
+			curl -sL "$1" > "/tmp/$(echo "$1" | sed "s/.*\///")" && sxiv -N "flota" -bpa "/tmp/$(echo "$1" | sed "s/.*\///")"  >/dev/null 2>&1 &
+		fi
+		;;
 	*)
 		if [ -f "$1" ]; then "$TERMINAL" -e "$EDITOR" "$1"
 	else setsid -f "$BROWSER" "$1" >/dev/null 2>&1; fi ;;

.local/bin/pantallazo

@@ -1,6 +1,6 @@
 #!/bin/sh
 
-file=$HOME/img/scrot/"$(date +%F_%H_%M)".png
+file="$HOME/img/scrot/$(date +%F_%H_%M).png"
 vent=$(bspc query -N -n .focused)
 icon="$XDG_DATA_HOME/icons/Haiku/scalable/apps/applets-screenshooter.svg"
 

.local/bin/ref

@@ -1,11 +1,9 @@
 #!/bin/sh
 
-MAINDIR="$HOME/doc/"
+MAINDIR="$HOME/img/"
-PIX="pixels"
-PET="c64"
 
-MENU="$(printf "Pixels\\nPetscii" | rofi -dmenu -p "  ")"
+MENU="$(printf "Pixel\\nText" | rofi -dmenu -p "  ")"
 case $MENU in
-  'Pixels') sxiv-rifle "$MAINDIR/$PIX/ref" >/dev/null 2>&1 ;;
+  'Pixel') sxiv-rifle "$MAINDIR/pixelart_ref" >/dev/null 2>&1 ;;
-  'Petscii') sxiv-rifle "$MAINDIR/$PET/ref" >/dev/null 2>&1;;
+  'Text') sxiv-rifle "$MAINDIR/textart_ref" >/dev/null 2>&1;;
 esac

.local/bin/txbar

@@ -1,21 +1,20 @@
 #!/bin/sh
 
-# if ! xset q &>/dev/null; then
 if [ -z $DISPLAY ]; then
     HEART='B'
-    WIFI='W '
+    WIFI='W'
     THERM='T'
 else
     HEART=' '
     WIFI='直'
-    THERM=''
+    THERM=' '
 fi
     MAIL='@'
 
 if [ -d /sys/class/power_supply/BAT0 ]; then
     battery_info="$(head -n 1 /sys/class/power_supply/BAT0/capacity)%"
     current_charge=$(echo "$battery_info" | grep -o '[0-9]\+%' | awk '{sub (/%/, "", $1); print $1}')
-    printf '#[fg=colour123] %s' "$HEART$current_charge"
+    printf '#[fg=colour123] %s' "$HEART $current_charge"
 fi
 
 unread="$(find "$XDG_DATA_HOME"/mail/*/[Ii][Nn][Bb][Oo][Xx]/new/* -type f | wc -l 2>/dev/null)"
@@ -28,10 +27,5 @@ if [ "$(cat /sys/class/net/w*/operstate)" = up ]; then
     printf '#[fg=colour184] %s' "$WIFI$net"
 fi
 
-# 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 '#[fg=colour184] %s' "$WIFI$net"
-# fi
-
 temp="$(sensors | awk '(/Core 0/){printf $3}' | sed 's/\.0//; s/+//')"
-printf '#[fg=default] %s' "$THERM $temp"
+printf '#[fg=default] %s' "$THERM$temp"

.local/bin/xui

@@ -7,13 +7,8 @@ fzf_opts() {
 	fzf -i -e -m +s \
 		--query="$argument_input" \
 		--select-1 \
-		--cycle \
-		--reverse \
-		--info=inline \
-		--header="TAB to (un)select. ENTER to run. ESC to quit." \
 		--preview-window=bottom:45%:wrap \
-		--preview 'xq -R {2} ' \
+		--preview 'xq -R {2} '
-		--prompt="Filter > " | awk '{print $2}'
 }
 
 install() {
@@ -61,7 +56,7 @@ hold() {
 }
 
 cache() {
-	doas xbps-remove -O
+	doas xbps-remove -Oo
 }
 
 sync() {

.local/sv/mailsync/run

@@ -1,3 +1,3 @@
 #!/bin/sh
 
-exec snooze -H'*' -M/15 -t ./timefile sh -c 'cartero ; touch ./timefile'
+exec snooze -H'*' -M/15 -t ./timefile sh -c '/home/deadguy/.local/bin/cartero ; touch ./timefile'

.mozilla/firefox/jropxmhz.NewDefault/user-overrides.js

@@ -0,0 +1,58 @@
+/*** MY OVERRIDES ***/
+user_pref("_user.js.parrot", "overrides section syntax error");
+
+/* why is this even an option */
+user_pref("dom.battery.enabled", false);
+
+/* middle mouse */
+user_pref("middlemouse.paste", false);
+user_pref("general.autoScroll", true);
+
+/* block access to camera and stuff */
+user_pref("permissions.default.camera", 2);
+user_pref("permissions.default.microphone", 2);
+user_pref("media.autoplay.default", 5);
+
+/* override recipe: enable session restore */
+user_pref("browser.startup.page", 3);
+user_pref("privacy.clearOnShutdown.history", false);
+user_pref("privacy.clearOnShutdown.cookies", false);
+user_pref("privacy.clearOnShutdown.sessions", false);
+user_pref("privacy.cpd.history", false);
+user_pref("browser.sessionstore.max_tabs_undo", 50);
+user_pref("network.cookie.lifetimePolicy", 2);
+
+/* backspace goes back */
+user_pref("browser.backspace_action", 0);
+
+/* for bookmarked sessions */
+user_pref("browser.tabs.loadBookmarksInTabs", true);
+
+/* i need my full screen for web development */
+user_pref("privacy.resistFingerprinting.letterboxing", false);
+user_pref("view_source.tab", true);
+user_pref("gfx.webrender.all", true);
+
+/* keyword searches */
+user_pref("keyword.enabled", true);
+
+/* dark theme */
+user_pref("ui.systemUsesDarkTheme", 1);
+user_pref("browser.display.background_color", "#080808");
+user_pref("toolkit.legacyUserProfileCustomizations.stylesheets", true);
+user_pref("browser.tabs.tabmanager", true);
+
+/* remove some bloat */
+user_pref("dom.push.userAgentID", "");
+user_pref("browser.startup.homepage_override.mstone", "ignore");
+user_pref("browser.messaging-system.whatsNewPanel.enabled", false);
+user_pref("extensions.pocket.enabled", false);
+user_pref("identity.fxaccounts.enabled", false);
+user_pref("browser.messaging-system.whatsNewPanel.enabled", false);
+user_pref("reader.parse-on-load.enabled", false);
+user_pref("browser.bookmarks.max_backups", 2);
+user_pref("browser.library.activity-stream.enabled", false);
+user_pref("browser.chrome.site_icons", false);
+user_pref("browser.newtabpage.activity-stream.feeds.favicon", false);
+
+user_pref("_user.js.parrot", "overrides section successful");

.zshenv

@@ -1,5 +1,5 @@
 # Programas y Opciones del Sistema {{{
-if [ -n "$NVIM_LISTEN_ADDRESS" ]; then
+if [[ -n "$NVIM_LISTEN_ADDRESS" ]]; then
 	export EDITOR="nvr -cc tabedit --remote-wait +'set bufhidden=wipe'"
 else
 	export EDITOR="nvim"
@@ -10,7 +10,7 @@ export VISUAL="$EDITOR"
 export GIT_EDITOR="$EDITOR"
 export TERMINAL="alacritty"
 export COLORTERM="truecolor"
-export BROWSER="${${DISPLAY:-links}:+firefox}"
+export BROWSER="firefox"
 export OPENER="xdg-open"
 export PAGER="less"
 export FILE="lf"
@@ -43,6 +43,7 @@ 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:119"
 
 _JAVA_OPTIONS="-Djava.util.prefs.userRoot=${XDG_DATA_HOME:-$HOME/.local/share}/java "
 _JAVA_OPTIONS+="-Dawt.useSystemAAFontSettings=on -Dswing.aatext=true "
@@ -72,7 +73,6 @@ export FZF_VIM_LOG=$(git config --get alias.l | awk '{$1=""; print $0;}' | tr -d
 # }}}
 # Less {{{
 export LESSCHARSET=UTF-8
-# export LESS=-MR
 export LESS=FRXix4
 export LESS_TERMCAP_mb="$(printf '%b' '')"
 export LESS_TERMCAP_md="$(printf '%b' '')"

doc/xbpaketes

@@ -1,8 +1,6 @@
 ImageMagick
-MesaLib-devel
 alacritty
 alsa-plugins-ffmpeg
-alsa-plugins-jack
 alsa-plugins-pulseaudio
 alsa-utils
 android-udev-rules
@@ -10,9 +8,9 @@ atool
 base-system
 bat
 bc
-bombadillo
 bspwm
 catgirl
+cgo
 chrony
 cmake
 cpupower
@@ -26,16 +24,14 @@ elinks
 elogind
 faac
 fbgrab
-fbpdf
+fbida
 fd
 ffmpeg
-ffmpeg-devel
 figlet
 file-roller
 firefox
 font-b612
 font-hermit-otf
-fontconfig-devel
 freepats
 fzf
 gcc
@@ -47,6 +43,7 @@ gnupg2
 go
 golangci-lint
 gopls
+groff
 grub-i386-efi
 grub-x86_64-efi
 gzdoom
@@ -59,13 +56,9 @@ i3lock-color
 inetutils-telnet
 intel-ucode
 isync
-jack
 keychain
 krita
 lf
-libX11-devel
-libXcursor-devel
-libXi-devel
 libopenal
 libressl-devel
 librsvg
@@ -82,7 +75,6 @@ mpc
 mpd
 mpv
 msmtp
-musikcube
 ncmpcpp
 ncurses-devel
 ncurses-term
@@ -110,7 +102,6 @@ powertop
 pulsemixer
 python3
 python3-pip
-qjackctl
 ripgrep
 rkhunter
 rofi
@@ -120,22 +111,22 @@ setxkbmap
 shellcheck
 shfmt
 simple-mtpfs
+slrn
 snooze
 socklog-void
 straw-viewer
 sxhkd
 sxiv
-texlive-bin
 thermald
 tmux
 tnftp
-toilet
 transmission
 tremc
 udevil
 unclutter-xfixes
 unrar
 unzip
+vis
 void-repo-nonfree
 vsv
 xbacklight