chau zplugin. actualizaciones a wm, teclas, mutt, tapa. borre cosas viejas

2019-04-07 19:18:49 -03:00 · 2019-04-07 19:18:49 -03:00 · f8f3fdd56d
parent 6eb0b10a8d
commit f8f3fdd56d
34 changed files with 817 additions and 5497 deletions
--- a/.Xresources
+++ b/.Xresources
@ -36,8 +36,8 @@
 *.color15:      #e6e6e6

 !URxvt.font:                   xft:sarasatermj:size=10
-URxvt.font:                   xft:monaco:size=8
 !URxvt.font:                   -t-cherry-medium-r-normal--13-120-96-96-c-100-iso8859-1
+URxvt.font:                   xft:monaco:size=8
 URxvt.boldFont:
 URxvt.perl-ext-common:        default,clipboard,url-select
 URxvt.urlLauncher:            /usr/bin/firefox -new-tab
@ -53,6 +53,10 @@ URxvt.print-pipe:             "cat > /dev/null"
 URxvt.keysym.Shift-Control-C: perl:clipboard:copy
 URxvt.keysym.Shift-Control-V: perl:clipboard:paste
 URxvt.keysym.M-u:             perl:url-select:select_next
+URxvt.keysym.C-minus:         resize-font:smaller
+URxvt.keysym.C-equal:         resize-font:bigger
+URxvt.keysym.C-0:      	      resize-font:reset
+URxvt.keysym.C-question:      resize-font:show
 URxvt.clipboard.autocopy:     true
 URxvt.intensityStyles:        false
 URxvt*internalBorder:         12
@ -78,4 +82,11 @@ Xft.hinting: 1
 Xft.antialias: 1
 Xft.rgba: rgb

-Xcursor.theme: Alkano
+Xcursor.theme: Alkano
+
+sxiv.font: tamzen:size=9
+sxiv.barForeground: #d3d7cf
+sxiv.barBackground: #080808
+sxiv.background: #f5f5f5
+sxiv.fsColor: #f5f5f5
+sxiv.selColor: #f9c168
--- a/.config/bspwm/autostart
+++ b/.config/bspwm/autostart
@ -1,8 +0,0 @@
-hsetroot -fill /home/deadguy/Pictures/wallpaper/wallhaven-559044.png &
-#~/.config/polybar/launch.sh &
-# redshift -c ~/.config/redshift/redshift.conf &
-dunst -conf ~/.config/dunst/dunstrc &
-sleep 1s
-unclutter &
-mpd &
-urxvtd -q -o -f
--- a/.config/bspwm/bspwmrc
+++ b/.config/bspwm/bspwmrc
@ -1,7 +1,7 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euf -o pipefail

-#bspc monitor LVDS1 -d 1 2 3 4 5 6 7 8 9 10
-multipantalla &
+bspc monitor -d 1 2 3 4 5 6 7 8 9 10

 gap=8
 pad=6
@ -19,8 +19,11 @@ bspc config left_padding                0
 bspc config right_padding               0
 bspc config bottom_padding              0

+for side in top right bottom left; do
+	bspc config ${side}_monocle_padding -"$(bspc config ${side}_padding)"
+done
+
 # Settings
-bspc config paddingless_monocle         true
 bspc config gapless_monocle             true
 bspc config borderless_monocle          true
 bspc config single_monocle              true
@ -29,6 +32,7 @@ bspc config remove_disabled_monitors    true
 bspc config ignore_ewmh_focus           true
 bspc config honor_size_hints            false
 bspc config directional_focus_tightness low
+bspc config automatic_scheme            longest_side
 bspc config initial_polarity            second_child
 bspc config click_to_focus              any
 bspc config pointer_modifier            mod4
@ -69,10 +73,7 @@ bspc rule -a Nm-connection-editor       state=floating
 bspc rule -a Godot                      state=floating
 bspc rule -a Pinentry                   state=floating
 bspc rule -a URxvt:flota                state=floating
-bspc rule -a System-config-printer.py   state=floating
-bspc rule -a X64                        state=floating
 bspc rule -a Toplevel                   state=floating
-bspc rule -a WxPSeInt.bin               state=floating
 bspc rule -a Firefox                    state=floating
 bspc rule -a VChar64                    state=floating

@ -81,7 +82,12 @@ bspc rule -a Zathura                    state=tiled
 bspc rule -a Oblogout                   state=fullscreen, layer=above
 bspc rule -a Firefox:Navigator          state=tiled

-bspc config external_rules_command "$HOME/.config/bspwm/external_rules.sh"
+bspc rule -a Firefox desktop='^2'
+bspc rule -a URxvt:archi desktop='^3'
+bspc rule -a Termite:multi desktop='^1'

-# shellcheck source=/dev/null
-. "$HOME/.config/bspwm/autostart"
+#bspc config external_rules_command "$HOME/.config/bspwm/external_rules.sh"
+
+hsetroot -fill /home/deadguy/Pictures/wallpaper/minimalist-wallpaper-space_512674.jpg &
+unclutter &
+urxvtd -q -o -f
--- a/.config/mutt/etc/muttcol
+++ b/.config/mutt/etc/muttcol
@ -1,71 +0,0 @@
-# vim: filetype=neomuttrc
-
-# Default index colors:
-color index yellow default '.*'
-color index_author red default '.*'
-color index_number blue default
-color index_subject cyan default '.*'
-
-# For new mail:
-color index brightyellow black "~N"
-color index_author brightred black "~N"
-color index_subject brightcyan black "~N"
-
-# Header colors:
-color header blue default ".*"
-color header brightmagenta default "^(From)"
-color header brightcyan default "^(Subject)"
-color header brightwhite default "^(CC|BCC)"
-
-mono bold bold
-mono underline underline
-mono indicator reverse
-mono error bold
-color normal default default
-color indicator brightblack white
-color sidebar_highlight red default
-color sidebar_divider brightblack black
-color sidebar_flagged red black
-color sidebar_new green black
-color normal brightyellow default
-color error red default
-color tilde black default
-color message cyan default
-color markers red white
-color attachment white default
-color search brightmagenta default
-color status brightyellow black
-color hdrdefault brightgreen default
-color quoted green default
-color quoted1 blue default
-color quoted2 cyan default
-color quoted3 yellow default
-color quoted4 red default
-color quoted5 brightred default
-color signature brightgreen default
-color bold black default
-color underline black default
-color normal default default
-
-color body brightred default "[\-\.+_a-zA-Z0-9]+@[\-\.a-zA-Z0-9]+" # Email addresses
-color body brightblue default "(https?|ftp)://[\-\.,/%~_:?&=\#a-zA-Z0-9]+" # URL
-color body green default "\`[^\`]*\`" # Green text between ` and `
-color body brightblue default "^# \.*" # Headings as bold blue
-color body brightcyan default "^## \.*" # Subheadings as bold cyan
-color body brightgreen default "^### \.*" # Subsubheadings as bold green
-color body yellow default "^(\t| )*(-|\\*) \.*" # List items as yellow
-color body brightcyan default "[;:][-o][)/(|]" # emoticons
-color body brightcyan default "[;:][)(|]" # emoticons
-color body brightcyan default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\
- |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\
- |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?"
-color body brightcyan default "[ ][*][^*]*[*][ ]?" # more emoticon?
-color body brightcyan default "[ ]?[*][^*]*[*][ ]" # more emoticon?
-color body red default "(BAD signature)"
-color body cyan default "(Good signature)"
-color body brightblack default "^gpg: Good signature .*"
-color body brightyellow default "^gpg: "
-color body brightyellow red "^gpg: BAD signature from.*"
-mono body bold "^gpg: Good signature"
-mono body bold "^gpg: BAD signature from.*"
-color body red default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]"
--- a/.config/mutt/mailcap
+++ b/.config/mutt/mailcap
@ -7,15 +7,33 @@
 image/gif; sxiv-gif %s; test=test -n "$DISPLAY"
 image/*; sxiv %s; test=test -n "$DISPLAY"
 video/*; setsid nohup mpv --quiet %s & disown; test=test -n "$DISPLAY"; copiousoutput
+audio/*; setsid nohup mpv --quiet %s & disown; test=test -n "$DISPLAY"; copiousoutput
 application/pdf; zathura %s & disown; test=test -n "$DISPLAY"

 # Autoview html
+#text/html; w3m -I %{charset} -T text/html; copiousoutput
+#text/html;      ~/.config/mutt/etc/view_attachment.sh %s html;     test=test -n "$DISPLAY"
 text/html; "$BROWSER" %s 2>/dev/null & disown; test=test -n "$DISPLAY"; needsterminal
-text/html; w3m -I %{charset} -T text/html; copiousoutput
-text/plain; nvim %s; copiousoutput
+text/html;      w3m %s;     nametemplate=%s.html;       needsterminal
+text/html;      w3m -v -F -T text/html -dump %s;        copiousoutput
+text/plain;     less %s;    edit=nvim;   compose=nvim;    needsterminal
+text/*;         less %s;    edit=nvim;   compose=nvim;    needsterminal

 application/pgp-encrypted; gpg -d '%s'; copiousoutput;

+application/x-zip;                  unzip -l %s;    copiousoutput
+application/zip;                    unzip -l %s;    copiousoutput
+application/x-rar;                  unrar l %s;     copiousoutput
+application/x-rar-compressed;       unrar l %s;     copiousoutput
+application/x-tar;                  tar -tvf %s;    copiousoutput
+application/x-tarz;                 tar -tvf %s;    copiousoutput
+application/x-gzip;                 tar -ztvf %s;   copiousoutput
+application/x-bzip2;                tar -jtvf %s;   copiousoutput
+application/x-bzip;                 tar -jtvf %s;   copiousoutput
+application/x-bzip-compressed-tar;  tar -jtvf %s;   copiousoutput
+application/x-7z-compressed;        7z l %s;        copiousoutput
+application/x-7z-compressed-tar;    7z l %s;        copiousoutput
+
 # 256 color images using half-width unicode characters
 # Much higher quality that img2txt, but must be built from source
 # https://github.com/rossy/img2xterm
--- a/.config/mutt/muttrc
+++ b/.config/mutt/muttrc
@ -1,138 +1,104 @@
 # vim: filetype=neomuttrc

-# External -------------------------------------
-source ~/.config/mutt/gpg.rc
-source etc/muttcol
-source etc/aliases
-source /home/deadguy/.config/mutt/accounts/.muttrc
+### Paths ### {{{
+## sidebar 'mailboxes' relies on 'folder'
+set folder              = "~/.mail"                     	   ## Mailbox location
+set alias_file          = "~/.config/mutt/alias"		       ## Where to store aliases
+set mailcap_path        = "~/.config/mutt/mailcap"             ## Entries for filetypes
+set tmpdir              = "~/.config/mutt/temp"                ## Where to keep temp files
+### End Paths ### }}}

-# Hacks -----------------------------------------
-# "from" field gets 30% of remaining space, "subject" gets 70%. Remaining space is the total width minus the other fields
-set my_index_format_pre='set my_col_from = `echo $((30 * ($(tput cols)-50) / 100))`; set my_col_subject = `echo $((70 * ($(tput cols)-50) / 100))`; set index_format="%2C   %Z %D %-$my_col_from.${my_col_from}'
-set my_index_format_post=' %-4.4c   %?M?<%M ?%-$my_col_subject.${my_col_subject}s"'
-
-folder-hook .*[sS]ent.* "$my_index_format_pre"t"$my_index_format_post"
-folder-hook ! .*[sS]ent.* "$my_index_format_pre"F"$my_index_format_post"
-
-# General Options -----------------------------------------
-set mailcap_path = ~/.config/mutt/mailcap
+### Basic Options ### {{{
+set wait_key = no           ## Shut up, mutt
+set mbox_type = Maildir     ## Mailbox type
+set timeout = 5             ## Idle time before scanning
+set mail_check = 10         ## Minimum time between scans
+unset move                  ## Gmail does that
+set delete                  ## Don't ask, just do
+unset confirmappend         ## Don't ask, just do!
+unset mark_old              ## Read/new is good enough for me
+set beep_new                ## Bell on new mails
+set pipe_decode             ## Strip headers and eval mimes when piping
+set thorough_search         ## Strip headers and eval mimes before searching
+set text_flowed = yes       ## Generate text/plain; format=flowed attachments.
 set imap_keepalive = 900
 set sleep_time = 0
-set timeout = "5"
-set mail_check = "10"
-set pipe_decode
-set thorough_search
 set send_charset="utf-8"
 set check_new = yes
 set smart_wrap = yes
 set allow_ansi = yes
 set markers = no
 set smtp_authenticators = 'gssapi:login'
-set wait_key = no
+### End Options }}}

-# Notmuch options ---------------------------------------
-set virtual_spoolfile=yes
-set folder=notmuch-root-folder
-source ~/.mailboxes
+### Sourcing ### {{{
+source "~/.config/mutt/gpg.rc"
+source "~/.config/mutt/muttcol"
+### End Sourcing }}}

-# Index Options -----------------------------------------
+### Index Options ### {{{
 set sort = threads                         # like gmail
 set sort_aux = reverse-last-date-received  # like gmail
 set uncollapse_jump						   # no collapse on unread message
 set sort_re                                # thread based on regex
-set reply_regexp      = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
+set reply_regexp = "^(([Rr][Ee]?(\[[0-9]+\])?: *)?(\[[^]]+\] *)?)*"
 set quote_regexp = "^( {0,4}[>|:#%]| {0,4}[a-z0-9]+[>|]+)+"
 set new_mail_command="notify-send -a neomutt -u normal 'You Got Mail' '%n new messages, %u unread.' &"
 set date_format ="%a %d %b %R"
 set index_format ="%2C %zs %?X?A& ? %D %-15.15F %s (%-4.4c)"
-#set index_format="%4C %Z %{%b %d %R} %-15.15L (%?l?%4l&%4c?) %s"
 set alias_format = " %4n %t %-20a %r "
+### End Index ### }}}

-# Header Options -------------------------------------
-set hdrs
-ignore "Authentication-Results:"
-ignore "DomainKey-Signature:"
-ignore "DKIM-Signature:"
-unignore from: to: cc: date: subject:
-unhdr_order *
-hdr_order date: from: to: subject: cc:
-unignore x-mailing-list: posted-to:
-unignore x-mailer:
-
-# Mail Options -------------------------------------
-set use_from = yes
-set envelope_from							# which from?
-set fast_reply								# skip to compose when replying
-set sendmail_wait = 1						# wait for sending to complete
-set attribution = "El %d, %n escribio:"		# set the attribution
-set reply_to								# reply to Reply to: field
-set skip_quoted_offset = 3
-set sig_dashes								# dashes before sig
-set edit_headers							# show headers when composing
-set fcc_attach								# save attachments with the body
-unset mime_forward							# forward attachments as part of body
-set forward_format = "Fwd: %s"				# format of subject when forwarding
-set forward_decode							# decode when forwarding
-set reverse_name							# reply as whomever it was to
-set include									# include message in replies
-set forward_quote							# include message in forwards
+### Pager Options ### {{{
 auto_view text/html
-auto_view application/pgp-encrypted
-auto_view application/pdf
-alternative_order text/plain text/enriched text/html
+alternative_order text/enriched text/plain text/html text
 set rfc2047_parameters = yes
+### End Pager ### }}}

-# Status Bar -----------------------------------------
-set status_chars  = " *%A"
-set status_format = "──┄┄╼ %f: %m Messages ╾┄┄──────────┈%?n? %n New?%?d?, %d to Delete?%?t?, %t Tagged?%?p?, %p Postponed?%?l? %l Total ?┈───%>─┤ %P ├───"
-color status magenta default
+### Index and Pager Bindings ### {{{
+bind index,pager g   noop            ## Removes error from next binding
+bind index,pager G   noop
+bind index,pager i   noop
+bind index \Cf       noop
+bind index,pager S   noop
+bind index,pager V   noop
+bind attach X        noop

-# Editor -------------------------------------
-set editor='nvim + -c "set nocp" -c "set textwidth=80" -c "set wrap" -c "silent /^$" -c "noh" -c "vmap <leader>s c[... snip ...]<ESC>"'
+bind index gg          first-entry
+bind index G           last-entry
+bind index <space>     collapse-thread
+bind index D           half-down
+bind index U           half-up
+bind index d           delete-message
+bind index u           undelete-message
+bind index <left>      previous-unread
+bind index <right>     next-unread
+bind index,pager R     group-reply
+bind index,pager <tab> sync-mailbox
+bind index,browser F   search

-# Sidebar -------------------------------------
-set sidebar_visible = yes
-set sidebar_width = 20
-set sidebar_short_path = yes
-set sidebar_next_new_wrap = yes
-set sidebar_folder_indent = yes
-set sidebar_new_mail_only = no
-set sidebar_sort_method = path
-set mail_check_stats
-set imap_check_subscribed = yes
-set sidebar_format = '%B%?F? [%F]?%* %?N?%N/? %?S?%S?'
+bind pager gg          top
+bind pager G           bottom
+bind pager <up>        previous-line
+bind pager <down>      next-line
+bind pager <left>      previous-undeleted
+bind pager <right>     next-undeleted

-# Bindings -------------------------------------
-bind index,pager i noop
-bind index,pager g noop
-bind index \Cf noop
-bind editor <space> noop
-bind index G last-entry
-bind index gg first-entry
-bind index F search
-bind pager <up> previous-line
-bind pager <down> next-line
-bind pager <left> previous-undeleted
-bind pager <right> next-undeleted
-bind index D half-down
-bind index U half-up
-bind index d delete-message
-bind index u undelete-message
-bind index <left> previous-unread
-bind index <right> next-unread
-bind index,pager R group-reply
-macro index,pager S '<sync-mailbox>
-bind index,pager k sidebar-prev
-bind index,pager j sidebar-next
-bind index,pager l sidebar-open
-bind index,pager B sidebar-toggle-visible
-bind attach <return> view-mailcap
+bind attach <return>   view-mailcap    ## View attachments properly.
+
+## Ctrl-R to mark all as read
+macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
+
+## Sync email
+macro index O "<shell-escape>offlineimap<enter>" "run offlineimap to sync all mail"
+macro index o "<shell-escape>offlineimap -qf INBOX<enter>" "run offlineimap to sync inbox"
+
+## Copy/move dialogs
+macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
+macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"

-# Macros -------------------------------------
 macro index,pager \CL "<enter-command>$my_index_format_pre"F"$my_index_format_post<enter><redraw-screen>"

-macro attach 'V' "<pipe-entry>cat >~/.cache/mutt/mail.html && $BROWSER ~/.cache/mutt/mail.html && rm ~/.cache/mutt/mail.html<enter>"
-
 macro index,pager U "<enter-command>set pipe_decode = yes<enter><pipe-message>urlview<enter><enter-command>set pipe_decode = no<enter>""view URLs"

 macro index,pager \Cu |urlscan\n
@ -143,17 +109,128 @@ macro index,pager \cb "<enter-command> set my_pdsave=\$pipe_decode<enter>\
        <pipe-message>extract_url<enter>\
        <enter-command> set pipe_decode=\$my_pdsave<enter>" "get URLs"

-macro index,pager <F1> '<sync-mailbox><enter-command>source /home/deadguy/.config/mutt/accounts/vidaar.muttrc<enter><change-folder>!<enter>'
+macro index,pager <F1> '<sync-mailbox><enter-command>source /home/deadguy/.config/mutt/accounts/alejo.muttrc<enter><change-folder>!<enter>'

 macro index,pager <F2> '<sync-mailbox><enter-command>source /home/deadguy/.config/mutt/accounts/alex.muttrc<enter><change-folder>!<enter>'

-#Ctrl-R to mark all as read
-macro index \Cr "T~U<enter><tag-prefix><clear-flag>N<untag-pattern>.<enter>" "mark all messages as read"
+macro index,pager V "<view-attachments><search>html<enter><view-mailcap><exit>"

-#sync email
-macro index O "<shell-escape>$HOME/bin/correo.sh<enter>" "run offlineimap to sync all mail"
-macro index o "<shell-escape>$HOME/bin/correo.sh -qf INBOX<enter>" "run offlineimap to sync inbox"
+macro attach 'X' "<pipe-entry>cat >~/.cache/mutt/mail.html && $BROWSER ~/.cache/mutt/mail.html && rm ~/.cache/mutt/mail.html<enter>"
+### End Bindings ### }}}

-#copy/move dialogs
-macro index C "<copy-message>?<toggle-mailboxes>" "copy a message to a mailbox"
-macro index M "<save-message>?<toggle-mailboxes>" "move a message to a mailbox"
+### Compose View Options ### {{{
+set use_from = yes
+set envelope_from							## which from?
+set fast_reply								## skip to compose when replying
+set autoedit                                ## Skip directly to composing
+set edit_headers                            ## Show headers when composing
+set fast_reply                              ## Skip to compose when replying
+set sendmail_wait = 1						## wait for sending to complete
+set attribution = "El %d, %n escribio:"		## set the attribution
+set reply_to								## reply to Reply to: field
+set sig_dashes								## dashes before sig
+set fcc_attach								## save attachments with the body
+set mime_forward = ask-no                   ## Forward attachments as attachments
+set forward_format = "Fwd: %s"				## format of subject when forwarding
+set forward_decode							## decode when forwarding
+set reverse_name							## reply as whomever it was to
+set include									## include message in replies
+set forward_quote							## include message in forwards
+set text_flowed = yes                       ## Eliminate odd line breaks
+set skip_quoted_offset = 3
+
+set editor='nvim + -c "set nocp" -c "set textwidth=80" -c "set wrap" -c "silent /^$" -c "noh" -c "vmap <leader>s c[... snip ...]<ESC>"'
+
+bind editor <Tab> complete
+bind editor ^T complete-query
+unset query_command
+### End Compose ### }}}
+
+### Sidebar Settings ### {{{
+set sidebar_visible = yes
+set sidebar_width = 20
+set sidebar_short_path = yes
+set sidebar_delim_chars = "/"       		# Delete mailbox name up to the last / character
+set sidebar_next_new_wrap = yes
+set sidebar_folder_indent = yes
+set sidebar_new_mail_only = no
+set sidebar_sort_method = path
+set mail_check_stats
+set imap_check_subscribed = yes
+set sidebar_format = '%B%?F? [%F]?%* %?N?%N/? %?S?%S?'
+
+bind index,pager k sidebar-prev
+bind index,pager j sidebar-next
+bind index,pager l sidebar-open
+bind index,pager B sidebar-toggle-visible
+### End Sidebar ### }}}
+
+### Notmuch options ### {{{
+set nm_default_uri="notmuch:///home/deadguy/.mail"  ## path to the maildir
+set virtual_spoolfile=yes                           ## enable virtual folders
+
+## sets up queries for virtual folders
+virtual-mailboxes \
+    "INBOX"         "notmuch://?query=tag:INBOX and NOT tag:archive" \
+    "Unread"        "notmuch://?query=tag:unread" \
+    "Starred"       "notmuch://?query=tag:*" \
+    "Sent"          "notmuch://?query=tag:sent" \
+    "Attachment"    "notmuch://?query=tag:attachment" \
+    "Signed"        "notmuch://?query=tag:signed" \
+    "Encrypted"     "notmuch://?query=tag:encrypted"
+
+exec sidebar-toggle-virtual     ## Show non virtual mail on load
+
+macro index X "<sidebar-toggle-virtual>"            				## Replace <change-vfolder> with useful toggle
+macro index \\\\ "<vfolder-from-query>"                             ## looks up a hand made query
+#macro index A "<modify-labels>+archive -unread -inbox\\n"           ## tag as Archived
+#macro index I "<modify-labels>-inbox -unread\\n"                    ## removed from inbox
+#macro index S "<modify-labels-then-hide>-inbox -unread +junk\\n"    ## tag as Junk mail
+#macro index + "<modify-labels>+*\\n<sync-mailbox>"                  ## tag as starred
+#macro index - "<modify-labels>-*\\n<sync-mailbox>"                  ## tag as unstarred
+macro index \CX "<modify-labels>+deleted\n"                         ## tag as deleted
+### End Notmuch ### }}}
+
+### Status Bar ### {{{
+set status_on_top = yes
+set status_chars  = " *%A"
+set status_format = "──┄┄╼ %f: %m Messages ╾┄┄──────────┈%?n? %n New?%?d?, %d to Delete?%?t?, %t Tagged?%?p?, %p Postponed?%?l? %l Total ?┈───%>─┤ %P ├───"
+color status magenta default
+### End Status Bar ### }}}
+
+### Header Options ### {{{
+ignore *                                ## Ignore all headers
+unignore from: to: cc: date: subject:   ## Show only these
+unhdr_order *                           ## Some distros order things
+hdr_order from: to: cc: date: subject:  ## And in this order
+### End Header ### }}}
+
+### Account Settings ### {{{
+## Multiple account setup
+
+## Default inbox.
+set spoolfile = "+alex/INBOX"
+source ~/.config/mutt/accounts/alex.muttrc
+
+## Set account specific options on folder change
+folder-hook alex/*                   source ~/.config/mutt/accounts/alex.muttrc
+folder-hook alejo/*                  source ~/.config/mutt/accounts/alejo.muttrc
+### End Account }}}
+
+### Assorted ### {{{
+## Fetches offlineimap mail
+#timeout-hook 'push "!~/bin/correo.sh &<enter>"'
+#startup-hook 'push "!~/bin/correo.sh &<enter>"'
+
+## Warns if replying to multiple recipt email
+reply-hook "~C 2" "set sleep_time=10\;echo 'Warning, original message has multiple recipients!'\;set sleep_time=1"
+
+## "from" field gets 30% of remaining space, "subject" gets 70%. Remaining space is the total width minus the other fields
+set my_index_format_pre='set my_col_from = `echo $((30 * ($(tput cols)-50) / 100))`; set my_col_subject = `echo $((70 * ($(tput cols)-50) / 100))`; set index_format="%2C   %Z %D %-$my_col_from.${my_col_from}'
+set my_index_format_post=' %-4.4c   %?M?<%M ?%-$my_col_subject.${my_col_subject}s"'
+
+folder-hook .*[sS]ent.* "$my_index_format_pre"t"$my_index_format_post"
+folder-hook ! .*[sS]ent.* "$my_index_format_pre"F"$my_index_format_post"
+### End Assorted }}}
+
+# vim:foldmethod=marker:foldlevel=0
--- a/.config/ncmpcpp/config
+++ b/.config/ncmpcpp/config
@ -27,12 +27,17 @@ empty_tag_color 						= blue
 state_flags_color 						= red

 # HEADER
-alternative_header_first_line_format    = "$8%t$9"
-alternative_header_second_line_format   = "$b$8{%a}|{%A} - %b$9$/b"
+#alternative_header_first_line_format    = "$8%t$9"
+#alternative_header_second_line_format   = "$b$8{%a}|{%A} - %b$9$/b"
+alternative_header_first_line_format = "$8$aqqu$/a$b {%t}|{%f} $/b$8$atqq$/a$9"
+alternative_header_second_line_format = "{{$8%a}{$8 - %b$9}{$8 (%y)$8}}|{%D$9}"
+

 # SONG
-song_list_format                        = "$4 %a $R $8 %t $5 %n $6 %l"
-song_status_format                      = "{$5%A$9 - }$3%b"
+#song_list_format                        = "$4 %a $R $8 %t $5 %n $6 %l"
+song_list_format = "{$5 $8 %t}|{$2►$2 <untitled>}|{$5►$8 %f} $5$R{$4 %a}|{$8 <unknown artist>} {$6   %l} "
+song_status_format = {$8%t}{$8 "%b"}|{$6 "%a"}$8
+#song_status_format                      = "{$5%A$9 - }$3%b"
 song_window_title_format                = "{%a - }{%t}{ [%b]}|{%f}"
 song_columns_list_format                = "(30)[blue]{a} (40)[red]{t|f} (30)[cyan]{br} (4f)[green]{lr}"

--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@ -47,7 +47,7 @@ Plug '/usr/bin/fzf'
 Plug 'junegunn/fzf.vim'
 " Modes
 Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
-Plug 'chrisbra/vim-diff-enhanced'
+"Plug 'chrisbra/vim-diff-enhanced'
 " Python
 Plug 'numirias/semshi', {'do': ':UpdateRemotePlugins'}
 "Plug 'hkupty/iron.nvim', { 'do': ':UpdateRemotePlugins' }
@ -58,7 +58,6 @@ Plug 'autozimu/LanguageClient-neovim', {
    \ 'do': 'bash install.sh',
 \ }
 call plug#end()
-"let g:plug_window = 'rightbelow topleft new'
 " }}}

 " Options {{{
@ -123,7 +122,7 @@ set laststatus=1                            " Status line on 2 or more files
 set nosmarttab
 set modeline
 set modelines=2
-set scrolloff=7                            " Keep this many lines padding when scrolling
+set scrolloff=3                            " Keep this many lines padding when scrolling
 set title
 set undofile
 set undolevels=1000
@ -387,9 +386,9 @@ autocmd! User GoyoLeave call <SID>goyo_leave()

 " Enhanced Diff {{{
 " started In Diff-Mode set diffexpr (plugin not loaded yet)
-if &diff
-    let &diffexpr='EnhancedDiff#Diff("git diff", "--diff-algorithm=patience")'
-endif
+""if &diff
+""    let &diffexpr='EnhancedDiff#Diff("git diff", "--diff-algorithm=patience")'
+""endif
 " }}}

 " Semshi {{{
--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@ -16,10 +16,10 @@ set vcs_backend_bzr disabled
 set vcs_backend_svn disabled
 set preview_images true
 set preview_images_method w3m
-set w3m_delay 0.02
+set w3m_delay 0.05
 set unicode_ellipsis true
 set show_hidden_bookmarks true
-set colorscheme default
+set colorscheme jungle
 set preview_files true
 set preview_directories true
 set collapse_preview true
--- a/.config/sxhkd/sxhkdrc
+++ b/.config/sxhkd/sxhkdrc
@ -8,14 +8,11 @@ super + f
 super + shift + f
 	bspc node -t $(bspc query -N -n -n .tiled >/dev/null && echo fullscreen || echo tiled)

-super + {_,shift,ctrl,alt} + {h,j,k,l}
-	{foco,mover,agrandar,presel}.sh {west,south,north,east}
+super + {_,shift,ctrl} + {h,j,k,l}
+	{foco,mover,agrandar}.sh {west,south,north,east}

-super + shift + minus
-	bspc window -p down
-
-super + bar
-	bspc window -p right
+super + alt + {h,j,k,l}
+	bspc node -p {west,south,north,east}

 super + alt + space
 	bspc node -p cancel
@ -35,9 +32,6 @@ alt + {_,shift} + Tab
 super + {comma,period}
 	bspc node @/ -R {90,270}

-#super + {_,shift} + ntilde
-#    bspc node $(bspc query -N -n .hidden | tail -n1) {-g hidden,-g hidden=off -f}
-
 super + {_,shift,ctrl} + ntilde
 	whid {hide,last,dmenu}

@ -57,14 +51,20 @@ super + {_,shift} + i
 	{bspc node -i,for win in `bspc query -N -d -n .leaf.!window`; do bspc node $win -k; done}

 # Run Applications
-super + {t,b,v,q,z,x,c}
-	{subl,firefox,pavucontrol,oblogout,termite -e termux,termite,kal}
+super + {t,b,v,q,x,c}
+	{subl,firefox,pavucontrol,oblogout,termite,kal}
+
+super + z
+	termite --name=multi -e termux

 super + {n,m}
 	urxvtc -name flota -e {nmtui,bmenu}

-super + {e,r}
-	 urxvtc -e {neomutt,ranger}
+super + e
+	 urxvtc -e neomutt
+
+super + r
+	urxvtc -name archi -e ranger

 super + {space,s}
 	rofi -show {drun,window}
@ -84,13 +84,7 @@ super + F1
 super + {F2,F3,F4,F5}
    {pila,tapa,actualizar,notifocus}

-super + F6
-	trayon
-
-@super + F6
-	trayoff
-
-super + plus
+super + ctrl + plus
 	xzoom

 # Media Keys
--- a/.config/termite/config
+++ b/.config/termite/config
@ -13,8 +13,7 @@ scrollback_lines = -10000
 search_wrap = true
 scrollbar = off
 #font = Sarasa Term J 10
-#font = xos4 terminus 10
-#font = t cherry 11
+#font = Tamzen 11
 font = Monaco Regular 8

 # "system", "on" or "off"
--- a/.config/zsh/1options.zsh
+++ b/.config/zsh/1options.zsh
@ -1,57 +0,0 @@
-export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
-HISTFILE="$HOME/.config/zsh/histfile"
-HISTSIZE=10000
-SAVEHIST=50000
-
-unsetopt beep
-unsetopt nomatch
-unsetopt menucomplete
-unsetopt flowcontrol
-unsetopt correctall
-setopt auto_cd
-setopt auto_param_keys
-setopt auto_param_slash
-setopt auto_remove_slash
-setopt complete_aliases
-setopt complete_in_word
-setopt glob_complete
-setopt hash_list_all
-setopt glob
-setopt extended_glob
-#setopt glob_dots
-setopt no_case_glob
-setopt numeric_glob_sort
-setopt mark_dirs
-setopt hist_ignore_all_dups
-setopt hist_ignore_space
-setopt inc_append_history
-setopt hist_reduce_blanks
-setopt hist_verify
-setopt hist_expand
-setopt extended_history
-setopt append_history
-setopt share_history
-#setopt hist_expire_dups_first
-setopt append_create
-setopt no_clobber
-setopt correct
-setopt interactive_comments
-setopt short_loops
-setopt auto_continue
-setopt auto_resume
-setopt bg_nice
-setopt local_loops
-setopt equals
-setopt magic_equal_subst
-setopt brace_ccl
-setopt rm_star_wait
-setopt rcexpandparam
-setopt no_checkjobs
-setopt printeightbit
-setopt auto_list
-setopt auto_name_dirs
-setopt always_to_end
-setopt list_types
-
-HELPDIR=/usr/share/zsh/$ZSH_VERSION/help
-WORDCHARS='*?_-.[]~=&;!#$%^(){}<>'
--- a/.config/zsh/2config.zsh
+++ b/.config/zsh/2config.zsh
@ -1,35 +0,0 @@
-autoload -Uz zcalc
-autoload -Uz run-help
-autoload -Uz run-help-git
-
-autoload -Uz surround
-zle -N delete-surround surround
-zle -N add-surround surround
-zle -N change-surround surround
-bindkey -a cs change-surround
-bindkey -a ds delete-surround
-bindkey -a ys add-surround
-bindkey -M visual S add-surround
-
-autoload -U select-bracketed
-autoload -U select-quoted
-zle -N select-quoted
-zle -N select-bracketed
-for km in visual viopp; do
-  bindkey -M $km -- '-' vi-up-line-or-history
-  for c in {a,i}${(s..)^:-\'\"\`\|,./:;-=+@}; do
-    bindkey -M $km $c select-quoted
-  done
-  for c in {a,i}${(s..)^:-'()[]{}<>bB'}; do
-    bindkey -M $km $c select-bracketed
-  done
-done
-
-# Zcalc stuff
-function __calc_plugin {
-  zcalc -e "$*"
-}
-aliases[calc]='noglob __calc_plugin'
-aliases[=]='noglob __calc_plugin'
-
-unalias run-help
--- a/.config/zsh/LS_COLORS
+++ b/.config/zsh/LS_COLORS
@ -1,710 +0,0 @@
-#                                    LS_COLORS
-# Maintainers: Magnus Woldrich <m@japh.se>,
-#              Ryan Delaney <ryan.delaney@gmail.com> OpenGPG: 0D98863B4E1D07B6
-#         URL: https://github.com/trapd00r/LS_COLORS
-#     Version: 0.254
-#     Updated: Tue Mar 29 21:25:30 AEST 2016
-#
-#   This is a collection of extension:color mappings, suitable to use as your
-#   LS_COLORS environment variable. Most of them use the extended color map,
-#   described in the ECMA-48 document; in other words, you'll need a terminal
-#   with capabilities of displaying 256 colors.
-#
-#   As of this writing, around 300 different filetypes/extensions is supported.
-#   That's indeed a lot of extensions, but there's a lot more! Therefore I need
-#   your help.
-#
-#   Fork this project on github, add the extensions you are missing, and send me
-#   a pull request.
-#
-#   For files that usually ends up next to each other, like html, css and js,
-#   try to pick colors that fit nicely together. Filetypes with multiple
-#   possible extensions, like htm and html, should have the same color.
-
-# This program is distributed in the hope that it will be useful, but WITHOUT ANY
-# WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS FOR A
-# PARTICULAR PURPOSE.  See the Perl Artistic License for more details.
-#
-# This program is free software: you can redistribute it and/or modify it under
-# the terms of the Perl Artistic License as published by the Perl Foundation,
-# either version 1.0 of the License, or (at your option) any later version.
-#
-# You should have received a copy of the Perl Artistic License along
-# with this program.  If not, see <http://www.perlfoundation.org/artistic_license_1_0>.
-
-# core {{{1
-BLK                   38;5;68
-CAPABILITY            38;5;17
-CHR                   38;5;113;1
-DIR                   38;5;26;1
-DOOR                  38;5;127
-EXEC                  38;5;148;1
-FIFO                  38;5;126
-FILE                  38;5;253
-LINK                  target
-MULTIHARDLINK         38;5;222;1
-# "NORMAL don't reset the bold attribute -
-# https://github.com/trapd00r/LS_COLORS/issues/11
-#NORMAL                38;5;254
-NORMAL                0
-ORPHAN                48;5;196;38;5;232;1
-OTHER_WRITABLE        38;5;220;1
-SETGID                48;5;3;38;5;0
-SETUID                38;5;220;1;3;100;1
-SOCK                  38;5;197
-STICKY                38;5;86;48;5;234
-STICKY_OTHER_WRITABLE 48;5;235;38;5;139;3
-
-*LS_COLORS 48;5;89;38;5;197;1;3;4;7 # :-)
-# }}}
-# documents {{{1
-*README               38;5;220;1
-*README.rst           38;5;220;1
-*LICENSE              38;5;220;1
-*COPYING              38;5;220;1
-*INSTALL              38;5;220;1
-*COPYRIGHT            38;5;220;1
-*AUTHORS              38;5;220;1
-*HISTORY              38;5;220;1
-*CONTRIBUTORS         38;5;220;1
-*PATENTS              38;5;220;1
-*VERSION              38;5;220;1
-*NOTICE               38;5;220;1
-*CHANGES              38;5;220;1
-.log                  38;5;190
-# plain-text {{{2
-.txt                  38;5;253
-# markup {{{2
-.etx                  38;5;184
-.info                 38;5;184
-.markdown             38;5;184
-.md                   38;5;184
-.mkd                  38;5;184
-.nfo                  38;5;184
-.pod                  38;5;184
-.rst                  38;5;184
-.tex                  38;5;184
-.textile              38;5;184
-# key-value, non-relational data {{{2
-.json                 38;5;178
-.msg                  38;5;178
-.pgn                  38;5;178
-.rss                  38;5;178
-.xml                  38;5;178
-.yaml                 38;5;178
-.yml                  38;5;178
-.RData                38;5;178
-.rdata                38;5;178
-# }}}
-# binary {{{2
-.cbr                  38;5;141
-.cbz                  38;5;141
-.chm                  38;5;141
-.djvu                 38;5;141
-.pdf                  38;5;141
-.PDF                  38;5;141
-# words {{{3
-.docm                 38;5;111;4
-.doc                  38;5;111
-.docx                 38;5;111
-.eps                  38;5;111
-.ps                   38;5;111
-.odb                  38;5;111
-.odt                  38;5;111
-.rtf                  38;5;111
-# presentation {{{3
-.odp                  38;5;166
-.pps                  38;5;166
-.ppt                  38;5;166
-.pptx                 38;5;166
-#   Powerpoint show
-.ppts                 38;5;166
-#   Powerpoint with enabled macros
-.pptxm                38;5;166;4
-#   Powerpoint show with enabled macros
-.pptsm                38;5;166;4
-# spreadsheet {{{3
-.csv                  38;5;78
-#   Open document spreadsheet
-.ods                  38;5;112
-.xla                  38;5;76
-#   Excel spreadsheet
-.xls                  38;5;112
-.xlsx                 38;5;112
-#   Excel spreadsheet with macros
-.xlsxm                38;5;112;4
-#   Excel module
-.xltm                 38;5;73;4
-.xltx                 38;5;73
-# }}}
-# }}}
-# configs {{{2
-*cfg                  1
-*conf                 1
-*rc                   1
-.ini                  1
-.plist                1
-#   vim
-.viminfo              1
-#   cisco VPN client configuration
-.pcf                  1
-#   adobe photoshop proof settings file
-.psf                  1
-# }}}
-# }}}
-# code {{{1
-# version control {{{2
-.git                  38;5;197
-.gitignore            38;5;240
-.gitattributes        38;5;240
-.gitmodules           38;5;240
-
-# shell {{{2
-.awk                  38;5;172
-.bash                 38;5;172
-.bat                  38;5;172
-.BAT                  38;5;172
-.sed                  38;5;172
-.sh                   38;5;172
-.zsh                  38;5;172
-.vim                  38;5;172
-
-# interpreted {{{2
-.ahk                  38;5;41
-# python
-.py                   38;5;41
-# perl
-.pl                   38;5;208
-.PL                   38;5;160
-.t                    38;5;114
-# sql
-.msql                 38;5;222
-.mysql                38;5;222
-.pgsql                38;5;222
-.sql                  38;5;222
-#   Tool Command Language
-.tcl                  38;5;64;1
-# R language
-.r                    38;5;49
-.R                    38;5;49
-# GrADS script
-.gs                   38;5;81
-
-# compiled {{{2
-#
-#   assembly language
-.asm                  38;5;81
-#   LISP
-.cl                   38;5;81
-.lisp                 38;5;81
-#   lua
-.lua                  38;5;81
-#   Moonscript
-.moon                 38;5;81
-#   C
-.c                    38;5;81
-.C                    38;5;81
-.h                    38;5;110
-.H                    38;5;110
-.tcc                  38;5;110
-#   C++
-.c++                  38;5;81
-.h++                  38;5;110
-.hpp                  38;5;110
-.hxx                  38;5;110
-.ii                   38;5;110
-#   method file for Objective C
-.M                    38;5;110
-.m                    38;5;110
-#   Csharp
-.cc                   38;5;81
-.cs                   38;5;81
-.cp                   38;5;81
-.cpp                  38;5;81
-.cxx                  38;5;81
-#   Crystal
-.cr                   38;5;81
-#   Google golang
-.go                   38;5;81
-#   fortran
-.f                    38;5;81
-.for                  38;5;81
-.ftn                  38;5;81
-#   pascal
-.s                    38;5;110
-.S                    38;5;110
-#   Rust
-.rs                   38;5;81
-#   Swift
-.swift                38;5;219
-#   ?
-.sx                   38;5;81
-#   interface file in GHC - https://github.com/trapd00r/LS_COLORS/pull/9
-.hi                   38;5;110
-#   haskell
-.hs                   38;5;81
-.lhs                  38;5;81
-
-# binaries {{{2
-# compiled apps for interpreted languages
-.pyc                  38;5;240
-# }}}
-# html {{{2
-.css                  38;5;125;1
-.less                 38;5;125;1
-.sass                 38;5;125;1
-.scss                 38;5;125;1
-.htm                  38;5;125;1
-.html                 38;5;125;1
-.jhtm                 38;5;125;1
-.mht                  38;5;125;1
-.eml                  38;5;125;1
-.mustache             38;5;125;1
-# }}}
-# java {{{2
-.coffee               38;5;074;1
-.java                 38;5;074;1
-.js                   38;5;074;1
-.mjs                  38;5;074;1
-.jsm                  38;5;074;1
-.jsm                  38;5;074;1
-.jsp                  38;5;074;1
-# }}}
-# php {{{2
-.php                  38;5;81
-#   CakePHP view scripts and helpers
-.ctp                  38;5;81
-#   Twig template engine
-.twig                 38;5;81
-# }}}
-# vb/a {{{2
-.vb                   38;5;81
-.vba                  38;5;81
-.vbs                  38;5;81
-# 2}}}
-# Build stuff {{{2
-*Dockerfile           38;5;155
-.dockerignore         38;5;240
-*Makefile             38;5;155
-*MANIFEST             38;5;243
-*pm_to_blib           38;5;240
-# automake
-.am                   38;5;242
-.in                   38;5;242
-.hin                  38;5;242
-.scan                 38;5;242
-.m4                   38;5;242
-.old                  38;5;242
-.out                  38;5;242
-.SKIP                 38;5;244
-# }}}
-# patch files {{{2
-.diff                 48;5;197;38;5;232
-.patch                48;5;197;38;5;232;1
-#}}}
-# graphics {{{1
-.bmp                  38;5;97
-.tiff                 38;5;97
-.tif                  38;5;97
-.TIFF                 38;5;97
-.cdr                  38;5;97
-.gif                  38;5;97
-.ico                  38;5;97
-.jpeg                 38;5;97
-.JPG                  38;5;97
-.jpg                  38;5;97
-.nth                  38;5;97
-.png                  38;5;97
-.psd                  38;5;97
-.xpm                  38;5;97
-# }}}
-# vector {{{1
-.ai                   38;5;99
-.eps                  38;5;99
-.epsf                 38;5;99
-.drw                  38;5;99
-.ps                   38;5;99
-.svg                  38;5;99
-# }}}
-# video {{{1
-.avi                  38;5;114
-.divx                 38;5;114
-.IFO                  38;5;114
-.m2v                  38;5;114
-.m4v                  38;5;114
-.mkv                  38;5;114
-.MOV                  38;5;114
-.mov                  38;5;114
-.mp4                  38;5;114
-.mpeg                 38;5;114
-.mpg                  38;5;114
-.ogm                  38;5;114
-.rmvb                 38;5;114
-.sample               38;5;114
-.wmv                  38;5;114
-  # mobile/streaming {{{2
-.3g2                  38;5;115
-.3gp                  38;5;115
-.gp3                  38;5;115
-.webm                 38;5;115
-.gp4                  38;5;115
-.asf                  38;5;115
-.flv                  38;5;115
-.ts                   38;5;115
-.ogv                  38;5;115
-.f4v                  38;5;115
-  # }}}
-  # lossless {{{2
-.VOB                  38;5;115;1
-.vob                  38;5;115;1
-# }}}
-# audio {{{1
-.3ga                  38;5;137;1
-.S3M                  38;5;137;1
-.aac                  38;5;137;1
-.au                   38;5;137;1
-.dat                  38;5;137;1
-.dts                  38;5;137;1
-.fcm                  38;5;137;1
-.m4a                  38;5;137;1
-.mid                  38;5;137;1
-.midi                 38;5;137;1
-.mod                  38;5;137;1
-.mp3                  38;5;137;1
-.mp4a                 38;5;137;1
-.oga                  38;5;137;1
-.ogg                  38;5;137;1
-.opus                 38;5;137;1
-.s3m                  38;5;137;1
-.sid                  38;5;137;1
-.wma                  38;5;137;1
-# lossless
-.ape                  38;5;136;1
-.aiff                 38;5;136;1
-.cda                  38;5;136;1
-.flac                 38;5;136;1
-.alac                 38;5;136;1
-.midi                 38;5;136;1
-.pcm                  38;5;136;1
-.wav                  38;5;136;1
-.wv                   38;5;136;1
-.wvc                  38;5;136;1
-
-# }}}
-# fonts {{{1
-.afm                  38;5;66
-.fon                  38;5;66
-.fnt                  38;5;66
-.pfb                  38;5;66
-.pfm                  38;5;66
-.ttf                  38;5;66
-.otf                  38;5;66
-#   postscript fonts
-.PFA                  38;5;66
-.pfa                  38;5;66
-# }}}
-# archives {{{1
-.7z                   38;5;40
-.a                    38;5;40
-.arj                  38;5;40
-.bz2                  38;5;40
-.cpio                 38;5;40
-.gz                   38;5;40
-.lrz                  38;5;40
-.lz                   38;5;40
-.lzma                 38;5;40
-.lzo                  38;5;40
-.rar                  38;5;40
-.s7z                  38;5;40
-.sz                   38;5;40
-.tar                  38;5;40
-.tgz                  38;5;40
-.xz                   38;5;40
-.z                    38;5;40
-.Z                    38;5;40
-.zip                  38;5;40
-.lrz                  38;5;40
-.zipx                 38;5;40
-.zoo                  38;5;40
-.zpaq                 38;5;40
-.zz                   38;5;40
-  # packaged apps {{{2
-.apk                  38;5;215
-.deb                  38;5;215
-.rpm                  38;5;215
-.jad                  38;5;215
-.jar                  38;5;215
-.cab                  38;5;215
-.pak                  38;5;215
-.pk3                  38;5;215
-.vdf                  38;5;215
-.vpk                  38;5;215
-.bsp                  38;5;215
-.dmg                  38;5;215
-  # }}}
-  # segments from 0 to three digits after first extension letter {{{2
-.r[0-9]{0,2}          38;5;239
-.zx[0-9]{0,2}         38;5;239
-.z[0-9]{0,2}          38;5;239
-# partial files
-.part                 38;5;239
-  # }}}
-# partition images {{{2
-.dmg                  38;5;124
-.iso                  38;5;124
-.bin                  38;5;124
-.nrg                  38;5;124
-.qcow                 38;5;124
-.sparseimage          38;5;124
-.toast                38;5;124
-.vcd                  38;5;124
-.vmdk                 38;5;124
-# }}}
-# databases {{{2
-.accdb                38;5;60
-.accde                38;5;60
-.accdr                38;5;60
-.accdt                38;5;60
-.db                   38;5;60
-.fmp12                38;5;60
-.fp7                  38;5;60
-.localstorage         38;5;60
-.mdb                  38;5;60
-.mde                  38;5;60
-.sqlite               38;5;60
-.typelib              38;5;60
-# NetCDF database
-.nc                   38;5;60
-# }}}
-# tempfiles {{{1
-# undo files
-.pacnew               38;5;33
-.un~                  38;5;241
-.orig                 38;5;241
-# backups
-.BUP                  38;5;241
-.bak                  38;5;241
-.o                    38;5;241 #   *nix Object file (shared libraries, core dumps etc)
-.rlib                 38;5;241 #   Static rust library
-# temporary files
-.swp                  38;5;244
-.swo                  38;5;244
-.tmp                  38;5;244
-.sassc                38;5;244
-# state files
-.pid                  38;5;248
-.state                38;5;248
-*lockfile             38;5;248
-# error logs
-.err                  38;5;160;1
-.error                38;5;160;1
-.stderr               38;5;160;1
-# state dumps
-.dump                 38;5;241
-.stackdump            38;5;241
-.zcompdump            38;5;241
-.zwc                  38;5;241
-# tcpdump, network traffic capture
-.pcap                 38;5;29
-.cap                  38;5;29
-.dmp                  38;5;29
-# macOS
-.DS_Store             38;5;239
-.localized            38;5;239
-.CFUserTextEncoding   38;5;239
-# }}}
-# hosts {{{1
-# /etc/hosts.{deny,allow}
-.allow                38;5;112
-.deny                 38;5;196
-# }}}
-# systemd {{{1
-# http://www.freedesktop.org/software/systemd/man/systemd.unit.html
-.service              38;5;45
-*@.service            38;5;45
-.socket               38;5;45
-.swap                 38;5;45
-.device               38;5;45
-.mount                38;5;45
-.automount            38;5;45
-.target               38;5;45
-.path                 38;5;45
-.timer                38;5;45
-.snapshot             38;5;45
-# }}}
-# metadata {{{1
-.application          38;5;116
-.cue                  38;5;116
-.description          38;5;116
-.directory            38;5;116
-.m3u                  38;5;116
-.m3u8                 38;5;116
-.md5                  38;5;116
-.properties           38;5;116
-.sfv                  38;5;116
-.srt                  38;5;116
-.theme                38;5;116
-.torrent              38;5;116
-.urlview              38;5;116
-# }}}
-# encrypted data {{{1
-.asc                  38;5;192;3
-.bfe                  38;5;192;3
-.enc                  38;5;192;3
-.gpg                  38;5;192;3
-.signature            38;5;192;3
-.sig                  38;5;192;3
-.p12                  38;5;192;3
-.pem                  38;5;192;3
-.pgp                  38;5;192;3
-.asc                  38;5;192;3
-.enc                  38;5;192;3
-.sig                  38;5;192;3
-# 1}}}
-# emulators {{{1
-.32x                  38;5;213
-.cdi                  38;5;213
-.fm2                  38;5;213
-.rom                  38;5;213
-.sav                  38;5;213
-.st                   38;5;213
-  # atari
-.a00                  38;5;213
-.a52                  38;5;213
-.A64                  38;5;213
-.a64                  38;5;213
-.a78                  38;5;213
-.adf                  38;5;213
-.atr                  38;5;213
-  # nintendo
-.gb                   38;5;213
-.gba                  38;5;213
-.gbc                  38;5;213
-.gel                  38;5;213
-.gg                   38;5;213
-.ggl                  38;5;213
-.ipk                  38;5;213 # Nintendo (DS Packed Images)
-.j64                  38;5;213
-.nds                  38;5;213
-.nes                  38;5;213
-  # Sega
-.sms                  38;5;213
-# }}}
-# unsorted {{{1
-#
-#   Portable Object Translation for GNU Gettext
-.pot                  38;5;7
-#   CAD files for printed circuit boards
-.pcb                  38;5;7
-#   groff (rendering app for texinfo)
-.mm                   38;5;7
-#   perldoc
-.pod                  38;5;7
-#   GIMP brush
-.gbr                  38;5;7
-# printer spool file
-.spl                  38;5;7
-#   GIMP project file
-.scm                  38;5;7
-# RStudio project file
-.Rproj                38;5;11
-#   Nokia Symbian OS files
-.sis                  38;5;7
-
-.1p                   38;5;7
-.3p                   38;5;7
-.cnc                  38;5;7
-.def                  38;5;7
-.ex                   38;5;7
-.example              38;5;7
-.feature              38;5;7
-.ger                  38;5;7
-.map                  38;5;7
-.mf                   38;5;7
-.mfasl                38;5;7
-.mi                   38;5;7
-.mtx                  38;5;7
-.pc                   38;5;7
-.pi                   38;5;7
-.plt                  38;5;7
-.pm                   38;5;7
-.rb                   38;5;7
-.rdf                  38;5;7
-.rst                  38;5;7
-.ru                   38;5;7
-.sch                  38;5;7
-.sty                  38;5;7
-.sug                  38;5;7
-.t                    38;5;7
-.tdy                  38;5;7
-.tfm                  38;5;7
-.tfnt                 38;5;7
-.tg                   38;5;7
-.vcard                38;5;7
-.vcf                  38;5;7
-.xln                  38;5;7
-#   AppCode files
-.iml                  38;5;166
-#   Xcode files
-.xcconfig             1
-.entitlements         1
-.strings              1
-.storyboard           38;5;196
-.xcsettings           1
-.xib                  38;5;208
-# }}}
-# termcap {{{1
-TERM ansi
-TERM color-xterm
-TERM con132x25
-TERM con132x30
-TERM con132x43
-TERM con132x60
-TERM con80x25
-TERM con80x28
-TERM con80x30
-TERM con80x43
-TERM con80x50
-TERM con80x60
-TERM cons25
-TERM console
-TERM cygwin
-TERM dtterm
-TERM Eterm
-TERM eterm-color
-TERM gnome
-TERM gnome-256color
-TERM jfbterm
-TERM konsole
-TERM kterm
-TERM linux
-TERM linux-c
-TERM mach-color
-TERM mlterm
-TERM putty
-TERM rxvt
-TERM rxvt-256color
-TERM rxvt-cygwin
-TERM rxvt-cygwin-native
-TERM rxvt-unicode
-TERM rxvt-unicode-256color
-TERM rxvt-unicode256
-TERM screen
-TERM screen-256color
-TERM screen-256color-bce
-TERM screen-bce
-TERM screen-w
-TERM screen.linux
-TERM screen.rxvt
-TERM terminator
-TERM vt100
-TERM xterm
-TERM xterm-16color
-TERM xterm-256color
-TERM xterm-88color
-TERM xterm-color
-TERM xterm-debian
-# }}}
-
-
-# vim: ft=dircolors:fdm=marker:et:sw=2:
--- a/.config/zsh/aliases.plugin.zsh
+++ b/.config/zsh/aliases.plugin.zsh
@ -9,7 +9,7 @@ alias v='nvim'
 alias vi='nvim'
 alias vim='nvim'
 alias irc='irssi'
-alias 3='ncmpcpp'
+alias play='ncmpcpp'
 alias torr='transmission-remote-cli'
 alias cal='calcurse'
 alias py='python '
@ -18,8 +18,8 @@ alias ytv='youtube-viewer'
 alias git='lab'
 alias help='run-help'
 alias p='pacui'
-alias sr='sr -browser=$CLIBROWSER'          # open in cli browser
-alias surfraw='surfraw -browser=$BROWSER'   # open in gui browser
+alias sr='sr -browser=$CLIBROWSER'
+alias surfraw='surfraw -browser=$BROWSER'
 alias foxy='FoxDot & disown'
 alias bm='bashmount'
 alias kat='cat'
@ -27,11 +27,11 @@ alias kat='cat'
 # MAXIMUM VERBOSITY YIELDS MAXIMUM RESULTS
 alias chmod='chmod -v'
 alias chown='chown -v'
-alias mv='mv -iv'
-alias rmdir='rmdir -v'                      # rm empty directory only
-alias rm='rm -iv'                           # Always confirm before deleting things
-alias mkdir='mkdir -pv'                     # Make parent directories that dont exist
-alias cp="cp -raiv"                         # Confirm before overwriting something
+alias mv='amv -giv'
+alias rmdir='rmdir -v'
+alias rm='rm -Irv'
+alias mkdir='mkdir -pv'
+alias cp='acp -graiv'
 alias ln='ln -iv'
 alias rename='rename -v'
 alias mount='mount -v | column -t'
@ -39,20 +39,21 @@ alias umount='umount -v'

 # Con opciones por defecto
 alias cat='bat --style=numbers,changes,header --color=always'
-alias find='fd -H --color=always'
+alias buscar='fd -H --color=always'
+alias donde='bfs -x'
 alias ncdu='ncdu --color dark -rr -x --exclude .git'
-alias ls='ls -F --color=always --group-directories-first'
+alias ls='ls -Ft --color=always --group-directories-first'
+alias lst='ls -FAghoBtH --group-directories-first --dereference-command-line-symlink-to-dir --time-style=+"%d-%m-%Y %H:%M"'
 alias grep='grep --color=tty -d skip'
 alias sgrep='grep -R -n -H -C 5 --exclude-dir={.git,.svn,CVS} '
 alias dmesg='dmesg --color=always'
 alias tree='tree -CAFa -I "CVS|*.*.package|.svn|.git|.hg|node_modules|bower_components" --dirsfirst'
 alias lsblk='lsblk -o "KNAME,HOTPLUG,SIZE,FSTYPE,TYPE,LABEL,MOUNTPOINT,UUID,MODEL,SERIAL"'
 alias dir='dir --color=always'
-alias type='type -a'                        # See what the command you want to run points to
-alias df='df -hT --total'                   # Human readable, print filetype, and total
-alias free='free -ht'                       # Human readable and total
-alias du='du -d1 -h | sort -rh'             # Human readable, max depth
-alias info='info --vi-keys'                 # GNU info act like man command
+alias df='df -hT --total'
+alias free='free -ht'
+alias du='du -d1 -h | sort -rh'
+alias info='info --vi-keys'
 alias inxi='inxi -Fz'
 alias slop="slop --highlight --tolerance=0 --color=0.3,0.4,0.6,0.4 -f '%wx%h+%x+%y'"
 alias ping='ping -c 5 '
@ -62,18 +63,14 @@ alias dfc='dfc -dmT'

 # Comandos
 alias sudo='sudo '
-alias logout="bspc quit 1"
+alias chau="bspc quit 1"
 alias pacmir='sudo pacman-mirrors -f5'
 alias ytw='youtube-viewer -C -D -W -f -7 --results=10'
 alias yta='youtube-dl --add-metadata -icw --no-cache-dir --no-call-home --restrict-filenames --extract-audio --audio-format mp3 --audio-quality 0 --prefer-ffmpeg -o "%(title)s.%(ext)s"'
 alias ytdl='youtube-dl --add-metadata -ic --no-call-home'
-#alias hoy='calcurse -a --format-apt=" - %m (%S a %E)\n" --format-recur-apt=" - %m (%S a %E)\n"'
-#alias week='calcurse -r7 --format-apt=" - %m (%S a %E)\n" --format-recur-apt=" - %m (%S a %E)\n"'
-#alias todo='calcurse -t --format-todo "(%p) %m\n"'
-alias winclass='xprop | grep WM_CLASS'      # for bspwm rules
-alias path='echo -e ${PATH//:/\\n}'         # Pretty print of some PATH variables
-alias compare='grep -nFxvf'                 # Usage: compare <file1> <file2>
+alias winclass='xprop | grep WM_CLASS'
+alias path='echo -e ${PATH//:/\\n}'
+alias compare='grep -nFxvf'
 alias pwn='chmod +x'
 alias ta='tmux attach -t'
-alias tk='tmux kill-session -t'
-alias lst='ls -FAghoBtH --group-directories-first --dereference-command-line-symlink-to-dir --time-style=+"%d-%m-%Y %H:%M"'
+alias tk='tmux kill-session -t'
--- a/.config/zsh/extras.zsh
+++ b/.config/zsh/extras.zsh
@ -0,0 +1,74 @@
+# -*- mode: shell-script -*-
+# vim:ft=zsh
+
+# Framebuffer colors {{{
+if [ "$TERM" = "linux" ]; then
+    _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p'
+    for i in $(sed -n "$_SEDCMD" $HOME/.Xresources | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do
+        echo -en "$i"
+    done
+    clear
+	if command -v tmux >/dev/null 2>&1; then
+		test -z "$TMUX" && (tmux new -A -s shell)
+	fi
+fi
+# }}}
+
+# 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
+# }}}
+
+# Pacman {{{
+files() { pacman -Ql "$1" ;}                            # list files owned by package
+explicit() { sudo pacman -D --asexplicit "$@" ;}        # mark package as explicitly installed
+# }}}
+
+# FFF {{{
+f() {
+    fff "$@"
+    cd "$(cat "${XDG_CACHE_HOME:=${HOME}/.cache}/fff/.fff_d")"
+}
+# }}}
+
+# Handle trash {{{
+trash-empty() { gio trash --empty }
+trash() { gio trash -f $@ }
+trash-ls() { gio list -h trash:// }
+# }}}
+
+# Prevent ranger nesting {{{
+ranger() {
+	if [ -z "$RANGER_LEVEL" ]; then
+		/usr/bin/ranger "$@"
+	else
+		exit
+	fi
+}
+# }}}
+
+# This is a workaround for tmux {{{
+# When you clear the terminal with ctrl-l anything on-screen is not saved (this is compatible with xterm behavior).
+# In contrast, GNU screen will first push anything on-screen into the scrollback buffer before clearing the screen.
+tmux-clear-screen() {
+    for line in {1..$(( $LINES ))} ; do echo; done
+    zle clear-screen
+}
+zle -N tmux-clear-screen
+bindkey "^L" tmux-clear-screen
+# }}}
+
+# vim:foldmethod=marker:foldlevel=0
--- a/.config/zsh/fzf-completion.zsh
+++ b/.config/zsh/fzf-completion.zsh
@ -1 +0,0 @@
-/usr/share/fzf/completion.zsh
--- a/.config/zsh/fzf-keybindings.zsh
+++ b/.config/zsh/fzf-keybindings.zsh
@ -1 +0,0 @@
-/usr/share/fzf/key-bindings.zsh
--- a/.config/zsh/fzf.zsh
+++ b/.config/zsh/fzf.zsh
@ -75,7 +75,7 @@ fi
 # }}}

 # fk - kill process using fzf {{{
-function fk {
+fk() {
  local pid
  pid=$( pstree -T -p -a | fzf -e -m -i +s --margin=4%,1%,1%,2% --inline-info --header="TAB to (un)select. ENTER to kill. ESC or CTRL+C to quit." --prompt='Process name > ' | awk -F ',' '{print $NF}' | awk '{print $1}' )

@ -93,7 +93,7 @@ fh() {
 # }}}

 #  fasd with fzf {{{
-function ff() {
+ff() {
 	local selected_path=$(
 		fasd -l -d \
 		| sed "s#$HOME#~#" \
@ -111,7 +111,7 @@ function ff() {
 # }}}

 # Bookmark manager. @param {string} [$1] Defined bookmark string. {{{
-function b() {
+b() {
 	# Bookmarks
 	local -A bookmarks=(
 		'e' '~/Desktop/'
--- a/.config/zsh/git-extras-completion.zsh
+++ b/.config/zsh/git-extras-completion.zsh
@ -1 +0,0 @@
-/home/deadguy/.zplugin/plugins/tj---git-extras/etc/git-extras-completion.zsh
--- a/.config/zsh/keys.zsh
+++ b/.config/zsh/keys.zsh
@ -69,6 +69,16 @@ key[PageDown]="$terminfo[knp]"
 [[ -n "$key[PageUp]"    ]] && bindkey -- "$key[PageUp]"    history-beginning-search-backward
 [[ -n "$key[PageDown]"  ]] && bindkey -- "$key[PageDown]"  history-beginning-search-forward

+# Runs bindkey but for all of the keymaps. Running it with no arguments will
+# print out the mappings for all of the keymaps.
+function bindkey-all {
+    local keymap=''
+    for keymap in $(bindkey -l); do
+        [[ "$#" -eq 0 ]] && printf "#### %s\n" "${keymap}" 1>&2
+        bindkey -M "${keymap}" "$@"
+    done
+}
+
 # Finally, make sure the terminal is in application mode, when zle is
 # active. Only then are the values from $terminfo valid.
 if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
--- a/.config/zsh/up.plugin.zsh
+++ b/.config/zsh/up.plugin.zsh
@ -0,0 +1,20 @@
+# Up, the Plugin
+# Author: Peter Hurford
+# https://github.com/peterhurford/up.zsh
+
+up(){                                 # Go up X directories (default 1)
+  if [[ "$#" -ne 1 ]]; then
+    cd ..
+  elif ! [[ $1 =~ '^[0-9]+$' ]]; then
+    echo "Error: up should be called with the number of directories to go up. The default is 1."
+  else
+    local d=""
+    limit=$1
+    for ((i=1 ; i <= limit ; i++))
+      do
+        d=$d/..
+      done
+    d=$(echo $d | sed 's/^\///')
+    cd $d
+  fi
+}
--- a/.mozilla/firefox/o67v3l1t.default-1513624824943/chrome/userChrome.css
+++ b/.mozilla/firefox/o67v3l1t.default-1513624824943/chrome/userChrome.css
--- a/.mozilla/firefox/o67v3l1t.default-1513624824943/chrome/userContent.css
+++ b/.mozilla/firefox/o67v3l1t.default-1513624824943/chrome/userContent.css
--- a/.nanorc
+++ b/.nanorc
@ -33,7 +33,7 @@
 # set backwards

 ## Use bold text instead of reverse video text.
- set boldtext
+# set boldtext

 ## The characters treated as closing brackets when justifying
 ## paragraphs.  They cannot contain blank characters.  Only closing
@ -54,7 +54,7 @@
 ## Set the line length for wrapping text and justifying paragraphs.
 ## If the value is 0 or less, the wrapping point will be the screen
 ## width less this number.
-# set fill -8
+set fill -8

 ## Enable ~/.nano_history for saving and reading search/replace strings.
 # set historylog
@ -76,11 +76,11 @@
 ## mouse clicks can be used to place the cursor, set the mark (with a
 ## double click), and execute shortcuts.  The mouse will work in the X
 ## Window System, and on the console when gpm is running.
- set mouse
+set mouse

 ## Switch on multiple file buffers (inserting a file will put it into
 ## a separate buffer).
- set multibuffer
+set multibuffer

 ## Don't convert files from DOS/Mac format.
 # set noconvert
@ -92,7 +92,7 @@
 # set nohelp

 ## Don't add newlines to the ends of files.
- set nonewlines
+set nonewlines

 ## Don't wrap text at all.
 # set nowrap
@ -113,7 +113,7 @@
 ## paragraphs.  They cannot contain blank characters.  Only closing
 ## punctuation, optionally followed by closing brackets, can end
 ## sentences.
- set punct "!.?"
+set punct "!.?"

 ## Do quick statusbar blanking.  Statusbar messages will disappear after
 ## 1 keystroke instead of 26.  Note that "const" overrides this.
@ -123,7 +123,7 @@
 ## This is an extended regular expression if your system supports them,
 ## otherwise a literal string.
 ## If you have extended regular expression support, the default is:
-# set quotestr "^([ 	]*[#:>\|}])+"
+set quotestr "^([ 	]*[#:>\|}])+"
 ## Otherwise:
 # set quotestr "> "

@ -141,23 +141,23 @@
 ## will jump to that beginning (either forwards or backwards).  If the
 ## cursor is already at that position, it will jump to the true
 ## beginning of the line.
- set smarthome
+set smarthome

 ## Use smooth scrolling as the default.
- set smooth
+set smooth

 ## Enable soft line wrapping (AKA full-line display).
-# set softwrap
+set softwrap

 ## Use this spelling checker instead of the internal one.  This option
 ## does not properly have a default value.
 # set speller "aspell -x -c"

 ## Allow nano to be suspended.
-# set suspend
+set suspend

 ## Use this tab size instead of the default; it must be greater than 0.
- set tabsize 4
+set tabsize 4

 ## Convert typed tabs to spaces.
 # set tabstospaces
@ -178,16 +178,20 @@

 ## Detect word boundaries more accurately by treating punctuation
 ## characters as parts of words.
- set wordbounds
+set wordbounds


 ## Paint the interface elements of nano.
 ## This is an example; by default there are no colors.
- set titlecolor black,blue
- set statuscolor black,blue
- set keycolor green
- set functioncolor yellow
+set titlecolor black,blue
+set statuscolor black,blue
+set keycolor green
+set functioncolor cyan

+set errorcolor brightwhite,red
+set selectedcolor brightwhite,magenta
+set stripecolor ,yellow
+set numbercolor black,cyan

 ## Setup of syntax coloring.
 ##
@ -231,27 +235,27 @@
 ## them easier to remember and faster to type using nano's -Y option.
 ##
 ## To include all existing syntax definitions, you can do:
-#include "/usr/share/nano/*.nanorc"
-include /usr/share/nano/asm.nanorc
-include /usr/share/nano/awk.nanorc
-include /usr/share/nano/c.nanorc
-include /usr/share/nano/cmake.nanorc
-include /usr/share/nano/css.nanorc
-include /usr/share/nano/groff.nanorc
-include /usr/share/nano/html.nanorc
-include /usr/share/nano/java.nanorc
-include /usr/share/nano/makefile.nanorc
-include /usr/share/nano/man.nanorc
-include /usr/share/nano/mgp.nanorc
-include /usr/share/nano/mutt.nanorc
-include /usr/share/nano/nanorc.nanorc
-include /usr/share/nano/patch.nanorc
-include /usr/share/nano/perl.nanorc
-include /usr/share/nano/php.nanorc
-include /usr/share/nano/python.nanorc
-include /usr/share/nano/ruby.nanorc
-include /usr/share/nano/sh.nanorc
-include /usr/share/nano/xml.nanorc
+include "/usr/share/nano/*.nanorc"
+#include /usr/share/nano/asm.nanorc
+#include /usr/share/nano/awk.nanorc
+#include /usr/share/nano/c.nanorc
+#include /usr/share/nano/cmake.nanorc
+#include /usr/share/nano/css.nanorc
+#include /usr/share/nano/groff.nanorc
+#include /usr/share/nano/html.nanorc
+#include /usr/share/nano/java.nanorc
+#include /usr/share/nano/makefile.nanorc
+#include /usr/share/nano/man.nanorc
+#include /usr/share/nano/mgp.nanorc
+#include /usr/share/nano/mutt.nanorc
+#include /usr/share/nano/nanorc.nanorc
+#include /usr/share/nano/patch.nanorc
+#include /usr/share/nano/perl.nanorc
+#include /usr/share/nano/php.nanorc
+#include /usr/share/nano/python.nanorc
+#include /usr/share/nano/ruby.nanorc
+#include /usr/share/nano/sh.nanorc
+#include /usr/share/nano/xml.nanorc


 ## Key bindings.
@ -265,3 +269,5 @@ include /usr/share/nano/xml.nanorc

 ## Set this if your backspace key sends Del most of the time.
 # bind Del backspace all
+
+set linenumbers
--- a/.xinitrc
+++ b/.xinitrc
@ -24,7 +24,6 @@ if [ -f "$usermodmap" ]; then
 fi

 # start some nice programs
-
 if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 for f in /etc/X11/xinit/xinitrc.d/?*.sh ; do
  [ -x "$f" ] && . "$f"
@ -32,12 +31,8 @@ if [ -d /etc/X11/xinit/xinitrc.d ] ; then
 unset f
 fi

-#xset dpms 0 2700 3000 &
-#xset s 900 900 &
 setxkbmap -option caps:escape
-#xss-lock -n dim-screen.sh -l -- exeflock4 -n &

-dbus-update-activation-environment --systemd DISPLAY
 eval "$(/usr/bin/gnome-keyring-daemon --start --components=pkcs11,secrets,ssh)"
 export SSH_AUTH_SOCK
 /usr/lib/polkit-gnome/polkit-gnome-authentication-agent-1 &
@ -45,4 +40,6 @@ xsetroot -cursor_name left_ptr &
 compton -b &
 sxhkd &
 xfce4-power-manager &
+dunst -conf ~/.config/dunst/dunstrc &
+mpd &
 exec bspwm
--- a/.zshrc
+++ b/.zshrc
@ -1,103 +1,255 @@
 # -*- mode: shell-script -*-
 # vim:ft=zsh

-# framebuffer colors {{{
-if [ "$TERM" = "linux" ]; then
-    _SEDCMD='s/.*\*color\([0-9]\{1,\}\).*#\([0-9a-fA-F]\{6\}\).*/\1 \2/p'
-    for i in $(sed -n "$_SEDCMD" $HOME/.Xresources | awk '$1 < 16 {printf "\\e]P%X%s", $1, $2}'); do
-        echo -en "$i"
-    done
-    clear
-	if command -v tmux >/dev/null 2>&1; then
-		test -z "$TMUX" && (tmux new -A -s shell)
-	fi
+# Profiling Tools {{{
+PROFILE_STARTUP=false
+if [[ "$PROFILE_STARTUP" == true ]]; then
+    zmodload zsh/zprof
+    # http://zsh.sourceforge.net/Doc/Release/Prompt-Expansion.html
+    PS4=$'%D{%M%S%.} %N:%i> '
+    exec 3>&2 2>$HOME/startlog.$$
+    setopt xtrace prompt_subst
 fi
 # }}}
+# Install Functions {{{
+MODULES_DIR="$HOME/.config/zsh"
+UPDATE_INTERVAL=5
+function _net_test() {
+    netflag="/tmp/network_down"
+    touch $netflag
+    if [[ -n "$(curl -s --max-time 4 -I http://example.com | grep 200)" ]]; then
+        command rm $netflag >/dev/null
+        return 0
+    elif [[ -a $netflag ]]; then
+        return 1
+    elif [[ -z "$(curl -s --max-time 4 -I http://example.com | grep 200)" ]]; then
+        echo "NO NETWORK"
+        tput bel
+        touch $netflag
+        return 1
+    else
+        command rm $netflag >/dev/null
+        return 0
+    fi
+}

-# Zplugin {{{
-### Added by Zplugin's installer
-source '/home/deadguy/.zplugin/bin/zplugin.zsh'
-autoload -Uz _zplugin
-(( ${+_comps} )) && _comps[zplugin]=_zplugin
-### End of Zplugin's installer chunk
+function _update() {
+    if [[ -z $UPDATE_INTERVAL ]];
+    then
+        UPDATE_INTERVAL=30
+    fi

-zplugin load peterhurford/up.zsh
-zplugin load hlissner/zsh-autopair
-zplugin ice as"program" pick"$ZPFX/bin/git-*" make"PREFIX=$ZPFX" nocompile'!'
-zplugin light tj/git-extras
-GEOMETRY_COLOR_PROMPT="green"
-GEOMETRY_PROMPT_PLUGINS=(virtualenv git)
-GEOMETRY_SYMBOL_PROMPT=">"
-GEOMETRY_SYMBOL_EXIT_VALUE="!"
-GEOMETRY_SYMBOL_ROOT="#"
-GEOMETRY_DIR_SPACER=""
-GEOMETRY_PROMPT_PREFIX_SPACER=""
-zplugin ice lucid atload"prompt_geometry_render"
-zplugin light geometry-zsh/geometry
-zplugin ice atinit'local i; for i in *.zsh; do source $i; done'; zpl light ~/.config/zsh
-zplugin load djui/alias-tips
-zplugin ice pick"c.zsh" atclone"dircolors -b LS_COLORS > c.zsh" atpull"%atclone"
-zplugin light trapd00r/LS_COLORS
-zplugin ice wait"0" blockf lucid
-zplugin light zsh-users/zsh-completions
-zplugin ice wait"0" lucid atinit"zpcompinit; zpcdreplay"
-zplugin light zdharma/fast-syntax-highlighting
-zplugin load zsh-users/zsh-history-substring-search
+    if [[ ! -a $MODULES_DIR/$1/.updatetime ]];
+    then
+        echo 0 > "$MODULES_DIR/$1/.updatetime"
+    fi
+
+    day=$((24 * 60 * 60 ))
+    gap=$(( $UPDATE_INTERVAL * $day ))
+    diff="$(( $(date +'%s') - $(cat $MODULES_DIR/$1/.updatetime) ))"
+
+    if [[ $diff -gt $gap ]]; then
+        (
+        _net_test
+        if [[ $? -eq 1 ]]; then
+            return
+        fi
+        echo  "$2"
+        builtin cd "$MODULES_DIR/$1/" && git pull --rebase
+        echo "\n"
+        )
+        date +'%s' > "$MODULES_DIR/$1/.updatetime"
+    fi
+}
+
+function _get_clone_url() {
+    if [[ $1 =~ '^(git@|https)' ]]; then
+        cloneurl="$1"
+        if [[ $2 -eq 1 ]]; then
+            if [[ $1 =~ '.*github.*' ]]; then
+                cloneurl="https://github.com/$location"
+            fi
+            if [[ $1 =~ '.*gitlab.*' ]]; then
+                cloneurl="https://gitlab.com/$location"
+            fi
+        fi
+    else
+        cloneurl="git@github.com:$1"
+        if [[ $2 -eq 1 ]]; then
+            cloneurl="https://github.com/$1"
+        fi
+    fi
+}
+
+function _get_clone_dest() {
+    if [[ $1 =~ '^(git@|https)' ]]; then
+        tillcolon=("${(@s/:/)1}")
+        if [[ $tillcolon[1] = 'https' ]]; then
+            atslashes=("${(@s#/#)tillcolon}")
+            location="$atslashes[-2]/$atslashes[-1]"
+        else
+            location="$tillcolon[-1]"
+        fi
+    else
+        location=$1
+    fi
+}
+
+function source_or_install() {
+    _get_clone_dest "$2"
+    if [[ $HTTPS_CLONE -eq 1 ]]; then
+        _get_clone_url "$2" 1
+    else
+        _get_clone_url "$2"
+    fi
+    if [[ ! -d "$MODULES_DIR" ]]; then
+        mkdir -p "$MODULES_DIR"
+    fi
+    if [[ -a $1 ]] then;
+        source $1
+    else
+        _net_test
+        if [[ $? -eq 1 ]]; then
+            echo "oops"
+            return
+        fi
+
+        git clone --depth 3 "$cloneurl" "$MODULES_DIR/$location"
+        find $MODULES_DIR -type d -delete 2>/dev/null
+        if [[ ! -d $MODULES_DIR/$location  ]]; then
+            echo "nothing cloned"
+            export HTTPS_CLONE=1
+        fi
+        date +'%s' > "$MODULES_DIR/$location/.updatetime"
+        echo "\n"
+    fi
+    _update $location
+    unset location
+    unset cloneurl
+}
+
+function force_updates() {
+    (
+    builtin cd $MODULES_DIR
+    find ./ -type f -name '.updatetime' -delete
+    source $HOME/.zshrc
+    )
+}
 # }}}
+# Set Options For General Runtime {{{
+source $MODULES_DIR/dotfiles.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
+# Load the prompt system and completion system and initilize them
+autoload -Uz compinit promptinit
+# Load and initialize the completion system ignoring insecure directories with a
+# cache time of 20 hours, so it should almost always regenerate the first time a
+# shell is opened each day.
+autoload -Uz compinit
+_comp_files=(${ZDOTDIR:-$HOME}/.zcompdump(Nm-20))
+if (( $#_comp_files )); then
+  compinit -i -C
+else
+  compinit -i
 fi
-# }}}
+unset _comp_files
+promptinit

-# Command not found {{{
-[[ -e /usr/share/doc/pkgfile/command-not-found.zsh ]] && source /usr/share/doc/pkgfile/command-not-found.zsh
-# }}}
+# Load colors
+autoload -U colors && colors
+
+# Use case-insensitve globbing.
+unsetopt CASE_GLOB
+# glob dotfiles as well
+setopt GLOBDOTS
+
+# Automatically change directory if a directory is entered
+setopt autocd
+setopt extendedglob
+
+#
+# Smart URLs
+#
+autoload -Uz url-quote-magic
+zle -N self-insert url-quote-magic
+
+#
+# General
+#
+
+# Allow brace character class list expansion.
+setopt BRACE_CCL
+# Combine zero-length punctuation characters (accents) with the base character.
+setopt COMBINING_CHARS
+# Allow 'Henry''s Garage' instead of 'Henry'\''s Garage'.
+setopt RC_QUOTES
+
+#
+# Jobs
+#
+# List jobs in the long format by default.
+setopt LONG_LIST_JOBS
+# Attempt to resume existing job before creating a new process.
+setopt AUTO_RESUME
+# Report status of background jobs immediately.
+setopt NOTIFY
+# Don't run all background jobs at a lower priority.
+unsetopt BG_NICE
+# Don't kill jobs on shell exit.
+unsetopt HUP
+# Don't report on jobs when shell exit.
+unsetopt CHECK_JOBS
+
+setopt rm_star_wait
+setopt list_types
+
+# turn on corrections
+setopt correct
+
+# Disable some shell keyboard shortcuts
+stty -ixon > /dev/null 2>/dev/null
+# }}}
+# Completion {{{
+# Complete from both ends of a word.
+setopt COMPLETE_IN_WORD
+# Move cursor to the end of a completed word.
+setopt ALWAYS_TO_END
+# Perform path search even on command names with slashes.
+setopt PATH_DIRS
+# Show completion menu on a successive tab press.
+setopt AUTO_MENU
+# Automatically list choices on ambiguous completion.
+setopt AUTO_LIST
+# If completed parameter is a directory, add a trailing slash.
+setopt AUTO_PARAM_SLASH
+setopt NO_COMPLETE_ALIASES
+# Do not autoselect the first completion entry.
+setopt MENU_COMPLETE
+# Disable start/stop characters in shell editor.
+unsetopt FLOW_CONTROL
+setopt MARK_DIRS

-# Completion styles {{{
-zstyle :compinstall filename '/home/deadguy/.zshrc'
 zstyle ':completion:*' menu select=1
-zstyle ':completion:*:sudo:*' command-path /usr/local/sbin \
-		                                   /usr/local/bin  \
-		                                   /usr/sbin       \
-		                                   /usr/bin        \
-		                                   /sbin           \
-		                                   /bin
-zstyle ':completion:*:correct:*' insert-unambiguous true
-zstyle ':completion:*:corrections' format '%d %B(%F{red}errors: %e%f)%b'
-zstyle ':completion:*:correct:*' original true
-zstyle ':completion:*' list-colors ${(s.:.)LS_COLORS}
-zstyle ':completion:*:descriptions' format $'\n%F{yellow}--- %d --- %f'
-zstyle ':completion:*' matcher-list 'm:{[:lower:]}={[:upper:]} m:{[:lower:][:upper:]}={[:upper:][:lower:]}' 'm:{[:lower:]}={[:upper:]} m:{[:lower:][:upper:]}={[:upper:][:lower:]} l:|=* r:|=*'
 zstyle ':completion:*:matches' group 'yes'
-zstyle ':completion:*' group-name ''
-zstyle ':completion:*:messages' format ' %F{magenta} -- %d --%f'
-zstyle ':completion:*' auto-description '%d'
 zstyle ':completion:*:options' description 'yes'
+zstyle ':completion:*:options' auto-description '%d'
+zstyle ':completion:*:corrections' format $'\n %F{green}--- %d (errors: %e) ---%f'
+zstyle ':completion:*:descriptions' format $'\n %F{yellow}--- %d ---%f'
+zstyle ':completion:*:messages' format $'\n %F{purple}--- %d ---%f'
+zstyle ':completion:*:warnings' format $'\n %F{red}-- No Matches Found --%f'
+zstyle ':completion:*:default' list-prompt '%S%M matches%s'
+zstyle ':completion:*:default' select-prompt ' --- Match %M    %P ---'
+zstyle ':completion:*' format $'\n %F{yellow}--- %d ---%f'
+zstyle ':completion:*' group-name ''
+zstyle ':completion:*' verbose yes
+zstyle ':completion::complete:*' use-cache on
+zstyle ':completion::complete:*' cache-path "$HOME/.zcompcache"
+zstyle ':completion:*' list-colors $LS_COLORS
 zstyle ':completion:*:processes' command 'ps -au $USER -o pid,stat,%cpu,%mem,cputime,command'
 zstyle ':completion:*:killall:*' command 'ps -u $USER -o pid,%cpu,tty,cputime,cmd'
-zstyle ':completion:*' verbose true
-zstyle ':completion:*:warnings' format 'No matches for: %F{cyan}%d%f'
-zstyle ':completion::(^approximate*):*:functions' ignored-patterns '_*'
 zstyle ':completion:*:processes-names' command 'ps c -u ${USER} -o command | uniq'
 zstyle ':completion:*:manuals' separate-sections true
 zstyle ':completion:*:manuals.(^1*)' insert-sections true
 zstyle ':completion:*:man:*' menu yes select
-zstyle ':completion:*' completer _oldlist _expand _complete _files _ignored
-zstyle ':completion:*' rehash true
 zstyle ':completion:*:parameters' list-colors '=*=34'
 zstyle ':completion:*:commands' list-colors '=*=32'
 zstyle ':completion:*:builtins' list-colors '=*=1;38;5;142'
@ -105,46 +257,108 @@ zstyle ':completion:*:aliases' list-colors '=*=2;38;5;120'
 zstyle ':completion:*:options' list-colors '=^(-- *)=34'
 zstyle ':completion:*' list-separator "--"
 zstyle ':completion:*:default' list-colors '=(#b)*(-- *)=36=33' '=*=36'
-zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#)*( *[a-z])*=34=31=33'
-zstyle ':completion:*:*:*:*:processes' command "ps -u `whoami` -o pid,user,comm -w -w"
-zstyle ':completion::complete:*' use-cache on
-zstyle ':completion::complete:*' cache-path "$HOME/.zplugin/cache"
-zstyle ':completion:*' completions 1
-zstyle ':completion:*' expand prefix suffix
-zstyle ':completion:*' file-sort modification
-zstyle ':completion:*' glob 1
-zstyle ':completion:*' list-suffixes true
-zstyle ':completion:*' list-rows-first true
-zstyle ':completion:*' match-original both
-zstyle ':completion:*' max-errors 1 numeric
-zstyle ':completion:*' old-list _complete _approximate _expand _correct _match _prefix
-zstyle ':completion:*' old-menu false
-zstyle ':completion:*' substitute 1
-zstyle ':completion:*' word true
-zstyle ':completion:*' accept-exact '*(N)'
-zstyle ':completion:*:complete:-command-::commands' ignored-patterns '*\~'
-zstyle ':completion:*' list-dirs-first true
-zstyle ':completion:*' special-dirs true
-zstyle -e ':completion:*' special-dirs '[[ $PREFIX = (../)#(|.|..) ]] && reply=(..)'
-zstyle ':completion:*:*:-subscript-:*' tag-order indexes parameters
-zstyle ':completion:*:*:kill:*' menu yes select
-zstyle ':completion:*:*:kill:*' force-list always
-zstyle ':completion:*:*:kill:*' insert-ids single
-zstyle ':completion:*:cd:*' tag-order local-directories directory-stack path-directories
-zstyle ':completion:*:*:cd:*:directory-stack' force-list always
-zstyle ':completion:*:*:cd:*:directory-stack' menu yes select
-zstyle ':completion:*:*:*:*:users' list-colors '=*=$color[green]=$color[red]'
-zstyle ':completion:*:*:*:users' ignored-patterns \
-        adm amanda apache at avahi avahi-autoipd beaglidx bin cacti canna \
-        clamav daemon dbus distcache dnsmasq dovecot fax ftp games gdm \
-        gkrellmd gopher hacluster haldaemon halt hsqldb ident junkbust kdm \
-        ldap lp mail mailman mailnull man messagebus  mldonkey mysql nagios \
-        named netdump news nfsnobody nobody nscd ntp nut nx obsrun openvpn \
-        operator pcap polkitd postfix postgres privoxy pulse pvm quagga radvd \
-        rpc rpcuser rpm rtkit scard shutdown squid sshd statd svn sync tftp \
-        usbmux uucp vcsa wwwrun xfs '_*'
-
-zstyle ':completion:*' list-prompt %SAt %p: Hit TAB for more, or the character to insert%s
-zstyle ':completion:*' select-prompt %SScrolling active: current selection at %p%s
+zstyle ':completion::*:kill:*:*' command 'ps xf -U $USER -o pid,%cpu,cmd'
+zstyle ':completion:*:*:kill:*:processes' list-colors '=(#b) #([0-9]#) ([0-9a-z-]#)*=01;34=0=01'
+zstyle ':completion:*' matcher-list 'm:{a-zA-Z}={A-Za-z}' 'r:|[._-]=* r:|=*' 'l:|=* r:|=*'
+zstyle ':completion:*:functions' ignored-patterns '(_*|pre(cmd|exec))'
+zstyle ':completion:*' rehash true
 # }}}
-# vim:foldmethod=marker:foldlevel=0
+# History {{{
+export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"
+HISTFILE="$MODULES_DIR/histfile"
+HISTSIZE=1000
+SAVEHIST=1000
+setopt appendhistory notify
+unsetopt beep extendedglob nomatch
+# Treat the '!' character specially during expansion.
+setopt BANG_HIST
+# Write to the history file immediately, not when the shell exits.
+setopt INC_APPEND_HISTORY
+# Share history between all sessions.
+setopt SHARE_HISTORY
+# Expire a duplicate event first when trimming history.
+setopt HIST_EXPIRE_DUPS_FIRST
+# Do not record an event that was just recorded again.
+setopt HIST_IGNORE_DUPS
+# Delete an old recorded event if a new event is a duplicate.
+setopt HIST_IGNORE_ALL_DUPS
+# Do not display a previously found event.
+setopt HIST_FIND_NO_DUPS
+# Do not record an event starting with a space.
+setopt HIST_IGNORE_SPACE
+# Do not write a duplicate event to the history file.
+setopt HIST_SAVE_NO_DUPS
+# Do not execute immediately upon history expansion.
+setopt HIST_VERIFY
+# Show timestamp in history
+setopt EXTENDED_HISTORY
+# }}}
+# All Other Packages {{{
+source_or_install "$MODULES_DIR/agkozak/agkozak-zsh-prompt/agkozak-zsh-prompt.plugin.zsh" agkozak/agkozak-zsh-prompt
+AGKOZAK_BLANK_LINES=1
+AGKOZAK_CUSTOM_SYMBOLS=( '⇣⇡' '⇣' '⇡' '+' 'x' '!' '>' '?' )
+AGKOZAK_CUSTOM_PROMPT='%(?..%B%F{red}(%?%)%f%b )'
+AGKOZAK_CUSTOM_PROMPT+=$'%B%F{blue}%2v%f%b '
+AGKOZAK_CUSTOM_PROMPT+='%F{green}%(4V.:.%(!.%#.$))%f '
+AGKOZAK_PROMPT_DIRTRIM=0
+
+source /usr/share/zsh/plugins/zsh-autopair/autopair.zsh
+source /usr/share/LS_COLORS/dircolors.sh
+source $MODULES_DIR/up.plugin.zsh
+source_or_install "$MODULES_DIR/zsh-users/zsh-completions/zsh-completions.plugin.zsh" zsh-users/zsh-completions
+
+if [[ -d /usr/share/fzf ]]; then
+    source /usr/share/fzf/key-bindings.zsh
+    source /usr/share/fzf/completion.zsh
+fi
+
+source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
+source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
+
+source $MODULES_DIR/keys.zsh
+source $MODULES_DIR/extras.zsh
+source $MODULES_DIR/fzf.zsh
+source $MODULES_DIR/transmission.zsh
+source $MODULES_DIR/aliases.plugin.zsh
+source $MODULES_DIR/omg.zsh
+# }}}
+# CDR, Persistent cd {{{
+autoload -Uz chpwd_recent_dirs cdr add-zsh-hook
+add-zsh-hook chpwd chpwd_recent_dirs
+DIRSTACKFILE="$HOME/.cache/zsh/dirs"
+
+# make DIRSTACKFILE if it's not there
+if [[ ! -a $DIRSTACKFILE ]]; then
+    mkdir -p $DIRSTACKFILE[0,-5]
+    touch $DIRSTACKFILE
+fi
+
+if [[ -f $DIRSTACKFILE ]] && [[ $#dirstack -eq 0 ]]; then
+    dirstack=( ${(f)"$(< $DIRSTACKFILE)"} )
+fi
+
+chpwd() {
+    print -l $PWD ${(u)dirstack} >>$DIRSTACKFILE
+    d="$(sort -u $DIRSTACKFILE )"
+    echo "$d" > $DIRSTACKFILE
+}
+
+DIRSTACKSIZE=20
+
+setopt AUTO_PUSHD PUSHD_SILENT PUSHD_TO_HOME
+
+# Remove duplicate entries
+setopt PUSHD_IGNORE_DUPS
+
+# This reverts the +/- operators.
+setopt PUSHD_MINUS
+# }}}
+# End Profiling Script {{{
+if [[ "$PROFILE_STARTUP" == true ]]; then
+    unsetopt xtrace
+    exec 2>&3 3>&-
+    zprof > ~/zshprofile
+fi
+# }}}
+
+# vim:foldmethod=marker:foldlevel=0
--- a/bin/2bspwm
+++ b/bin/2bspwm
@ -1,51 +0,0 @@
-#!/usr/bin/env dash
-# neeasade
-# depends on: colort, wmutils opt/chwb2
-# makes dual borders based on your bspwm colors
-
-focusedTint=80
-normalTint=20
-
-# set border widths, if odd outer is 1px larger
-borderWidth=`bspc config border_width`
-
-# optionally vary width based on focused or not
-
-# half if even, 1px to outer if odd
-inWidthNormal=$(( $borderWidth/2 ))
-outWidthNormal=$(( ($borderWidth/2) + ($borderWidth%2) ))
-
-inWidthFocused=$(( $inWidthNormal + 0 ))
-outWidthFocused=$((  $outWidthNormal - 0 ))
-
-# _chwb2 [Focused|Normal] [nodeId]
-_chwb2() {
-    colorType=$1
-    shift
-    _getVal() {
-	eval echo \$$1$colorType
-    }
-
-    chwb2 -I $(_getVal inner) -O $(_getVal outer) -i $(_getVal inWidth) -o $(_getVal outWidth) $@ 2>/dev/null &
-}
-
-# define border colors based on bspwm border settings
-outerFocused=`bspc config focused_border_color | tr -d \#`
-colort -c "$outerFocused" && sign=+ || sign=-
-innerFocused=`colort -l $sign$focusedTint "$outerFocused"`
-echo $innerFocused
-echo $outerFocused
-
-outerNormal=`bspc config normal_border_color | tr -d \#`
-colort -c "$outerNormal" && sign=+ || sign=-
-innerNormal=`colort -l $sign$normalTint "$outerNormal"`
-
-# initial draw
-_chwb2 Normal  `bspc query -N -n .!descendant_of.window.!fullscreen`
-_chwb2 Focused `bspc query -N -n .descendant_of.window.!fullscreen`
-
-# reactive draw
-bspc subscribe node_state node_geometry node_focus | while read msg; do
-    _chwb2 Normal  `bspc query -N -n .!descendant_of.window.!fullscreen`
-    _chwb2 Focused `bspc query -N -n .descendant_of.window.!fullscreen`
-done
--- a/bin/actualizar
+++ b/bin/actualizar
@ -1,12 +0,0 @@
-#!/bin/sh
-
-	if ! updates=$(trizen -Su --aur --quiet | wc -l); then
-	    updates=0
-	fi
-
-	if [ "$updates" -gt 0 ]; then
-	    notify-send -t 3000 "$updates updates available"
-	    #echo "↓ $updates"
-	else
-	    echo ""
-	fi
--- a/bin/cfg
+++ b/bin/cfg
@ -7,6 +7,7 @@ case $1 in
 	keys) $EDITOR ~/.config/sxhkd/sxhkdrc ;;
 	mutt) $EDITOR ~/.config/mutt/muttrc ;;
 	zsh) $EDITOR ~/.zshrc ;;
+	alias) $EDITOR ~/.config/zsh/aliases.plugin.zsh ;;
 	bar) $EDITOR ~/.config/polybar/config ;;
 	dunst) $EDITOR ~/.config/dunst/dunstrc ;;
 	term) $EDITOR ~/.config/termite/config ;;
--- a/bin/presel.sh
+++ b/bin/presel.sh
@ -2,24 +2,29 @@

 # Shamelessly stolen from https://github.com/neeasade/dotfiles/tree/master/wm/.wm/scripts/interact

+bspc node -p \~$*
+
+# single is buggy rn
+exit
+
 # if we only have one, use our border thing
-if bspc query -N -n focused.leaf && command -v chbpresel 2>/dev/null 1>&2; then
+if bspc query -N -n focused.leaf && which chbpresel 2>/dev/null 1>&2; then
    (
        cond=true
        while $cond; do
            presel_win=$(xdotool search --classname "presel_feedback")
            if [ ! -z "$presel_win" ]; then
                cond=false
-                compton-trans -w "$presel_win" 0
+                compton-trans -w $presel_win 0
            fi
        done
    ) &

-    bspc node -p "$*"
+    bspc node -p $*

    back="$(colort -t $(bspc config focused_border_color))"

-    colort -c "$back" && \
+    colort -c $back && \
        forward="$(colort -t  100 $(bspc config focused_border_color))" || \
        forward="$(colort -t -100 $(bspc config focused_border_color))"

@ -31,7 +36,7 @@ if bspc query -N -n focused.leaf && command -v chbpresel 2>/dev/null 1>&2; then
        west) dir=2 ;;
    esac

-    chbpresel -C "$forward" -c "$back" -d "$dir" "$(bspc query -N -n)"
+    chbpresel -C $forward -c $back -d $dir $(bspc query -N -n)
 else
-    bspc node -p "$*"
+    bspc node -p $*
 fi
--- a/bin/ramux
+++ b/bin/ramux
@ -1,5 +0,0 @@
-#!/bin/bash
-
-if command -v tmux >/dev/null 2>&1; then
-    test -z "$TMUX" && (tmux new -A -s Ranger 'ranger')
-fi
--- a/bin/rld
+++ b/bin/rld
@ -4,7 +4,6 @@ case $1 in
 	zsh) source ~/.zshrc ;;
 	fonts) fc-cache -v -f ;;
 	keys) pkill -USR1 -x sxhkd ;;
-	st) xrdb ~/.Xresources && pkill -USR1 -x st ;;
 	dunst) ~/.config/dunst/./reload ;;
 	comp) pkill compton && compton -bcCGf ;;
 	xres) xrdb ~/.Xresources ;;
--- a/bin/tapa
+++ b/bin/tapa
@ -1,50 +1,48 @@
-#!/bin/bash
+#!/usr/bin/env bash
+set -euf -o pipefail

-# Hacked together from various bits and pieces from github, r/unixporn, and the awesome help from people in #bash, #zsh, and #archlinux-newbie on freenode.
-# This script assumes your music library is organized like so:
-#	$music_dir/artist/album
-# Steal it, use it, mod it, share it.
+# Hacked together by deadguy from various bits and pieces from manpages,
+# stackexchange, github, r/unixporn, and the awesome help from people in
+# #bash, #zsh, and #archlinux-newbie on freenode.
+
+# Steal it, use it, mod it, share it, love it.

 # CONFIG ----------------------------------------------------
-music_dir="$HOME/Music/Albums"								# This needs to be the same as in mpd.conf
-cover_resize="100"											# What should the covers be resized to
-img_reg=".*/(cover|front|folder|art).(jpg|jpeg|png|gif)$"	# What is the cover file called?
+
+# This NEEDS to be the same as in mpd.conf
+music_dir="$HOME/Music/Albums"
+
+# What should the covers be resized to in pixels
+cover_resize="150"
+
+# What is the cover file called?
+img_reg=".*/(cover|front|folder|art).(jpg|jpeg|png|gif)$"
+
+# What do we want the notification to look like?
 artist_color="##a1b56c"
 album_color="##ad7fa8"
 song_color="##34e2e2"

-# What do we want the notification to look like?
-title="<span color='$artist_color' weight='bold'>%artist%</span>"
-form="<span color='$song_color'>%title%</span> - <span color='$album_color'>%album%</span>"
+title="<span color='$album_color' weight='bold'>%album%</span>"
+form="<span color='$artist_color'>%artist%</span> - <span color='$song_color'>%title%</span>"
+
 # END CONFIG ----------------------------------------------------

 # These are some variables we need for things to work
 song="$(mpc --format %file% current)"
-album="$(mpc --format %album% current)"
-artist="$(mpc --format %artist% current)"
-albart="$(mpc --format %albumartist% current)"
-dir="$music_dir/$artist/$album/"
+songdir="$music_dir/$(dirname "${song}")/"
 temp_path="/tmp/current_cover.png"
 heading="$(mpc current -f "$title" | sed "s:&:&amp;:g")"
 message="$(mpc current -f "$form" | sed "s:&:&amp;:g" )"

-# Is there music on
+# Is there music on?
 [[ -z $song ]] && exit 1

-# Where to look for album covers
-if [[ -d "$dir" ]] ; then
-		album_dir="$dir"
-	elif [[ -z "$album_dir" ]] ; then
-		album_dir="$music_dir/$album/"
-	else
-		album_dir="$music_dir/$albart/$album/"
-fi
-
 # No cover if the folder isn't found
-[[ -z "$album_dir" ]] && exit 1
+[[ -z "$songdir" ]] && exit 1

 # But if it is found, look for only one of the specified files
-cover="$(find "$album_dir" -maxdepth 1 -type f -regextype egrep -regex "$img_reg" 2>/dev/null)"
+cover="$(find "$songdir" -maxdepth 1 -type f -regextype egrep -regex "$img_reg" 2>/dev/null)"

 # Resize the cover
 if [[ -n $cover ]]; then
@ -53,4 +51,4 @@ if [[ -n $cover ]]; then
 fi

 # Send the notification
-dunstify -a MPD -r 1337 -u low -t 8000 -i "$cover" "$heading" "$message"
+notify-send -u low -t 8000 -i "$cover" "$heading" "$message"
				`@ -1 +0,0 @@`
				`/home/deadguy/.zplugin/plugins/tj---git-extras/etc/git-extras-completion.zsh`