diff --git a/.Xresources b/.Xresources
deleted file mode 100644
index 546d98f..0000000
--- a/.Xresources
+++ /dev/null
@@ -1,95 +0,0 @@
-! #####################
-! #         st        #
-! #####################
-! General settings ================{{{
-! These are all possible options, presented with default values.
-! xst will fallback to *.option if st.option is not present.
-! see src/config.h for more information about option meanings.
-
-! These options only take effect on startup.
-! st.termname:          st-256color
-! if you do not set shell, precedence is: -e arg, utmp option, SHELL env var, /etc/passwd shell
-st.shell:            /bin/mksh
-
-! The following options options can be reloaded via USR1 signal.
-st.font:              Monaco:size=9
-st.italicFont:        Monaco:italic:size=9
-st.borderpx:          35
-! Available cursor values: 2 4 6 7 = █ _ | ☃ ( 1 3 5 are blinking versions)
-st.cursorshape:       2
-! thickness of underline and bar cursors
-st.cursorthickness:   2
-! 0: normal blinking, 1: leave cursor border and blink with cursors background
-st.cursorblinkstyle:  0
-! 0: cursor blinks with a constant interval; 1: blinking cycle resets on key input
-st.cursorblinkontype: 1
-st.bold_font:         0
-st.xfps:              120
-st.actionfps:         30
-! Kerning / character bounding-box height multiplier
-st.chscale:           1.0
-! Kerning / character bounding-box width multiplier
-st.cwscale:           1.0
-! blinking timeout for terminal and cursor blinking (0 disables)
-st.blinktimeout:      800
-! bell volume. Value between -100 and 100. (0 disables)
-st.bellvolume:        0
-! this is a char that is exposed like so: `printf '\033[z'`
-st.prompt_char:       $
-! opacity==255 means what terminal will be not transparent, 0 - fully transparent
-st.opacity:      255
-
-#define self0 #3A4B52
-#define self1 #e15443
-#define self2 #A3BE8C
-#define self3 #e6b800
-#define self4 #458588
-#define self5 #B69D8A
-#define self6 #689d6a
-#define self7 #ffffff
-#define self8 #35444b
-#define self9 #cc241d
-#define self10 #004d00
-#define self11 #cca300
-#define self12 #566976
-#define self13 #b09682
-#define self14 #71828e
-#define self15 #ebdbb2
-
-#define nord0 #2E3440
-#define nord1 #3B4252
-#define nord2 #434C5E
-#define nord3 #4C566A
-#define nord4 #D8DEE9
-#define nord5 #E5E9F0
-#define nord6 #ECEFF4
-#define nord7 #8FBCBB
-#define nord8 #88C0D0
-#define nord9 #81A1C1
-#define nord10 #5E81AC
-#define nord11 #BF616A
-#define nord12 #D08770
-#define nord13 #EBCB8B
-#define nord14 #A3BE8C
-#define nord15 #B48EAD
-
-*.foreground:   self7
-*.background:   #3A4B52
-*.cursorColor:  self4
-
-*.color0: #3A4B52
-*.color1: nord11
-*.color2: nord14
-*.color3: nord13
-*.color4: nord9
-*.color5: nord15
-*.color6: nord8
-*.color7: nord5
-*.color8: nord3
-*.color9: nord11
-*.color10: nord14
-*.color11: nord13
-*.color12: nord9
-*.color13: nord15
-*.color14: nord7
-*.color15: nord6
diff --git a/.aliases b/.aliases
index 779f13c..8f8c144 100644
--- a/.aliases
+++ b/.aliases
@@ -16,7 +16,8 @@ alias mkdir='mkdir -p -v'				# create if not exist, verbose
 alias con='ps -A --sort -rsz -o comm,pmem,pcpu|awk "NR<=15"'
 ed() { command ed -p "> " "$@" ;}
 alias which='command -v'
-
+alias startx='startx "$XDG_CONFIG_HOME/X11/xinitrc" -- "$XDG_CONFIG_HOME/X11/xserverrc" vt1'
+alias bash='bash --init-file $XDG_CONFIG_HOME/bash/bashrc'
 # color for common commands
 # tutorial video: http://www.youtube.com/watch?v=RbVCzxnKJL4
 if [ -x /usr/bin/dircolors ]; then
@@ -32,36 +33,37 @@ fi
 # }}}
 # Useful programming aliases {{{
 
-alias e="$EDITOR"
+alias e=$EDITOR
 alias g=git
-alias tmux="tmux"
+test -e "$XDG_CONFIG_HOME/tmux/tmux.conf" && alias tmux='tmux -f $XDG_CONFIG_HOME/tmux/tmux.conf'
 alias t="tmux"
 alias ta="tmux a"
 alias h='function hdi(){ howdoi $* -c -n 3; }; hdi'
 alias :sp='test -n "$TMUX" && tmux split-window'
 alias :vs='test -n "$TMUX" && tmux split-window -h'
-alias :wq=exit
 alias myip='wget -qO- http://ipecho.net/plain ; echo'
 docx() { pandoc -f docx -t rst "$@" | vim - ; }
-alias note='vim ~/syncthing/markor/Tasks/notes.md'
-alias stnote='st -c scratchterm -g 80x20 -e vim $HOME/syncthing/markor/Tasks/notes.md -c :Goyo &'
 #alias note='cd $HOME/syncthing/markor/Tasks/ && vim `fzf --preview="cat {}" --preview-window=right:70%:wrap` && cd ~'
 
 # }}}
 # Useful general aliases {{{
 
-alias kpcli='kpcli --kdb $HOME/syncthing/keepass/keypass.kdb'
-alias mp3="youtube-dl --extract-audio --audio-format mp3 "
+yt() { mpv --ytdl-format=136+251/136+171/136+250/136+140 "$@" ;}
+#alias mp3="youtube-dl --extract-audio --audio-format mp3 "
+alias kpcli='kpcli --kdb $HOME/usr/syncthing/keepass/keepass.kdbx'
+alias dotfiles="/usr/bin/git --git-dir=$HOME/.dotfiles.git/ --work-tree=$HOME"
 alias vimrc="$EDITOR ~/.vimrc"
+alias nvimrc="$EDITOR ~/.config/nvim/init.vim"
 alias mkshrc="$EDITOR ~/.mkshrc"
-alias muttrc="$EDITOR ~/.muttrc"
-alias tmuxconf="$EDITOR ~/.tmux.conf"
-alias porn="mpv https://www.pornhub.com/random"
-alias xmo='xmodmap ~/.Xmodmap'
+alias xmo='xmodmap $XDG_CONFIG_HOME/X11/Xmodmap'
+#alias bashrc='$EDITOR ~/.bashrc'
+alias zshrc='$EDITOR ~/.zshrc'
+alias torlinks='links -socks-proxy 127.0.0.1:9050'
 
 # }}}
 # Useless aliases {{{
 
+chaturbate(){ mpv --ytdl-format=slow-2 "$@" ;}
 alias weather='curl -s wttr.in/uberlandia | head -5'       # print weather
 alias weatherforecast='curl -s wttr.in/uberlandia | head -37 | tail -30'
 alias starwars="telnet towel.blinkenlights.nl"
@@ -69,33 +71,17 @@ alias shrug="echo '¯\_(ツ)_/¯' | xclip -i -selection clipboard" #emotes/faces
 alias lenny="echo '( ͡° ͜ʖ ͡°)' | xclip -i -selection clipboard"
 alias fu="echo '┌∩┐(◣_◢)┌∩┐' | xclip -i -selection clipboard"
 alias cry="echo '( -̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥᷄◞ω◟-̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥᷅ )' | xclip -i -selection clipboard"
-# Aliases to help with my github bare repo
-# Links: https://developer.atlassian.com/blog/2016/02/best-way-to-store-dotfiles-git-bare-repo/
-#		 https://harfangk.github.io/2016/09/19/manage-dotfiles-with-a-git-bare-repository.html
-alias dotfiles="/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME"
-#alias df="/usr/bin/git --git-dir=$HOME/bare-dotfiles/ --work-tree=$HOME"
-
 # Do something and receive a desktop alert when it completes `sudo apt-get install something | alert`
-alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
+#alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
 
 # }}}
 
 # }}}
-
-# Functions ============================={{{
-
 # Upload files  ##########################{{{
 
 # ix.io - txt file upload
 ix() {
-    curl -F- f:1='<-' ix.io < "$*"
-}
-
-# haste - txt file upload
-haste() {
-    a=$(cat);
-    curl -X POST -s -d "$a" https://hastebin.com/documents | \
-        awk -F '"' '{print "https://hastebin.com/"$4}' | xclip -sel clip;
+    curl -sF f:1='<-' ix.io < "$*"
 }
 
 # iotek - txt file upload
@@ -103,364 +89,33 @@ io(){
     curl -sT- https://p.iotek.org < "$*"
 }
 
-#fuwa
-fuwa() {
-    for i in "$@"; do
-        curl -s -F file=@$i} https://fuwa.se/api/upload
-    done
-}
-
 ### uguu - txt/images upload only for 24 hours
 uguu () {
-    for arg in $*; do
+    for i in $*; do
         curl -i -F file=@"$i" https://uguu.se/api.php?d=upload-tool | grep https
     done
 }
 
-### mixtape - txt/image upload up to 100MB
-mix() {
+fuwa() {
     for i in "$@"; do
-        curl -sf -F files[]=$i https://mixtape.moe/upload.php
+        curl -s -F file=@${i} https://fuwa.se/api/upload
     done
 }
 
-### 0x0 - txt/image upload up to 512MB
-0x0() {
-    for i in "$@"; do
-        finalResult="$(curl -sf -F file="@$i" https://0x0.st/)"
-            printf "$finalResult" | xclip -selection clipboard
-            notify-send "Uploaded!" "${finalResult}"
-            done
-}
-
-### ptpb - txt/image upload
-ptpb() {
-    for i in "$@"; do
-        finalResult="$(curl -sf -F c="@$i" https://ptpb.pw/)"
-            finalResult="${finalResult##*url: }"
-            finalResult="${finalResult%%$'\n'*}"
-            printf "$finalResult" | xclip -selection clipboard
-            notify-send "Uploaded!" "${finalResult}"
-            done
-}
-
-### transfer - any file upload for 14 days (up to 10gb) - the link is a download link
-transfer() {
+### mixtape - txt/image upload up to 100MB
+mix() {
     for i in "$@"; do
-        finalResult="$(curl -sS -T $i https://transfer.sh/)"
-        printf "$finalResult" | xclip -selection clipboard
-        notify-send "Uploaded!" "${finalResult}"
+        curl -sf -F files[]=$i https://mixtape.moe/upload.php
     done
 }
 
 # anonfile - any file upload up to 10gb (this site is like transfer.sh) - the link is a download link
 anon() {
     for i in "$@"; do
-        curl -F "file=@$i" https://anonfile.com/api/upload | sed 's/.*short":"//;s/"}.*//'
-        echo
+        curl -F document=@$i https://anonfiles.cc/api/upload
     done
 }
 
-# }}}
-# Transmission ########################### {{{
-# DEMO: http://www.youtube.com/watch?v=hLz7ditUwY8
-# LINK: https://github.com/fagga/transmission-remote-cli
-# Remember: edit .config/transmission-remote-cli/settings.cfg and set password as transmission to get it work
-# DESC: ncurses frontend to transmission-daemon
-tsm-ncurse() { sudo transmission-remote-cli ;}
-tsm-start(){ transmission-daemon ;}
-tsm-kill(){ killall transmission-daemon ;}
-
-# }}}
-# Internet ###############################{{{
-
-
-# Getting tips #############{{{
-
-# Get commands cheatsheets
-cheatsheet() { curl cheat.sh/$1; }
-
-# search commandlinefu.com
-cmdfu() { curl "http://www.commandlinefu.com/commands/matching/$(echo "$@" \
-	| sed 's/ /-/g')/$(echo -n $@ | base64)/plaintext" ;}
-
-# display one random command from commandlinefu.com
-cmdfu-random() { echo -e "`curl -sL http://www.commandlinefu.com/commands/random/json|sed -re 's/.*,"command":"(.*)","summary":"([^"]+).*/\\x1b[1;32m\2\\n\\n\\x1b[1;33m\1\\x1b[0m/g'`\n" ;}
-
-
-# }}}
-# SPPC #####################{{{
-sppc() {
-  # choose a player (cvlc is default)
-  # SP_VIDPLAYER=cvlc
-  # SP_VIDPLAYER=(cvlc --file-caching=10000)
-  # SP_VIDPLAYER=(cvlc --video-on-top --width=500 --height=280 --video-x=-15 --video-y=-50)
-  # SP_VIDPLAYER=vlc
-  # SP_VIDPLAYER=(vlc --control=lirc)
-  # SP_VIDPLAYER=mplayer
-  # SP_VIDPLAYER=(mplayer -cache 1000)
-  # SP_VIDPLAYER=mpv
-  # SP_VIDPLAYER=(mpv --cache=1000)
-  # SP_VIDPLAYER=(mpv --ontop --no-border --force-window --autofit=500x280 --geometry=-15-50)
-  SP_VIDPLAYER=(mpv --cache=2048 --ontop --no-border --force-window --autofit=500x280 --geometry=-15-50)
-
-  # sopcast port
-  SP_LOCAL_PORT=55050
-
-  # ip address and port for video player to connect to
-  SP_PLAYER_IPADDR=localhost
-  SP_PLAYER_PORT=55051
-
-  echo -e "${Red}>>>Kill any exiting sopcast connection ${Color_Off}"
-    killall sp-sc &>/dev/null
-  echo -e "${Yellow}>>>Loading sopcast connection ${Color_Off}"
-    (sp-sc "$1" "$SP_LOCAL_PORT" "$SP_PLAYER_PORT" &>/dev/null &)
-  echo -e "${Yellow}>>>Check if sopcast stream is alive at $SP_PLAYER_IPADDR:$SP_PLAYER_PORT [hit Ctrl+C on this screen to exit properly] ${Color_Off}"
-    until nc -vzw 2 "$SP_PLAYER_IPADDR" "$SP_PLAYER_PORT"; do sleep 2; done
-  echo -e "${Green}>>>Connecting to sopcast stream ${Color_Off}"
-    ($SP_VIDPLAYER http://"$SP_PLAYER_IPADDR":"$SP_PLAYER_PORT")
-  echo "${On_IRed}>>>Video Player has exited properly. Killing sopcast stream now ${Color_Off}"
-    wait
-    killall sp-sc
-}
-
-# manually kill sopcast (sometimes it doesnt exit properly and still uses bandwidth in the background)
-sppc-kill() { killall sp-sc ;}
-
-# channel list
-spp-acasa() { sppc "sop://broker.sopcast.com:3912/149256" ;}
-spp-acasagolda() { sppc "sop://broker.sopcast.com:3912/253471" ;}
-spp-acasatv() { sppc "sop://broker.sopcast.com:3912/149256" ;}
-spp-antena1a() { sppc "sop://broker.sopcast.com:3912/149257" ;}
-spp-antena1b() { sppc "sop://broker.sopcast.com:3912/151301" ;}
-spp-antena1c() { sppc "sop://broker.sopcast.com:3912/148083" ;}
-spp-antenastars() { sppc "sop://broker.sopcast.com:3912/148255" ;}
-spp-antena3() { sppc "sop://broker.sopcast.com:3912/148084" ;}
-spp-axn() { sppc "sop://broker.sopcast.com:3912/253035" ;}
-spp-axnblack() { sppc "sop://broker.sopcast.com:3912/149261" ;}
-spp-axnwhite() { sppc "sop://broker.sopcast.com:3912/149262" ;}
-spp-b1() { sppc "sop://broker.sopcast.com:3912/148087" ;}
-spp-boomerang() { sppc "sop://broker.sopcast.com:3912/149264" ;}
-spp-cartoonnetwork() { sppc "sop://broker.sopcast.com:3912/148254" ;}
-spp-digiworld() { sppc "sop://broker.sopcast.com:3912/148260" ;}
-spp-digisport1a() { sppc "sop://broker.sopcast.com:3912/148886" ;}
-spp-digisport1b() { sppc "sop://broker.sopcast.com:3912/173020" ;}
-spp-digisport2c() { sppc "sop://broker.sopcast.com:3912/263242" ;}
-spp-discoverychannel() { sppc "sop://broker.sopcast.com:3912/256241" ;}
-spp-discoveryscience() { sppc "sop://broker.sopcast.com:3912/256243" ;}
-spp-disneychannel() { sppc "sop://broker.sopcast.com:3912/253031" ;}
-spp-disneyjunior() { sppc "sop://broker.sopcast.com:3912/256239" ;}
-spp-diva() { sppc "sop://broker.sopcast.com:3912/253034/123456" ;}
-spp-divauniversal() { sppc "sop://broker.sopcast.com:3912/253034" ;}
-spp-ducktv() { sppc "sop://broker.sopcast.com:3912/148259" ;}
-spp-etnotv() { sppc "sop://broker.sopcast.com:3912/173116" ;}
-spp-euforia() { sppc "sop://broker.sopcast.com:3912/253473" ;}
-spp-eurosport1() { sppc "sop://broker.sopcast.com:3912/263056" ;}
-spp-filmbox() { sppc "sop://broker.sopcast.com:3912/148981" ;}
-spp-filmcafe() { sppc "sop://broker.sopcast.com:3912/256238" ;}
-spp-hbo+hd() { sppc "sop://51.15.38.157:3912/260710" ;}
-spp-idx() { sppc "sop://broker.sopcast.com:3912/256244" ;}
-spp-kanald() { sppc "sop://broker.sopcast.com:3912/149258" ;}
-spp-minimax() { sppc "sop://broker.sopcast.com:3912/148263" ;}
-spp-natgeowild() { sppc "sop://broker.sopcast.com:3912/253037" ;}
-spp-nationalgeographic() { sppc "sop://broker.sopcast.com:3912/148248" ;}
-spp-nationaltv() { sppc "sop://broker.sopcast.com:3912/253030" ;}
-spp-nickelodeon() { sppc "sop://broker.sopcast.com:3912/253472" ;}
-spp-paramount() { sppc "sop://broker.sopcast.com:3912/253033" ;}
-spp-primatv() { sppc "sop://broker.sopcast.com:3912/148086" ;}
-spp-procinema() { sppc "sop://broker.sopcast.com:3912/148249" ;}
-spp-protva() { sppc "sop://broker.sopcast.com:3912/149252" ;}
-spp-protvb() { sppc "sop://broker.sopcast.com:3912/151380" ;}
-spp-realitateatv() { sppc "sop://broker.sopcast.com:3912/253036" ;}
-spp-romaniatv() { sppc "sop://broker.sopcast.com:3912/148258" ;}
-spp-sport.ro() { sppc "sop://broker.sopcast.com:3912/178547" ;}
-spp-tlc() { sppc "sop://broker.sopcast.com:3912/148256" ;}
-spp-traveltv() { sppc "sop://broker.sopcast.com:3912/148885" ;}
-spp-tv1000() { sppc "sop://broker.sopcast.com:3912/256337/123456" ;}
-spp-tvpaprika() { sppc "sop://broker.sopcast.com:3912/148881" ;}
-spp-tv1000() { sppc "sop://broker.sopcast.com:3912/256337" ;}
-spp-tvr1() { sppc "sop://broker.sopcast.com:3912/148085" ;}
-spp-tvr2() { sppc "sop://broker.sopcast.com:3912/173286" ;}
-spp-viasathistory() { sppc "sop://broker.sopcast.com:3912/151300" ;}
-spp-zutv() { sppc "sop://broker.sopcast.com:3912/148252" ;}
-
-
-# format channel to functions quicker
-# e.g soprip newchannels.txt
-soprip() {
-  if [ $# -lt 1 ]
-  then
-    echo -e "turn sopcast channel listing into functions"
-    echo -e "copy sopcast list from http://sopcast.ucoz.com/ to text file"
-    echo -e "\nUsage:\n$0 <filename.txt>"
-    return 1
-  fi
-  # lowercase list; rm spaces/empty lines; merge name and link
-  LIST=$(cat "$1" | tr '[:upper:]' '[:lower:]' | sed 's/ //g' | sed '$!N;s/\n/ /' | sed '/^$/d')
-  echo $LIST | while read line; do
-    SOPNAME=$(echo $line | awk '{print $1}')
-    SOPLINK=$(echo $line | awk '{print $2}')
-    # print into functions format
-    echo "spp-"$SOPNAME"() { sppc \""$SOPLINK"\" ;}"
-  done
-}
-
-#}}}
-
-# }}}
-# Educational Videos #######{{{
-# requirements:
-#     1. install nohup mpv vim youtube-dl
-#     2. add this to your ~/.vimrc
-#        map <F8> :exec '!nohup mpv ' . shellescape(getline('.'), 1) . ' >/dev/null 2>&1&'<CR><CR>
-#
-# how to use:
-#     1. fap-xvideos ashlynn brooke
-#     2. hit F8 on the link you want to play
-#     3. hit ZZ or ZQ to quit vim
-fap-xvideos() {
-keyword="$(echo "http://www.xvideos.com/?k=$@" | sed 's/ /\+/g')"
-pagenum=5
-pagenum_to_url=$(for num in $(seq 1 "$pagenum"); do echo "$keyword&p=$num"; done )
-videourl=$(echo "$pagenum_to_url" | while read line; do elinks -dump "$line" \
-	| awk '/xvideos\.com\/video/ {print $2}' | awk '!x[$0]++' ; done)
-
-echo $videourl | sed 's/\ /\n/g' | awk '!x[$0]++' | vim -R -
-}
-
-chaturbate(){ mpv --ytdl-format=slow-2 "$@" ;}
-
-# }}}
-# Radios ###################{{{
-
-radio-q107(){ mpv "https://live.leanstream.co/CFGQFM?args=web_01" ;}
-
-# URL: http://whatnotlinux.blogspot.com/2013/02/somafm-and-digitally-imported-bash.html
-somafm() {
-	while true; do local station;echo "Select a station to listen to:";select station in "Doomed" "Groove Salad" "Lush" "Suburbs of Goa" "Secret Agent" "Drone Zone" "Space Station" "cliqhop idm" "Digitalis" "Sonic Universe" "Boot Liquor" "Covers" "Illinois Street Lounge" "indie pop rocks" "PopTron" "Tags Trip" "Beat Bender" "Mission Control";do station=$(echo -n "$station"|tr '[:upper:]' '[:lower:]'|sed 's/ //g');break;done; mpv -playlist http://somafm.com/startstream=${station}.pls; done;
-}
-
-# }}}
-# Streaming ################{{{
-# DEMO: https://www.youtube.com/watch?v=MFxlwVhwayg
-# DESC: download/stream media from many online sites
-youtube-dl-stream() { youtube-dl -o - "$1" | $PLAYER - ;}
-yt-playlist(){ youtube-dl --extract-audio --audio-format mp3 -o "%(title)s.%(ext)s" "$@" ;}
-ted(){  mpv --ontop --no-border --force-window --autofit=500x280 --geometry=-15-10 --ytdl-format=medium "$@"; }
-yt() {
-	# with no ytdl format the video will be to the highest available resolution, which is bad for badly networks
-	# Ref: https://www.reddit.com/r/archlinux/comments/5m2os3/mpv_is_it_possible_to_change_video_quality_while/
-	# --ytdl-format=18 (360p)
-	# --ytdl-format=22 (720p)
-	 mpv --ontop --no-border --force-window --autofit=500x280 --geometry=-15-10  --ytdl-format=18 "$@";
-	 #mpv --no-border --force-window --autofit=500x280 --geometry=-15-10  --ytdl-format=18 "$@";
-}
-
-# }}}
-# Check if a website is down
-down4me() { curl -s "http://downforeveryoneorjustme.com/$1" | sed '/just you/!d;s/<[^>]*>//g' ;}
-
-# Get qrcode from argv
-#qrcode() { echo $@ | curl -F-=\<- qrenco.de; }
-qrcode() { link=$(echo "http://qrcode.kaywa.com/img.php?s=8&d=$@" | sed 's/ /+/g'); $BROWSER $link ;}
-
-
-# }}}
-# Hardware/Software info #################{{{
-
-# Clone scree to dual monitor
-clonescreen(){ xrandr --output LVDS --auto --mode 1366x768 --output VGA-0 --auto --mode 1024x768 --same-as LVDS;}
-
-# Extend screen to dual monitor
-extendscreen(){ xrandr --output LVDS --auto --mode 1366x768 --output VGA-0 --auto --mode 1024x768 --right-of LVDS; }
-
-# Turn off dual monitor
-offscreen(){ xrandr --output VGA-0 --off; }
-
-toggleredshift() {
-# check if process is running ( 0 = off, 1 = on )
-STATUS="$(ps -ef | grep '[r]edshift' | wc -l)"
-# if off then turn on
-if [[ "${STATUS}" == 0 ]]; then
-	notify-send -t 1 --icon=info "RedShift" "On"
-	redshift >/dev/null 2>&1 & disown
-	# if on then turn off
-elif [[ "${STATUS}" == 1 ]]; then
-	notify-send -t 1 --icon=info "RedShift" "Off"
-	redshift -x && killall redshift
-fi
-}
-
-# }}}
-# Manipulating files #####################{{{
-
-# View markdown as manpages
-# http://blog.metamatt.com/blog/2013/01/09/previewing-markdown-files-from-the-terminal/
-mdless(){ pandoc -s -f markdown -t man "$*" | groff -T utf8 -man | less ;}
-
-# show file access permission
-# http://unix.stackexchange.com/a/46921
-file-permission() { stat --format '%a %n' "$@" ;}
-
-# Move filenames to lowercase
-function lowercase()
-{
-	for file ; do
-		filename=${file##*/}
-		case "$filename" in
-			*/*) dirname==${file%/*} ;;
-			*) dirname=.;;
-		esac
-		nf=$(echo $filename | tr A-Z a-z)
-		newname="${dirname}/${nf}"
-		if [ "$nf" != "$filename" ]; then
-			mv "$file" "$newname"
-			echo "lowercase: $file --> $newname"
-		else
-			echo "lowercase: $file not changed."
-		fi
-	done
-}
-
-# }}}
-# Images #################################{{{
-# Resizing Pictures to different resolutions
-image-resizer() {
-if [ $# -lt 2 ]; then
-	echo -e "resize pictures to another resolution"
-	echo -e "\nUsage:   $0 <size:32x32|96x96|128x128|640x480|800x600|1024x768|1280x720|1280x960|1920x1080> <image>"
-	echo -e "\nExample: $0 800x600 pic1.png pic2.png pic3.png"
-	echo -e "           $0 640x480 *.jpg"
-	return 1
-fi
-IMAGE_SIZE="$1"
-myArray=( "$@" )
-for arg in "${myArray[@]:1}"; do
-	convert "$arg" -resize "$IMAGE_SIZE" "${arg%.*}"_"$IMAGE_SIZE"_resized."${arg##*.}"
-done
-}
-
-# Rotate images
-image-rotate() {
-if [ $# -lt 2 ]; then
-	echo -e "rotate pictures"
-	echo -e "\nUsage:   $0 <90|180|270> <image>"
-	echo -e "\nExample: $0 90 pic1.png pic2.png pic3.png"
-	echo -e "           $0 180 *.jpg"
-	return 1
-fi
-IMAGE_DEGREE="$1"
-myArray=( "$@" )
-for arg in "${myArray[@]:1}"; do
-	convert "$arg" -rotate "$IMAGE_DEGREE" "${arg%.*}"_"$IMAGE_DEGREE"_rotated."${arg##*.}"
-done
-}
-
-# w3m browser with inline images
-# https://plus.google.com/102499719144563443986/posts/Vja8W69iHoi
-# tutorial video: http://www.youtube.com/watch?v=R2bMUtCOGko
-w3mimg() { w3m -o imgdisplay=/usr/lib/w3m/w3mimgdisplay $1 ;}
-
 # }}}
 # Custom terminal commands ###############{{{
 
@@ -504,125 +159,6 @@ mkcd() {
 	cd "$1"
 }
 
-#List files only, the advantage is that it works just like normal 'ls' so you could do 'lf -al | grep blah' etc.
-lf () {
-	ls -1p $@ | grep -v '\/$'
-}
-
-# }}}
-# Conversion #############################{{{
-
-# DESC: convert youtube to audio (youtube.com only)
-# -f 171 = webm audio (vorbis)
-# -f 140 = m4a (aac)
-yt2ogg() { youtube-dl -c --restrict-filenames -x --audio-format vorbis -o "%(title)s.%(ext)s" -f 171 "$@" ;}
-yt2wav() { youtube-dl -c --restrict-filenames -x --audio-format wav -o "%(title)s.%(ext)s" -f 171 "$@" ;}
-yt2mp3() { youtube-dl -c --restrict-filenames -x --audio-format mp3 -o "%(title)s.%(ext)s" -f 171 "$@" ;}
-yt2webmaudio() { youtube-dl -c --restrict-filenames -o "%(title)s.%(ext)s" -f 171 "$@" ;}
-yt2m4a() { youtube-dl -c --restrict-filenames -o "%(title)s.%(ext)s" -f 140 "$@" ;}
-
-# http://askubuntu.com/a/50180
-convert_pdf_to_png() {
-	if [ $# -lt 1 ]
-	then
-		echo -e "convert PDF document to PNG image (default dpi is 150)"
-		echo -e "\nUsage:\n$0 <pdf> <dpi> <startingpage> <endingpage>"
-		echo -e "\nall pages to images:\n$0 file.pdf"
-		echo -e "\nchange dpi (common dpi are 150, 300, 600):\n$0 file.pdf 300"
-		echo -e "\nsingle page to image:\n$0 file.pdf 300 5"
-		echo -e "\nmultiple pages to images:\n$0 file.pdf 300 5 12"
-
-		return 1
-	fi
-	pdftoppm -png "$1" "${1%.*}"-"${2:-150}"DPI -r "${2:-150}" -f "$3" -l "${4:-$3}"
-}
-
-convert_pdf_to_jpg() {
-	if [ $# -lt 1 ]
-	then
-		echo -e "convert PDF document to JPEG image (default dpi is 150)"
-		echo -e "\nUsage:\n$0 <pdf> <dpi> <startingpage> <endingpage>"
-		echo -e "\nall pages to images:\n$0 file.pdf"
-		echo -e "\nchange dpi (common dpi are 150, 300, 600):\n$0 file.pdf 300"
-		echo -e "\nsingle page to image:\n$0 file.pdf 300 5"
-		echo -e "\nmultiple pages to images:\n$0 file.pdf 300 5 12"
-
-		return 1
-	fi
-	pdftoppm -jpeg "$1" "${1%.*}"-"${2:-150}"DPI -r "${2:-150}" -f "$3" -l "${4:-$3}"
-}
-convert_images_to_pdf() {
-	if [ $# -lt 1 ]
-	then
-		echo -e "convert images into one single pdf"
-		echo -e "\nUsage:\n$0 <images>"
-		echo -e "\nexample:\n$0 image1.jpg image2.jpg image3.jpg"
-		echo -e "\n$0 *.jpg"
-		echo -e "\n$0 *.png"
-
-		return 1
-	fi
-	convert "$@" "${1%.*}"-`date +'%F_%Hh%Ms%S'`.pdf
-}
-
-
-# Using libreoffice
-convert_to_html() { soffice --headless --convert-to "html:XHTML Writer File:UTF8" "$1" ;}
-convert_to_txt() { soffice --headless --convert-to "txt:Text (encoded):UTF8" "$1" ;}
-
-# http://duff-johnson.com/2014/02/17/the-8-most-popular-document-formats-on-the-web/
-convert_to_pdf() {
-	if [ $# -lt 1 ]; then
-		echo -e "Usage: $0 <file_name>.<doc|docx|ppt|pptx|xls|xlsx|txt|rtf|html|epub|cbr|cbz|cbt|cb7|cba|jpg|jpeg|pbm|pgm|png>"
-		echo -e "\nsingle:   $0 file.doc"
-		echo -e "\nmultiple: $0 file1.jpg file2.jpg file3.jpg"
-		echo -e "\nwildcard: $0 *.png"
-		echo -e "\nRequirement: calibre imagemagick libreoffice"
-		return 1
-	else
-		if [ ! -f "${1%.*}".pdf ] ; then
-			NAME=${1%.*}
-			case "$1" in
-				*.doc|*.docx)    soffice --headless --convert-to pdf "$@" ;;
-				*.ppt|*.pptx)    soffice --headless --convert-to pdf "$@" ;;
-				*.xls|*.xlsx)    soffice --headless --convert-to pdf "$@" ;;
-				*.txt|*.rtf)     soffice --headless --convert-to pdf "$@" ;;
-				*.html)          soffice --headless --convert-to pdf "$@" ;;
-				*.epub)          soffice --headless --convert-to pdf "$@" ;;
-				*.cbr|*.cbz|*.cb7|*.cbt|*.cba)    ebook-convert "$1" .pdf ;;
-				*.jpg|*.jpeg|*.pbm|*.pgm|*.png)   convert "$@" "${1%.*}"-`date +'%F_%Hh%Ms%S'`.pdf ;;
-				*)               echo "'$1' - unsupported format or file does not exist" ;;
-			esac
-		else
-			echo "'${1%.*}.pdf' - file exist, skipping to prevent overwrite"
-		fi
-	fi
-}
-
-# convert video to gif animation
-# http://superuser.com/a/730389
-# http://superuser.com/a/841379
-convert_to_gifv() {
-	if [ $# -lt 1 ]
-	then
-		echo -e "convert video to animated gif"
-		echo -e "\nUsage:\n$0 <file> <resolution>"
-		echo -e "\nexample:\n$0 file.mkv \n"
-		echo -e "$0 file.mkv 320\n"
-		echo -e "$0 file.mkv 720\n"
-		echo -e "$0 file.mkv 1080\n"
-		echo -e "Note: animated gif size are usually x2 or x3 the size of the original video file"
-
-		return 1
-	fi
-
-	# get video resolution (height)
-	eval $(ffprobe -v error -of flat=s=_ -select_streams v:0 -show_entries stream=height,width "$1")
-	size=${streams_stream_0_height}
-
-	ffmpeg -i "$1" -vf scale="${2:-$size}":-1 -r 10 -f image2pipe -vcodec ppm - | convert -delay 5 -loop 0 - "${1%.*}"-gifvid"$2".gif
-}
-
 # }}}
 # Compacting and extracting ##############{{{
 # Extract a folder
@@ -675,108 +211,166 @@ compress() {
 	fi
 }
 
-# }}}
+ #}}}
 # Opening configuration files ############{{{
 
-rld-xres() { xrdb ~/.Xresources ;}
-rld-mksh() { source ~/.mkshrc ;}
-cfg-mailcap() { $EDITOR ~/.mutt/mailcap ;}
-cfg-mpv() { $EDITOR ~/.config/mpv/mpv.conf ;}
-cfg-mpv-input() { $EDITOR ~/.config/mpv/input.conf ;}
-cfg-ranger-rifle() { $EDITOR ~/.config/ranger/rifle.conf ;}
-cfg-ranger-commands() { $EDITOR ~/.config/ranger/commands.py ;}
-cfg-ranger() { $EDITOR ~/.config/ranger/rc.conf ;}
-cfg-dunst(){ $EDITOR ~/.config/dunst/dunstrc ;}
-cfg-weechat(){ $EDITOR ~/.weechat/weechat.conf ;}
-cfg-irc(){ $EDITOR ~/.weechat/irc.conf ;}
-cfg-xres(){ $EDITOR ~/.Xresources ;}
-cfg-i3(){ $EDITOR ~/.config/i3/config ;}
-cfg-poly(){ $EDITOR ~/.config/polybar/config ;}
-cfg-lemon(){ $EDITOR ~/bin/bar ;}
-cfg-bsp() { $EDITOR ~/.config/bspwm/bspwmrc ;}
-cfg-sxk() { $EDITOR ~/.config/sxhkd/sxhkdrc ;}
-cfg-dwm() { cd ~/suckless/dwm-6.1/ && $EDITOR config.h ;}
-cfg-ali() { $EDITOR ~/.aliases ;}
+#rld-zshrc() { source ~/.zshrc ;}
+#rld-xres() { xrdb ~/.Xresources ;}
+#rld-mksh() { source ~/.mkshrc ;}
+#cfg-mailcap() { $EDITOR ~/.mutt/mailcap ;}
+#cfg-mpv() { $EDITOR ~/.config/mpv/mpv.conf ;}
+#cfg-mpv-input() { $EDITOR ~/.config/mpv/input.conf ;}
+#cfg-ranger-rifle() { $EDITOR ~/.config/ranger/rifle.conf ;}
+#cfg-ranger-commands() { $EDITOR ~/.config/ranger/commands.py ;}
+#cfg-ranger() { $EDITOR ~/.config/ranger/rc.conf ;}
+#cfg-dunst(){ $EDITOR ~/.config/dunst/dunstrc ;}
+#cfg-weechat(){ $EDITOR ~/.weechat/weechat.conf ;}
+#cfg-irc(){ $EDITOR ~/.weechat/irc.conf ;}
+#cfg-xres(){ $EDITOR ~/.Xresources ;}
+#cfg-i3(){ $EDITOR ~/.config/i3/config ;}
+#cfg-poly(){ $EDITOR ~/.config/polybar/config ;}
+#cfg-lemon(){ $EDITOR ~/bin/bar ;}
+#cfg-bsp() { $EDITOR ~/.config/bspwm/bspwmrc ;}
+#cfg-sxk() { $EDITOR ~/.config/sxhkd/sxhkdrc ;}
+#cfg-dwm() { cd ~/suckless/dwm-6.1/ && $EDITOR config.h ;}
+#cfg-ali() { $EDITOR ~/.aliases ;}
 
 # }}}
 # miscellaneous functions ################{{{
 
-# Show date of many contries
-date-global() {
-	# use tzselect to find timezone listing
-	local SHOWTIMEZONE="$(
-	alias date='date +"%a %D %l:%M %p"'
-	echo "Current Location:" "$(date)"
-	echo "USA LosAngeles:" "$(TZ='America/Los_Angeles' date)"
-	echo "Canada Alberta:" "$(TZ='America/Edmonton' date)"
-	echo "USA NewYork:" "$(TZ='America/New_York' date)"
-	echo "EU London:" "$(TZ='Europe/London' date)"
-	echo "Bangladesh Dhaka:" "$(TZ='Asia/Dhaka' date)"
-	echo "China Xinjiang:" "$(TZ='Asia/Urumqi' date)"
-	echo "Vietnam Saigon:" "$(TZ='Asia/Ho_Chi_Minh' date)"
-	echo "China Beijing:" "$(TZ='Asia/Shanghai' date)"
-	echo "HK HongKong:" "$(TZ='Asia/Hong_Kong' date)"
-	echo "Japan Tokyo:" "$(TZ='Asia/Tokyo' date)"
-	)"
-	echo "$SHOWTIMEZONE" | column -t
-}
-
-# call vim help page from shell prompt
-function :h { vim +":h $1" +'wincmd o' +'nnoremap q :q!<CR>' ;}
-
-# REMIND ME, ITS IMPORTANT!
-# usage: remindme <time> <text>
-# e.g.: remindme 10m "omg, the pizza"
-remindme() { sleep $1 && zenity --info --text "$2" & }
-
-# https://github.com/nicknisi/dotfiles/blob/master/zsh/functions.zsh
-# print available colors and their numbers
-function colours() {
-	for i in $(seq 0 255); do
-		printf "\x1b[38;5;${i}m colour${i}"
-		if (( $i % 5 == 0 )); then
-			printf "\n"
-		else
-			printf "\t"
-		fi
+pwgen() {
+    head /dev/urandom | tr -dc '[:graph:]' | head -c${1:-22}; echo
+}
+
+# Download random wallpapers from unsplash website
+unsplash() {
+	rm -rf /tmp/unsplash
+	mkdir /tmp/unsplash/
+	for i in $(seq 50); do
+		wget --quiet -O /tmp/unsplash/$i.jpg "https://unsplash.it/1920/1080/?random"
 	done
 }
 
 # Show the most used commands
-top10() { history 1 | awk '{a[$2]++ } END{for(i in a){print a[i] " " i}}' | sort -rn | head; }
+top10() { history | awk '{a[$2]++ } END{for(i in a){print a[i] " " i}}' | sort -rn | head; }
 
 # Kill zombie process
-killall-zombies() { kill -HUP $(ps -A -ostat,ppid | grep -e '[zZ]'| awk '{ print $2 }') ;}
+#killall-zombies() { kill -HUP $(ps -A -ostat,ppid | grep -e '[zZ]'| awk '{ print $2 }') ;}
+
+# Count code lines in some directory.
+# $ loc py js css
+# # => Lines of code for .py: 3781
+# # => Lines of code for .js: 3354
+# # => Lines of code for .css: 2970
+# # => Total lines of code: 10105
+loc() {
+  local total
+  local firstletter
+  local ext
+  local lines
+  total=0
+  for ext in $@; do
+    firstletter=$(echo $ext | cut -c1-1)
+    if [[ firstletter != "." ]]; then
+      ext=".$ext"
+    fi
+    lines=`find-exec "*$ext" cat | wc -l`
+    lines=${lines// /}
+    total=$(($total + $lines))
+    echo "Lines of code for ${fg[blue]}$ext${reset_color}: ${fg[green]}$lines${reset_color}"
+  done
+  echo "${fg[blue]}Total${reset_color} lines of code: ${fg[green]}$total${reset_color}"
+}
+
+
+_calcram() {
+  local sum
+  sum=0
+  for i in `ps aux | grep -i "$1" | grep -v "grep" | awk '{print $6}'`; do
+    sum=$(($i + $sum))
+  done
+  sum=$(echo "scale=2; $sum / 1024.0" | bc)
+  echo $sum
+}
 
-# Ref: https://github.com/paulmillr/dotfiles/blob/master/home/.zshrc.sh#L282
 # Show how much RAM application uses.
 # $ ram safari
-# # => safari uses 154.69 MBs of RAM.
-function ram() {
+# # => safari uses 154.69 MBs of RAM
+ram() {
   local sum
-  local items
   local app="$1"
   if [ -z "$app" ]; then
     echo "First argument - pattern to grep from processes"
+    return 0
+  fi
+
+  sum=$(_calcram $app)
+  if [[ $sum != "0" ]]; then
+    echo "${fg[blue]}${app}${reset_color} uses ${fg[green]}${sum}${reset_color} MBs of RAM"
   else
-    sum=0
-    for i in `ps aux | grep -i "$app" | grep -v "grep" | awk '{print $6}'`; do
-      sum=$(($i + $sum))
-    done
-    sum=$(echo "scale=2; $sum / 1024.0" | bc)
+    echo "No active processes matching pattern '${fg[blue]}${app}${reset_color}'"
+  fi
+}
+
+# Same, but tracks RAM usage in realtime. Will run until you stop it.
+# $ rams safari
+rams() {
+  local sum
+  local app="$1"
+  if [ -z "$app" ]; then
+    echo "First argument - pattern to grep from processes"
+    return 0
+  fi
+
+  while true; do
+    sum=$(_calcram $app)
     if [[ $sum != "0" ]]; then
-      echo "${fg[blue]}${app}${reset_color} uses ${fg[green]}${sum}${reset_color} MBs of RAM."
+      echo -en "${fg[blue]}${app}${reset_color} uses ${fg[green]}${sum}${reset_color} MBs of RAM\r"
     else
-      echo "There are no processes with pattern '${fg[blue]}${app}${reset_color}' are running."
+      echo -en "No active processes matching pattern '${fg[blue]}${app}${reset_color}'\r"
     fi
-  fi
+    sleep 1
+  done
+}
+
+
+# list and grep with file permission
+lsg() {
+  keyword=$(echo "$@" |  sed 's/ /.*/g')
+  ls -hlA --color=yes \
+  | awk '{k=0;for(i=0;i<=8;i++)k+=((substr($1,i+2,1)~/[rwx]/)*2^(8-i));if(k)printf(" %0o ",k);print}' \
+  | grep -iE $keyword
 }
 
+# Ref: https://github.com/paulmillr/dotfiles/blob/master/home/.zshrc.sh#L282
+# Show how much RAM application uses.
+# $ ram safari
+# # => safari uses 154.69 MBs of RAM.
+#function ram() {
+#  local sum
+#  local items
+#  local app="$1"
+#  if [ -z "$app" ]; then
+#    echo "First argument - pattern to grep from processes"
+#  else
+#    sum=0
+#    for i in `ps aux | grep -i "$app" | grep -v "grep" | awk '{print $6}'`; do
+#      sum=$(($i + $sum))
+#    done
+#    sum=$(echo "scale=2; $sum / 1024.0" | bc)
+#    if [[ $sum != "0" ]]; then
+#      echo "${fg[blue]}${app}${reset_color} uses ${fg[green]}${sum}${reset_color} MBs of RAM."
+#    else
+#      echo "There are no processes with pattern '${fg[blue]}${app}${reset_color}' are running."
+#    fi
+#  fi
+#}
+
 # }}}
 # FZF Functions ########################## {{{
 
-fzf-locate() { xdg-open "$(locate "*" | fzf -e)" ;}
-fzf-surfraw() { surfraw -browser=$BROWSER "$(cat ~/.config/surfraw/bookmarks | sed '/^$/d' | sort -n | fzf -e)" ;}
+#fzf-locate() { xdg-open "$(locate "*" | fzf -e)" ;}
+#fzf-surfraw() { surfraw -browser=$BROWSER "$(cat ~/.config/surfraw/bookmarks | sed '/^$/d' | sort -n | fzf -e)" ;}
 
 # fuzzy grep open via ag (Search for the word in every file)
 svim() {
@@ -887,28 +481,96 @@ spdf () {
 }
 
 # }}}
+# Sysadmin {{{
 
-# }}}
-# Testing Area =========================={{{
+# Docker
+alias dcls='docker container ls'
+alias dils='docker image ls'
+alias dsprune='docker system prune'
 
-rmd () {
-    grep -v "\-\-\-\-\-" "$*" | pandoc -s -f markdown -t man | groff -T utf8 -man | less
+dirm () {
+    docker rmi -f "$@"
 }
 
-record (){
-	ffmpeg -f x11grab -video_size 1366x768 -i $DISPLAY -f alsa -i default -c:v ffvhuff -c:a flac $(date +%d-%m-%Y_%H:%M).mkv
+dirmall() {
+    docker rmi -f $(docker image ls -aq)
 }
 
-pwgen() {
-	head /dev/urandom | tr -dc 'a-zA-Z0-9.,[$:-?~!^_\\\[\]]' | head -c${1:-22}; echo
+dcstop () {
+    docker container stop "$@"
 }
 
-# Download random wallpapers from unsplash website
-unsplash() {
-	rm -rf /tmp/unsplash
-	mkdir /tmp/unsplash/
-	for i in $(seq 50); do
-		wget --quiet -O /tmp/unsplash/$i.jpg "https://unsplash.it/1920/1080/?random"
-	done
+dcrm () {
+    docker container rm -f "$@"
+}
+
+dcrmall() {
+    docker container rm $(docker container ls -aq) -f
+}
+
+# Get the IP address of a docker container
+dcip() {
+    docker inspect -f '{{range .NetworkSettings.Networks}}{{.IPAddress}}{{end}}' "$@"
+}
+
+dcbash() {
+    docker exec -it "$@" bash
+    if [ "$?" -ne 0 ]; then
+        docker exec -it "$@" sh
+    fi
+}
+
+dclogs() {
+    docker logs -f $(docker ps | grep "$1" | awk '{ print $1 }')
+}
+
+dktop() {
+  docker stats --format "table {{.Container}}\t{{.Name}}\t{{.CPUPerc}}  {{.MemPerc}}\t{{.NetIO}}\t{{.BlockIO}}"
+}
+
+# Redes
+digdns() {
+    dig +short "$@"
+}
+
+alias meuip="ip -f inet -o addr show wlp3s0 | grep -oP '(?<=inet )[0-9.]+'"
+
+# My GCP machines
+ssh_gcp() {
+    ssh -i $HOME/.ssh/google_compute_engine "$@"
+}
+
+gcpstop() {
+    gcloud compute instances stop "$@"
 }
+
+gcpstart() {
+    gcloud compute instances start "$@"
+}
+
+# kubernetes
+
+alias kdcm="kubectl describe configmap"
+alias kdd="kubectl describe deployment"
+alias kdelp="kubectl delete pod --wait=false"
+alias kdi="kubectl describe ing"
+alias kdp="kubectl describe pod"
+alias kds="kubectl describe svc"
+alias kdsec="kubectl describe secret"
+alias keit="kubectl exec -it"
+alias kgcm="kubectl get configmap"
+alias kgd="kubectl get deploy"
+alias kgi="kubectl get ing"
+alias kgp="kubectl get pods"
+alias kgpl="kubectl get pods --show-labels"
+alias kgpw="kubectl get pods -w"
+alias kgpwnt="kubectl get pods -w | grep -v Terminating"
+alias kgs="kubectl get svc"
+alias kgsa="kubectl get sa"
+alias kgsec="kubectl get secret"
+
 # }}}
+
+# View markdown as manpages
+# http://blog.metamatt.com/blog/2013/01/09/previewing-markdown-files-from-the-terminal/
+mdless(){ pandoc -s -f markdown -t man "$*" | groff -T utf8 -man | less ;}
diff --git a/.bashrc b/.bashrc
index 2530f53..7324343 100644
--- a/.bashrc
+++ b/.bashrc
@@ -1,42 +1,34 @@
-HISTSIZE=3000
-HISTFILESIZE=200
+# Avoid duplicates
+export HISTCONTROL=ignoredups:erasedups  
+# When the shell exits, append to the history file instead of overwriting it
+shopt -s histappend
 
-if [ "x" != "x$DISPLAY" ]; then
-    xmodmap -e "clear lock"
-    xmodmap -e "keycode 66 = Escape"
-    xmodmap -e "keycode 9 = Caps_Lock"
-    xmodmap -e "add Lock = Caps_Lock"
-fi
+GIT_PROMPT_THEME=TruncatedPwd_WindowTitle
+
+HISTSIZE=10000
+HISTFILESIZE=10000
+
+#PS1='\w \[\e[1;34m\]\$ \[\e[0m\]'
+PS1='\[\e[1;36m\]\w\[\e[0m\]\n\[\e[1;32m\]➜\[\e[0m\] '
+
+# After each command, append to the history file and reread it
+export PROMPT_COMMAND="${PROMPT_COMMAND:+$PROMPT_COMMAND$'\n'}history -a; history -c; history -r"
 
 export SHELL=/bin/bash
 export PAGER=less
-export EDITOR=vim
-export BROWSER=chromium
+export EDITOR=nvim
+export BROWSER=brave
 export BROWSERCLI=w3m
 export READER=zathura
 export IMAGEVIEWER=feh
 export VIDEOPLAYER=mpv
-export PATH=$PATH:$HOME/bin:$HOME/bin/ascii
-export NNN_USE_EDITOR=1
-
-set -o emacs
-#bind 'set show-mode-in-prompt on'
-#bind 'set vi-ins-mode-string \e[1;31m INSERT \e[0m'
-#bind 'set vi-cmd-mode-string \e[1;32m NORMAL \e[0m'
-bind "\C-l":clear-screen
-bind "\C-j":previous-history
-bind "\C-k":next-history
-
-# Add an "alert" alias for long running commands.  Use like so:
-#   sleep 10; alert
-#alias alert='notify-send --urgency=low -i "$([ $? = 0 ] && echo terminal || echo error)" "$(history|tail -n1|sed -e '\''s/^\s*[0-9]\+\s*//;s/[;&|]\s*alert$//'\'')"'
-
-#PS1='\[\e[1;36m\]\w\[\e[0m\] $(__git_ps1 "\[\e[01;37m\]on\[\e[0m\] \[\e[1;35m\]\\ue0a0 %s\[\e[0m\]")\n\[\e[1;32m\]➜\[\e[0m\] '
-
-PS1='\w \[\e[1;34m\]\$ \[\e[0m\]'
+export PATH=$PATH:$HOME/.bin:$HOME/.bin/ascii
+HISTFILE=~/.shell_history
 
 source ~/.aliases
-# git prompt(requirement to get __git_ps1). Ref: https://stackoverflow.com/a/12871094/9159065
-[ -f ~/.git-prompt.sh ] && source ~/.git-prompt.sh
-[ -f $HOME/.vim/plugged/gruvbox/gruvbox_256palette.sh ] && source "$HOME/.vim/plugged/gruvbox/gruvbox_256palette.sh"
 [ -f ~/.fzf.bash ] && source ~/.fzf.bash
+if [ -f "$HOME/.bash-git-prompt/gitprompt.sh" ]; then
+    GIT_PROMPT_ONLY_IN_REPO=1
+    source $HOME/.bash-git-prompt/gitprompt.sh
+fi
+
diff --git a/bin/.gitignore b/.bin/.gitignore
similarity index 100%
rename from bin/.gitignore
rename to .bin/.gitignore
diff --git a/bin/ascii/blocks b/.bin/ascii/blocks
similarity index 100%
rename from bin/ascii/blocks
rename to .bin/ascii/blocks
diff --git a/bin/ascii/colorfetch b/.bin/ascii/colorfetch
similarity index 100%
rename from bin/ascii/colorfetch
rename to .bin/ascii/colorfetch
diff --git a/bin/ascii/facefetch b/.bin/ascii/facefetch
similarity index 100%
rename from bin/ascii/facefetch
rename to .bin/ascii/facefetch
diff --git a/bin/ascii/invaders b/.bin/ascii/invaders
similarity index 100%
rename from bin/ascii/invaders
rename to .bin/ascii/invaders
diff --git a/bin/ascii/palette-255 b/.bin/ascii/palette-255
similarity index 100%
rename from bin/ascii/palette-255
rename to .bin/ascii/palette-255
diff --git a/bin/ascii/pipes-vertical b/.bin/ascii/pipes-vertical
similarity index 100%
rename from bin/ascii/pipes-vertical
rename to .bin/ascii/pipes-vertical
diff --git a/bin/ascii/rain b/.bin/ascii/rain
similarity index 100%
rename from bin/ascii/rain
rename to .bin/ascii/rain
diff --git a/bin/ascii/skull b/.bin/ascii/skull
similarity index 100%
rename from bin/ascii/skull
rename to .bin/ascii/skull
diff --git a/bin/ascii/snow b/.bin/ascii/snow
similarity index 100%
rename from bin/ascii/snow
rename to .bin/ascii/snow
diff --git a/bin/ascii/tux b/.bin/ascii/tux
similarity index 100%
rename from bin/ascii/tux
rename to .bin/ascii/tux
diff --git a/.bin/backeep.sh b/.bin/backeep.sh
new file mode 100755
index 0000000..4e2c9aa
--- /dev/null
+++ b/.bin/backeep.sh
@@ -0,0 +1,18 @@
+#!/usr/bin/env sh
+
+KEEPASS_FILE=~/syncthing/keepass/keepass.kdbx
+KEEPASS_FILE_MD5=$(md5sum $KEEPASS_FILE | awk '{ print $1 }')
+
+OLD_KEEPASS_FILE=~/keepass.kdbx
+OLD_KEEPASS_FILE_MD5=$(md5sum $OLD_KEEPASS_FILE | awk '{ print $1 }')
+
+if [ "$KEEPASS_FILE_MD5" != "$OLD_KEEPASS_FILE_MD5" ]; then
+    mv $OLD_KEEPASS_FILE ~/syncthing/keepass/old-keepass.kdbx
+    #rm -f ~/syncthing/keepass/old-old-keepass.kdbx
+
+    cp "$KEEPASS_FILE" $OLD_KEEPASS_FILE
+    cp "$KEEPASS_FILE" ~/Documents
+    echo "$KEEPASS_FILE_MD5, $(date)" > ~/.keepass-md5
+fi
+
+
diff --git a/bin/bar b/.bin/bar
similarity index 100%
rename from bin/bar
rename to .bin/bar
diff --git a/.bin/caps-toggle.sh b/.bin/caps-toggle.sh
new file mode 100755
index 0000000..0a341e4
--- /dev/null
+++ b/.bin/caps-toggle.sh
@@ -0,0 +1,14 @@
+#!/bin/bash
+if xmodmap -pke | egrep -i "escape" | egrep -i "keycode.*9.*"; then
+ echo "Changing from original to mapped"
+ xmodmap -e "clear lock"
+ xmodmap -e "keycode 66 = Escape"
+ xmodmap -e "keycode 9 = Caps_Lock"
+ xmodmap -e "add Lock = Caps_Lock"
+else
+ echo "Changing back from mapped to original"
+ xmodmap -e "clear lock"
+ xmodmap -e "keycode 9 = Escape"
+ xmodmap -e "keycode 66 = Caps_Lock"
+ xmodmap -e "add Lock = Caps_Lock"
+fi
diff --git a/bin/cmus-lyrics b/.bin/cmus-lyrics
similarity index 100%
rename from bin/cmus-lyrics
rename to .bin/cmus-lyrics
diff --git a/bin/cmus-status b/.bin/cmus-status
similarity index 100%
rename from bin/cmus-status
rename to .bin/cmus-status
diff --git a/bin/cryptocurrency b/.bin/cryptocurrency
similarity index 100%
rename from bin/cryptocurrency
rename to .bin/cryptocurrency
diff --git a/bin/debinst b/.bin/debinst
similarity index 100%
rename from bin/debinst
rename to .bin/debinst
diff --git a/bin/displayselect b/.bin/displayselect
similarity index 100%
rename from bin/displayselect
rename to .bin/displayselect
diff --git a/bin/dmenuhandler b/.bin/dmenuhandler
similarity index 100%
rename from bin/dmenuhandler
rename to .bin/dmenuhandler
diff --git a/bin/dmenumount b/.bin/dmenumount
similarity index 100%
rename from bin/dmenumount
rename to .bin/dmenumount
diff --git a/bin/dmenuumount b/.bin/dmenuumount
similarity index 100%
rename from bin/dmenuumount
rename to .bin/dmenuumount
diff --git a/bin/dmoji b/.bin/dmoji
similarity index 100%
rename from bin/dmoji
rename to .bin/dmoji
diff --git a/bin/dwmstatus b/.bin/dwmstatus
similarity index 100%
rename from bin/dwmstatus
rename to .bin/dwmstatus
diff --git a/bin/gen-hex b/.bin/gen-hex
similarity index 100%
rename from bin/gen-hex
rename to .bin/gen-hex
diff --git a/bin/imgur b/.bin/imgur
similarity index 100%
rename from bin/imgur
rename to .bin/imgur
diff --git a/.bin/install-everything.sh b/.bin/install-everything.sh
new file mode 100644
index 0000000..034e755
--- /dev/null
+++ b/.bin/install-everything.sh
@@ -0,0 +1,50 @@
+#!/usr/bin/env sh
+
+if [ "$(id -u)" -ne 0 ]; then
+    echo "$0 must be run as root."
+    exit
+fi
+
+echo "Upgrading system..."
+apt update -y &>/dev/null && apt upgrade &>/dev/null
+
+
+echo "Installing personal autistic stuff..."
+apt install neomutt mpv pandoc tmux python-pip3 cargo exiv2 zsh &>/dev/null
+pip3 install neovim && pip3 install neovim --upgrade &>/dev/null
+# zsh
+sh -c "$(curl -fsSL https://raw.githubusercontent.com/robbyrussell/oh-my-zsh/master/tools/install.sh)" &>/dev/null
+git clone https://github.com/denysdovhan/spaceship-prompt.git "$ZSH_CUSTOM/themes/spaceship-prompt" &>/dev/null
+ln -s "$ZSH_CUSTOM/themes/spaceship-prompt/spaceship.zsh-theme" "$ZSH_CUSTOM/themes/spaceship.zsh-theme" &>/dev/null
+
+
+echo "Installing work stuff..."
+apt install git python3 traceroute htop &>/dev/null
+apt-add-repository ppa:ansible/ansible &>/dev/null
+
+
+# docker and docker-compose
+curl -fsSL https://get.docker.com | sh &>/dev/null
+groupadd docker && usermod -aG docker ubuntu &>/dev/null
+DOCKER_COMPOSE_LATEST_VERSION=$(curl --silent "https://api.github.com/repos/docker/compose/releases/latest" | grep '"tag_name":' | sed -E 's/.*"([^"]+)".*/\1/' )
+sudo curl -L https://github.com/docker/compose/releases/download/$DOCKER_COMPOSE_LATEST_VERSION/docker-compose-`uname -s`-`uname -m` -o /usr/local/bin/docker-compose &>/dev/null
+
+
+# dbeaver
+curl -o /tmp/dbeaver-ce_latest_amd64.deb -sSL https://dbeaver.io/files/dbeaver-ce_latest_amd64.deb &>/dev/null
+dpkg -i /tmp/dbeaver-ce_latest_amd64.dev &>/dev/null
+
+
+# slack
+curl -o /tmp/slack-desktop-3.3.3-amd64.deb -sSL https://downloads.slack-edge.com/linux_releases/slack-desktop-3.3.3-amd64.deb &>/dev/null
+dpkg -i /tmp/slack-desktop-3.3.3-amd64.deb &>/dev/null
+
+
+# keybase
+curl -O https://prerelease.keybase.io/keybase_amd64.deb &>/dev/null
+sudo dpkg -i keybase_amd64.deb &>/dev/null
+sudo apt-get install -f &>/dev/null
+
+
+apt update -y &>/dev/null && apt upgrade &>/dev/null
+
diff --git a/.bin/khan-academy-courses.sh b/.bin/khan-academy-courses.sh
new file mode 100755
index 0000000..9917695
--- /dev/null
+++ b/.bin/khan-academy-courses.sh
@@ -0,0 +1,33 @@
+#!/usr/bin/env sh
+
+CACHEDIR="/tmp/videos/sedturbate"
+CACHEFILE="/tmp/videos/sedturbate/cams.txt"
+
+mkdir -p $CACHEDIR
+
+# Primeiro sed:
+# 1.1 - filtra o nome de cada camgirl
+# 1.2 - filtra a quantidade de viewers que cada camgirl tem
+# Segundo sed:
+# 2.1 - Coloca a quantidade de views na frente do nome de cada camgirl (juntando a linha debaixo com)
+# 2.2 - adiciona a palavra viewers no final da linha
+
+curl -sL https://www.chaturbate.com/female-cams | sed -rne 's,^<a href="/(\w*)/">$,\1,p ; s/<li\ class="cams">[0-9]+ mins, ([0-9]+) viewers<\/li>/\1/p' | sed -rn 'N;s/\n/ - /; s/$/ viewers/p' > $CACHEFILE
+
+NUM=$(wc -l $CACHEFILE | cut -d' ' -f1)
+
+printf "Chaturbate - female cams\n"
+nl -w 1 $CACHEFILE
+
+printf "Choose a video: "
+read op
+
+VIDEO=$(nl -w 1 $CACHEFILE | sed -n "/^$op/p" | awk -F' ' '{print $2}')
+if [ "$op" = "q" -o "$op" = "Q" ];
+then
+    printf "Canceled.\n"
+    exit 0
+else
+    mpv --ytdl-format=slow-2 https://www.chaturbate.com/$VIDEO 2>/dev/null &
+fi
+
diff --git a/bin/linkhandler b/.bin/linkhandler
similarity index 100%
rename from bin/linkhandler
rename to .bin/linkhandler
diff --git a/bin/locki3.sh b/.bin/locki3.sh
similarity index 100%
rename from bin/locki3.sh
rename to .bin/locki3.sh
diff --git a/bin/lyrics b/.bin/lyrics
similarity index 100%
rename from bin/lyrics
rename to .bin/lyrics
diff --git a/bin/mp3tag b/.bin/mp3tag
similarity index 100%
rename from bin/mp3tag
rename to .bin/mp3tag
diff --git a/bin/newsboat_bookmarks_surfraw b/.bin/newsboat_bookmarks_surfraw
similarity index 100%
rename from bin/newsboat_bookmarks_surfraw
rename to .bin/newsboat_bookmarks_surfraw
diff --git a/bin/oggify b/.bin/oggify
similarity index 100%
rename from bin/oggify
rename to .bin/oggify
diff --git a/.bin/paleup.sh b/.bin/paleup.sh
new file mode 100755
index 0000000..745243b
--- /dev/null
+++ b/.bin/paleup.sh
@@ -0,0 +1,63 @@
+#!/usr/bin/env bash
+#
+# by mhess
+
+[ "$UID" -ne "0" ] && {
+    printf '%b\n' "Only Root!"
+    exit 1
+}
+
+CURRENT_RELEASE="$(curl -s http://linux.palemoon.org/download/mainline/ | sed -rn 's/^\s.*Latest release: ([0-9.]+).*$/\1/p')"
+
+printf '%s\n\n%s\n%s\n\n' 'What do you want?' '1) Install palemoon' '2) Check for updates'
+read number
+
+if [ "$number" = '1'  ]; then
+	wget --progress=bar:force -P /tmp http://linux.palemoon.org/datastore/release/palemoon-${CURRENT_RELEASE}.linux-x86_64.tar.bz2
+
+	tar xvjf /tmp/palemoon* -C /opt/
+	mkdir -p /opt/bin
+	ln -s /opt/palemoon/palemoon /opt/bin/palemoon
+
+else
+
+BIN=$(whereis palemoon)
+BIN=${BIN#* }
+LOCAL=$(ls -l "$BIN" | grep '\->')
+LOCAL=${LOCAL##* }
+LOCAL=${LOCAL%/*}
+FINAL_DIR=${LOCAL%/*}
+CURRENT_VERSION="$(palemoon --version | grep -o '[0-9.]\+')"
+
+	if [ "$CURRENT_VERSION" != "$CURRENT_RELEASE" ]
+		then
+			printf '%s\n' 'There is a new release available!'
+		else
+			printf '%s\n' 'You are using the last release'
+			exit 0
+	fi
+
+	while true; do
+		printf 'Do you want to upgrade now? [Y/n] '
+		read input
+		case "$input" in
+			Y|y) wget --progress=bar:force -P /tmp https://linux.palemoon.org/datastore/release/palemoon-${CURRENT_RELEASE}.linux-x86_64.tar.bz2 && break ;;
+			N|n) exit 0 ;;
+			*) echo "Invalid option!" ;;
+		esac
+	done
+
+	printf '\nEnter your password to continue\n'
+	if [ -z "$LOCAL"  ]
+	then
+		rm -r "$BIN"
+	else
+		rm -r "$LOCAL"
+		rm -r "$BIN"
+	fi
+
+	tar xvjf /tmp/palemoon-* -C "$FINAL_DIR"
+	ln -s ${LOCAL}/palemoon "$BIN"
+
+	printf '\nUpdate completed!\n'
+fi
diff --git a/bin/polybar_launch b/.bin/polybar_launch
similarity index 100%
rename from bin/polybar_launch
rename to .bin/polybar_launch
diff --git a/bin/prompt b/.bin/prompt
similarity index 100%
rename from bin/prompt
rename to .bin/prompt
diff --git a/bin/pyowm b/.bin/pyowm
similarity index 100%
rename from bin/pyowm
rename to .bin/pyowm
diff --git a/bin/qrify b/.bin/qrify
similarity index 100%
rename from bin/qrify
rename to .bin/qrify
diff --git a/bin/record-noaudio b/.bin/record-noaudio
similarity index 100%
rename from bin/record-noaudio
rename to .bin/record-noaudio
diff --git a/bin/record-slop b/.bin/record-slop
similarity index 100%
rename from bin/record-slop
rename to .bin/record-slop
diff --git a/bin/rtv-linkhandler b/.bin/rtv-linkhandler
similarity index 100%
rename from bin/rtv-linkhandler
rename to .bin/rtv-linkhandler
diff --git a/bin/spotify-cli b/.bin/spotify-cli
similarity index 100%
rename from bin/spotify-cli
rename to .bin/spotify-cli
diff --git a/bin/tagman b/.bin/tagman
similarity index 100%
rename from bin/tagman
rename to .bin/tagman
diff --git a/bin/tpb b/.bin/tpb
similarity index 100%
rename from bin/tpb
rename to .bin/tpb
diff --git a/bin/ytview b/.bin/ytview
similarity index 100%
rename from bin/ytview
rename to .bin/ytview
diff --git a/.config/bspwm/bspwmrc b/.config/bspwm/bspwmrc
deleted file mode 100755
index c8c5ff5..0000000
--- a/.config/bspwm/bspwmrc
+++ /dev/null
@@ -1,44 +0,0 @@
-#! /bin/sh
-
-# Autostart {{{
-# Scratchpad terminal: https://www.reddit.com/r/bspwm/comments/85hr4c/making_a_scratchpaddropdown_terminal_in_bspwm/
-# I've modified a little bit to open with a tmux session instead of just a terminal
-#hsetroot -fill ~/Pictures/Landscapes/river-forest.jpg
-#xrdb -load ~/.Xresources
-#xset +fp $HOME/.fonts/
-#$HOME/bin/todo-notify
-#killall -9 sxhkd bar dunst
-sxhkd &
-#dunst &
-#sleep 1
-#bar &
-#notify-send "Notification" "Bspwmrc Loaded"
-# }}}
-# bspwm config {{{
-bspc monitor -d 'I' 'II' 'III' 'IV' 'V' 'VI' 'VII' 'VIII' 'IX' 'X' # Workspace icons
-#bspc monitor -d • • • • • • • • • •
-bspc config focus_follows_pointer   true
-bspc config border_width            0
-bspc config window_gap              12                             # Gap size
-bspc config normal_border_color     "#528588"                      # border color of normal windows
-bspc config focused_border_color    "#dee3e0"                      # border color of focused windows
-bspc config presel_feedback_color   "#528588"                      # color of preview new window
-bspc config borderless_monocle      true                           # Fullscreen mode do not have a border
-bspc config gapless_monocle         true
-bspc config split_ratio             0.5
-bspc config top_padding             25
-bspc config bottom_padding          13
-bspc config initial_polarity        second_child
-
-# Rules
-bspc rule -a 'Pale moon'     desktop='^2'
-bspc rule -a zathura         desktop='^4'   focus=on
-bspc rule -a ranger          desktop='^4'   focus=on
-bspc rule -a neomutt         desktop='^5'
-bspc rule -a TelegramDesktop desktop='^6'
-bspc rule -a weechat         desktop='^7'
-bspc rule -a mpv             state=floating center=true
-bspc rule -a Sxiv            state=floating center=true
-bspc rule -a Screenkey       manage=off
-bspc rule -a scratchterm     sticky=on state=floating hidden=on
-# }}}
diff --git a/.config/dunst/dunstrc b/.config/dunst/dunstrc
deleted file mode 100644
index e88305e..0000000
--- a/.config/dunst/dunstrc
+++ /dev/null
@@ -1,243 +0,0 @@
-[global]
-    font = curie 9
-
-    # Allow a small subset of html markup:
-    #   <b>bold</b>
-    #   <i>italic</i>
-    #   <s>strikethrough</s>
-    #   <u>underline</u>
-    #
-    # For a complete reference see
-    # <http://developer.gnome.org/pango/stable/PangoMarkupFormat.html>.
-    # If markup is not allowed, those tags will be stripped out of the
-    # message.
-    markup = yes
-
-    # The format of the message.  Possible variables are:
-    #   %a  appname
-    #   %s  summary
-    #   %b  body
-    #   %i  iconname (including its path)
-    #   %I  iconname (without its path)
-    #   %p  progress value if set ([  0%] to [100%]) or nothing
-    # Markup is allowed
-    #format = "%s\n%b
-	format = "<b>%s</b>\n%b"
-    # Sort messages by urgency.
-    sort = yes
-
-    # Show how many messages are currently hidden (because of geometry).
-    indicate_hidden = yes
-
-    # Alignment of message text.
-    # Possible values are "left", "center" and "right".
-    alignment = right
-
-    # The frequency with wich text that is longer than the notification
-    # window allows bounces back and forth.
-    # This option conflicts with "word_wrap".
-    # Set to 0 to disable.
-    bounce_freq = 0
-
-    # Show age of message if message is older than show_age_threshold
-    # seconds.
-    # Set to -1 to disable.
-    show_age_threshold = 60
-
-    # Split notifications into multiple lines if they don't fit into
-    # geometry.
-    word_wrap = yes
-
-    # Ignore newlines '\n' in notifications.
-    ignore_newline = no
-
-
-    # The geometry of the window:
-    #   [{width}]x{height}[+/-{x}+/-{y}]
-    # The geometry of the message window.
-    # The height is measured in number of notifications everything else
-    # in pixels.  If the width is omitted but the height is given
-    # ("-geometry x2"), the message window expands over the whole screen
-    # (dmenu-like).  If width is 0, the window expands to the longest
-    # message displayed.  A positive x is measured from the left, a
-    # negative from the right side of the screen.  Y is measured from
-    # the top and down respectevly.
-    # The width can be negative.  In this case the actual width is the
-    # screen width minus the width defined in within the geometry option.
-	geometry = "300x8-32+34"
-    # Shrink window if it's smaller than the width.  Will be ignored if
-    # width is 0.
-    shrink = yes
-
-    # The transparency of the window.  Range: [0; 100].
-    # This option will only work if a compositing windowmanager is
-    # present (e.g. xcompmgr, compiz, etc.).
-    transparency = 0
-
-    # Don't remove messages, if the user is idle (no mouse or keyboard input)
-    # for longer than idle_threshold seconds.
-    # Set to 0 to disable.
-    idle_threshold = 120
-
-    # Which monitor should the notifications be displayed on.
-    monitor = 0
-
-    # Display notification on focused monitor.  Possible modes are:
-    #   mouse: follow mouse pointer
-    #   keyboard: follow window with keyboard focus
-    #   none: don't follow anything
-    #
-    # "keyboard" needs a windowmanager that exports the
-    # _NET_ACTIVE_WINDOW property.
-    # This should be the case for almost all modern windowmanagers.
-    #
-    # If this option is set to mouse or keyboard, the monitor option
-    # will be ignored.
-    follow = mouse
-
-    # Should a notification popped up from history be sticky or timeout
-    # as if it would normally do.
-    sticky_history = yes
-
-    # Maximum amount of notifications kept in history
-    history_length = 20
-
-    # Display indicators for URLs (U) and actions (A).
-    show_indicators = yes
-
-    # The height of a single line.  If the height is smaller than the
-    # font height, it will get raised to the font height.
-    # This adds empty space above and under the text.
-    line_height = 0
-
-    # Draw a line of "separatpr_height" pixel height between two
-    # notifications.
-    # Set to 0 to disable.
-    separator_height = 0
-
-    # Padding between text and separator.
-    padding = 16
-
-    # Horizontal padding.
-    horizontal_padding = 16
-
-    # Define a color for the separator.
-    # possible values are:
-    #  * auto: dunst tries to find a color fitting to the background;
-    #  * foreground: use the same color as the foreground;
-    #  * frame: use the same color as the frame;
-    #  * anything else will be interpreted as a X color.
-    separator_color = auto
-
-    # Print a notification on startup.
-    # This is mainly for error detection, since dbus (re-)starts dunst
-    # automatically after a crash.
-    startup_notification = false
-
-    # dmenu path.
-    dmenu = /usr/bin/dmenu -p dunst:
-
-    # Browser for opening urls in context menu.
-    browser = /usr/bin/palemoon -new-tab
-
-    # Align icons left/right/off
-    icon_position = left
-
-    # Paths to default icons.
-    icon_path = /usr/share/icons/gnome/16x16/status/:/usr/share/icons/gnome/16x16/devices/
-
-    frame_width = 0
-    frame_color = "#2D333D"
-
-[shortcuts]
-
-    # Shortcuts are specified as [modifier+][modifier+]...key
-    # Available modifiers are "ctrl", "mod1" (the alt-key), "mod2",
-    # "mod3" and "mod4" (windows-key).
-    # Xev might be helpful to find names for keys.
-
-    # Close notification.
-    close = ctrl+space
-
-    # Close all notifications.
-    close_all = ctrl+shift+space
-
-    # Redisplay last message(s).
-    # On the US keyboard layout "grave" is normally above TAB and left
-    # of "1".
-    history = ctrl+period
-
-    # Context menu.
-    context = ctrl+shift+period
-
-[urgency_low]
-    # IMPORTANT: colors have to be defined in quotation marks.
-    # Otherwise the "#" and following would be interpreted as a comment.
-    background = "#2D333D"
-    foreground = "#D8DEE9"
-    timeout = 2
-
-[urgency_normal]
-    background = "#2D333D"
-    foreground = "#D8DEE9"
-    timeout = 10
-
-[urgency_critical]
-    background = "#2D333D"
-    foreground = "#D8DEE9"
-    timeout = 0
-
-
-# Every section that isn't one of the above is interpreted as a rules to
-# override settings for certain messages.
-# Messages can be matched by "appname", "summary", "body", "icon", "category",
-# "msg_urgency" and you can override the "timeout", "urgency", "foreground",
-# "background", "new_icon" and "format".
-# Shell-like globbing will get expanded.
-#
-# SCRIPTING
-# You can specify a script that gets run when the rule matches by
-# setting the "script" option.
-# The script will be called as follows:
-#   script appname summary body icon urgency
-# where urgency can be "LOW", "NORMAL" or "CRITICAL".
-#
-# NOTE: if you don't want a notification to be displayed, set the format
-# to "".
-# NOTE: It might be helpful to run dunst -print in a terminal in order
-# to find fitting options for rules.
-
-#[espeak]
-#    summary = "*"
-#    script = dunst_espeak.sh
-
-#[script-test]
-#    summary = "*script*"
-#    script = dunst_test.sh
-
-#[ignore]
-#    # This notification will not be displayed
-#    summary = "foobar"
-#    format = ""
-
-#[signed_on]
-#    appname = Pidgin
-#    summary = "*signed on*"
-#    urgency = low
-#
-#[signed_off]
-#    appname = Pidgin
-#    summary = *signed off*
-#    urgency = low
-#
-#[says]
-#    appname = Pidgin
-#    summary = *says*
-#    urgency = critical
-#
-#[twitter]
-#    appname = Pidgin
-#    summary = *twitter.com*
-#    urgency = normal
-#
-# vim: ft=cfg
diff --git a/.config/feh/keys b/.config/feh/keys
deleted file mode 100644
index c307f8d..0000000
--- a/.config/feh/keys
+++ /dev/null
@@ -1,28 +0,0 @@
-# feh key configuration.
-#
-# key definition: <action name> <key1> [<key2> [<key3>]]
-#
-
-#next_img j Right space
-#prev_img k Left BackSpace
-
-# File deletion
-remove     d   Delete
-delete   C-d C-Delete
-
-# remove now conflicts with toggle_filenames, so change that, mnemonic: [n]ame
-toggle_filenames n
-
-scroll_up k Up
-scroll_down j Down
-scroll_right L Right
-scroll_left H Left
-
-toggle_fullscreen f
-save_filelist F
-
-zoom_in K XF86Forward
-zoom_out J XF86Back
-next_img l space
-prev_img BackSpace h
-
diff --git a/.config/i3/config b/.config/i3/config
deleted file mode 100644
index 813122b..0000000
--- a/.config/i3/config
+++ /dev/null
@@ -1,385 +0,0 @@
-# This file has been auto-generated by i3-config-wizard(1).
-# It will not be overwritten, so edit it as you like.
-#
-# Should you change your keyboard layout some time, delete
-# this file and re-run i3-config-wizard(1).
-#
-
-# i3 config file (v4)
-#
-# Please see https://i3wm.org/docs/userguide.html for a complete reference!
-
-# Variables ======================={{{
-
-set $term st
-set $shutdown sudo shutdown -h now
-set $reboot sudo reboot
-
-# }}}
-# Exec on start ==================={{{
-
-exec_always xrdb ~/.Xresources
-exec xmodmap ~/.Xmodmap
-exec xset +fp $HOME/.fonts/
-exec --no-startup-id redshift &
-#exec --no-startup-id $HOME/bin/polybar_launch
-exec --no-startup-id $HOME/.config/lemonbar/lemonbar.sh
-#exec $term -e tmux new -s main
-#exec xrate r rate 200 30
-exec_always hsetroot -fill ~/Pictures/Landscapes/river-forest.jpg
-exec_always $HOME/bin/todo-notify
-
-# }}}
-# General settings ================{{{
-
-#Needed for i3-gaps
-for_window [class="^.*"] border pixel 0
-gaps inner 10
-gaps outer 25
-
-set $mod Mod4
-
-# Font for window titles. Will also be used by the bar unless a different font
-# is used in the bar {} block below.
-font pango:curie 7
-
-# This font is widely installed, provides lots of unicode glyphs, right-to-left
-# text rendering and scalability on retina/hidpi displays (thanks to pango).
-#font pango:DejaVu Sans Mono 8
-
-# Before i3 v4.8, we used to recommend this one as the default:
-# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
-# The font above is very space-efficient, that is, it looks good, sharp and
-# clear in small sizes. However, its unicode glyph coverage is limited, the old
-# X core fonts rendering does not support right-to-left and this being a bitmap
-# font, it doesn’t scale on retina/hidpi displays.
-
-# Use Mouse+$mod to drag floating windows to their wanted position
-floating_modifier $mod
-
-# focus the parent container
-#bindsym $mod+a focus parent
-
-# focus the child container
-#bindsym $mod+d focus child
-
-## Manual management of external displays
-# Set the shortcuts and what they do
-set $mode_display Ext Screen (v) VGA ON, (h) HDMI ON, (x) VGA OFF, (y) HDMI OFF
-mode "$mode_display" {
-    bindsym v exec --no-startup-id xrandr --output VGA-0 --auto --right-of LVDS, mode "default"
-    bindsym h exec --no-startup-id xrandr --output HDMI-0 --auto --right-of LVDS, mode "default"
-    bindsym x exec --no-startup-id xrandr --output VGA-0 --auto --off, mode "default"
-    bindsym y exec --no-startup-id xrandr --output HDMI-0 --auto --off, mode "default"
-
-    # back to normal: Enter or Escape
-    bindsym Return mode "default"
-    bindsym Escape mode "default"
-}
-# Declare here the shortcut to bring the display selection menu
-bindsym $mod+e mode "$mode_display"
-
-# }}}
-# Workspace settings =============={{{
-set $ws1  ""
-set $ws2  ""
-set $ws3  ""
-set $ws4  ""
-set $ws5  ""
-set $ws6  ""
-set $ws7  ""
-set $ws8  "VIII"
-set $ws9  "IX"
-set $ws10 "X"
-
-# switch to workspace
-bindsym $mod+1  workspace $ws1
-bindsym $mod+2  workspace $ws2
-bindsym $mod+3  workspace $ws3
-bindsym $mod+4  workspace $ws4
-bindsym $mod+5  workspace $ws5
-bindsym $mod+6  workspace $ws6
-bindsym $mod+7  workspace $ws7
-bindsym $mod+8  workspace $ws8
-bindsym $mod+9  workspace $ws9
-bindsym $mod+0  workspace $ws10
-
-# move focused container to workspace
-bindsym $mod+Shift+1  move container to workspace $ws1
-bindsym $mod+Shift+2  move container to workspace $ws2
-bindsym $mod+Shift+3  move container to workspace $ws3
-bindsym $mod+Shift+4  move container to workspace $ws4
-bindsym $mod+Shift+5  move container to workspace $ws5
-bindsym $mod+Shift+6  move container to workspace $ws6
-bindsym $mod+Shift+7  move container to workspace $ws7
-bindsym $mod+Shift+8  move container to workspace $ws8
-bindsym $mod+Shift+9  move container to workspace $ws9
-bindsym $mod+Shift+0  move container to workspace $ws10
-
-for_window [class="weechat" instance="weechat"] move workspace $ws7
-for_window [class="TelegramDesktop"] move workspace $ws6
-#assign [class="mpv"] $ws5
-for_window [class="ranger" instance="ranger"] move workspace $ws4
-for_window [class="neomutt" instance="neomutt"] move workspace $ws5
-
-for_window [instance="math" class="math"] floating enable, resize set 800 300, move scratchpad
-exec --no-startup-id $term -n math -c math -f "Monaco:size=14" -e bc -q -l
-
-for_window [instance="dropdown" class="dropdown"] floating enable , resize set 625 400 , move scratchpad
-# Runs the tmuxinit script, which searches for an earlier tmux instance,
-# otherwise starts a new one (to prevent multiple dropdown sessions).
-exec --no-startup-id $term -n dropdown -c dropdown -e tmux new-session -s dropdown
-
-for_window [class="Pale moon"] move workspace $ws2
-for_window [title="GIMP Startup"] move workspace $ws5
-for_window [class="Gimp"] move workspace $ws5
-for_window [window_role="gimp-dock"] floating disable; move left; resize shrink width 50 px or 50ppt
-for_window [window_role="gimp-toolbox"] floating disable; move right; resize grow width 30 px or 30ppt
-#for_window [class="mpv"] floating enable, resize set 500 200, sticky enable
-#for_window [title="st|tmux"] border pixel 4
-#for_window [title="Spotify"] floating enable, sticky enable
-for_window [class="Sxiv"] floating enable
-
-hide_edge_borders both
-
-set $bg-color 	         #282828
-set $inactive-bg-color   #504945
-set $text-color          #ebdbb2
-set $inactive-text-color #a89984
-set $urgent-bg-color     #fbf1c7
-set $urgent-text-color   #282828
-set $blue				 #458588
-
-# window colors
-#                       border              background         text                 indicator
-client.focused          $bg-color		    #CBCCCD	           $text-color          #CBCCCD
-client.unfocused        $bg-color			#798185			   $inactive-text-color #282828
-client.focused_inactive $bg-color		  	$inactive-bg-color $inactive-text-color #282828
-client.urgent           $bg-color		    $urgent-bg-color   $urgent-text-color   #282828
-
-# Start i3bar to display a workspace bar (plus the system information i3status
-# finds out, if available)
-#bar {
-#		status_command i3status
-#		colors {
-#		background $bg-color
-#	    	separator #757575
-#		#                  border             background         text
-#		focused_workspace  $bg-color          $bg-color          $text-color
-#		inactive_workspace $inactive-bg-color $inactive-bg-color $inactive-text-color
-#		urgent_workspace   $urgent-bg-color   #d65d03   $text-color
-#	}
-#	position top
-#}
-
-# }}}
-# Keybindings ====================={{{
-
-# Ref: https://faq.i3wm.org/question/3747/enabling-multimedia-keys/?answer=3759#post-id-3759
-# Pulse Audio controls
-bindsym XF86AudioRaiseVolume exec --no-startup-id pactl set-sink-volume 0 +5% #increase sound volume
-bindsym XF86AudioLowerVolume exec --no-startup-id pactl set-sink-volume 0 -5% #decrease sound volume
-bindsym XF86AudioMute exec --no-startup-id pactl set-sink-mute 0 toggle # mute sound
-
-# Sreen brightness controls
-bindsym XF86MonBrightnessUp exec xbacklight -inc 20 # increase screen brightness
-bindsym XF86MonBrightnessDown exec xbacklight -dec 20 # decrease screen brightness
-
-# Media player controls
-bindsym XF86AudioPlay exec playerctl play
-bindsym XF86AudioPause exec playerctl pause
-bindsym XF86AudioNext exec playerctl next
-bindsym XF86AudioPrev exec playerctl previous
-
-# start a terminal
-bindsym $mod+Return exec $term
-bindsym $mod+Shift+Return exec $term -e tmux
-
-#bindsym $mod+BackSpace
-bindsym $mod+Shift+BackSpace	exec $HOME/bin/prompt "Are you sure you want to reboot?" "$reboot"
-
-# change focus between tiling / floating windows
-bindsym $mod+space		focus mode_toggle
-# toggle tiling / floating
-bindsym $mod+Shift+space 	floating toggle
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Left focus left
-bindsym $mod+Down focus down
-bindsym $mod+Up focus up
-bindsym $mod+Right focus right
-
-# alternatively, you can use the cursor keys:
-bindsym $mod+Shift+Left move left
-bindsym $mod+Shift+Down move down
-bindsym $mod+Shift+Up move up
-bindsym $mod+Shift+Right move right
-
-# Go to last visited workspace
-bindsym $mod+Tab		workspace back_and_forth
-
-# split in vertical orientation
-bindsym $mod+shift+slash split v ; exec notify-send "Tile vertical"
-# split in horizontal orientation
-bindsym $mod+slash split h ; exec notify-send "Tile horizontal"
-
-# change container layout (stacked, tabbed, toggle split)
-bindsym $mod+F1 layout stacking
-bindsym $mod+F2 layout tabbed
-bindsym $mod+F3 layout toggle split
-bindsym $mod+F5 restart
-bindsym $mod+F6 exec --no-startup-id displayselect
-
-# Go to workspaces with Super+[ and Super+]
-bindsym $mod+bracketleft workspace prev
-bindsym $mod+bracketright workspace next
-
-# Go to workspaces with PageUp/PageDown
-bindsym $mod+Prior			workspace prev
-bindsym $mod+Shift+Prior	move container to workspace prev
-bindsym $mod+Next			workspace next
-bindsym $mod+Shift+Next		move container to workspace next
-
-#bindsym $mod+Escape		workspace prev
-bindsym $mod+Shift+Escape 	exec i3-msg exit
-
-bindsym $mod+F9		exec --no-startup-id sudo dmenumount
-bindsym $mod+F10	exec --no-startup-id sudo dmenuumount
-# }}}
-# Letter keybindings =============={{{
-
-# screenshots
-bindsym $mod+Print					exec scrot -e 'mv $f ~/Pictures/scrot' && sleep 1 && exec notify-send 'screenshot has been saved in ~/Pictures/scrot'
-bindsym --release $mod+Shift+Print  exec scrot -se 'mv $f ~/Pictures/scrot/' && sleep 1 && exec notify-send 'screenshot has been saved in ~/Pictures/scrot'
-
-bindsym --release $mod+s			exec scrot -e 'xclip -selection clipboard -t image/png $f && rm -f $f'
-bindsym --release $mod+shift+s		exec scrot -se 'xclip -selection clipboard -t image/png $f && rm -f $f'
-
-# Scratchpad windows
-bindsym $mod+a						[instance="math" class="math"] scratchpad show, [instance="math" class="math"] move position center
-#bindsym $mod+shift+a				exec cmusart
-
-# Open the default browser
-#bindsym $mod+b
-bindsym $mod+shift+b				exec --no-startup-id $BROWSER
-
-# Reload config
-bindsym $mod+c						exec cmus-status
-bindsym $mod+Shift+c				reload
-
-# start rofi/dmenu (a program launcher)
-bindsym $mod+d						exec dmenu_run -i -fn 'iosevka Nerd Font:size=11' -p ' Search  ' -nb '#2f343f' -nf '#e7e8eb' -sb '#81A1C1' -sf '#2f343f'
-#bindsym $mod+d						exec rofi -show combi
-
-# Exit i3
-bindsym $mod+Shift+e				exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
-# reload the configuration file
-bindsym $mod+n						exec $term -n neomutt -c neomutt -e neomutt
-bindsym $mod+Shift+n				exec $term -n newsboat -c newsboat -e newsboat
-
-# kill focused window
-bindsym $mod+q kill
-bindsym $mod+Shift+q kill
-
-# Start weechat
-bindsym $mod+w						exec $term -n weechat -c weechat -e weechat-curses
-bindsym $mod+shift+w                exec $HOME/bin/dmoji
-
-# Start ranger
-bindsym $mod+r						exec $term -n ranger -c ranger -e ranger
-bindsym $mod+Shift+r				exec $term -n ranger -c ranger -e sudo ranger
-bindsym Mod1+r                      exec $HOME/bin/record-slop
-bindsym Mod1+Shift+r                exec killall ffmpeg && exec notify-send "FFmpeg" "Gravação da tela finalizada!"
-
-# Set the default gaps / Open Telegram
-bindsym $mod+t						split toggle
-bindsym $mod+shift+t				exec telegram-desktop
-
-bindsym $mod+u						[instance="dropdown" class="dropdown"] scratchpad show, [instance="dropdown" class="dropdown"] move position center
-#bindsym $mod+shift+u				gaps inner all set 10; gaps outer all set 10
-
-# Start i3lock
-bindsym $mod+x						exec $truemute ;exec $HOME/.config/i3/locki3.sh
-bindsym $mod+shift+x				exec prompt "Are you sure you want to shutdown?" "sudo poweroff -h now"
-
-# Change gaps
-bindsym $mod+g						gaps inner current plus 5
-bindsym $mod+shift+g				gaps inner current minus 5
-bindsym $mod+z						gaps outer current plus 5
-bindsym $mod+Shift+z				gaps outer current minus 5
-
-# Set i3 with no gaps
-bindsym $mod+Shift+d				gaps inner current set 0; gaps outer current set 0
-
-# enter fullscreen mode for the focused container
-bindsym $mod+f						fullscreen toggle
-bindsym $mod+shift+f				gaps inner all set 10; gaps outer all set 25
-
-# Call vim-anywhere
-bindsym Mod1+v exec ~/.vim-anywhere/bin/run
-
-# change focus
-bindsym $mod+h						focus left
-bindsym $mod+j						focus down
-bindsym $mod+k						focus up
-bindsym $mod+l						focus right
-
-# Swap windows positions
-bindsym $mod+Shift+h				move left 30
-bindsym $mod+Shift+j				move down 30
-bindsym $mod+Shift+k				move up 30
-bindsym $mod+Shift+l				move right 30
-
-# Custom binding to resize windows (the original is too bad)
-bindsym $mod+Shift+y				resize shrink width 10 px or 10ppt
-bindsym $mod+Shift+u				resize shrink height 10 px or 10 ppt
-bindsym $mod+Shift+i				resize grow height 10 px or 10 ppt
-bindsym $mod+Shift+o				resize grow width 10 px or 10 ppt
-
-# }}}
-# Media ==========================={{{1
-
-#For spotify
-#set $music spotify
-#set $pause dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.PlayPause
-#set $trupause dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Pause
-#set $play dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Play
-#set $next dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next
-#set $prev dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous
-#set $lilfor dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Seek
-#set $bigfor dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Seek(
-
-# For cmus
-set $music "$term tmux new-window -t dropdown && tmux send-keys -t dropdown cmus 'Enter'"
-set $next cmus-remote --next && pkill dunst ; exec cmus-status
-set $play cmus-remote --play
-set $prev cmus-remote --prev && pkill dunst ; exec cmus-status
-set $pause cmus-remote --pause
-set $truepause cmus-remote --stop
-
-# For Alsa/Amixer
-set $inc --no-startup-id amixer sset Master 2%+
-set $biginc --no-startup-id amixer sset Master 5%+
-set $dec --no-startup-id amixer sset Master 2%-
-set $bigdec --no-startup-id amixer sset Master 5%-
-set $mute --no-startup-id amixer sset Master toggle
-set $truemute --no-startup-id amixer sset Master mute
-
-# Media keys
-bindsym $mod+F8 			exec $mute
-bindsym $mod+m				exec $music
-bindsym $mod+shift+m		exec tmux split-window -t dropdown -v && tmux send-keys -t dropdown 'cmus-lyrics | less' 'Enter'
-bindsym $mod+p				exec $play
-bindsym $mod+shift+p		exec $pause
-bindsym $mod+plus			exec $inc
-bindsym $mod+Shift+plus		exec $biginc
-bindsym $mod+minus			exec $dec
-bindsym $mod+Shift+minus	exec $bigdec
-bindsym $mod+less			exec $prev
-bindsym $mod+Shift+less		exec $beg
-bindsym $mod+greater		exec $next
-bindsym $mod+Shift+greater	exec $next
-bindsym $mod+Shift+Delete	exec $truemute ; exec $truepause ; workspace '' ; exec $term -e zathura vim ~/.vimrc ; exec $term -e ranger
-
-# }}}
diff --git a/.config/i3/lock.png b/.config/i3/lock.png
deleted file mode 100644
index cd8b228..0000000
Binary files a/.config/i3/lock.png and /dev/null differ
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
new file mode 100644
index 0000000..15d9248
--- /dev/null
+++ b/.config/nvim/init.vim
@@ -0,0 +1,479 @@
+" Plugins inicialization ==================={{{
+
+call plug#begin('~/.local/share/nvim/plugged')
+
+" Themes
+"Plug 'edkolev/tmuxline.vim'
+Plug 'vim-airline/vim-airline'
+Plug 'vim-airline/vim-airline-themes'
+Plug 'tyrannicaltoucan/vim-quantum'
+"Plug 'chriskempson/base16-vim'
+Plug 'morhetz/gruvbox'
+Plug 'ryanoasis/vim-devicons'
+"Plug 'itchyny/lightline.vim'
+"Plug 'shinchu/lightline-gruvbox.vim'
+
+" Languages
+Plug 'elzr/vim-json', { 'for': 'json' }
+Plug 'othree/html5.vim', { 'for': 'html' }
+Plug 'gregsexton/MatchTag', { 'for': 'html' }
+Plug 'kshenoy/vim-signature'
+Plug 'neoclide/coc.nvim', {'tag': '*', 'do': { -> coc#util#install()}}
+
+"Plug 'ervandew/supertab'
+"Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' }
+"if executable('python')
+  "Plug 'zchee/deoplete-jedi', { 'do': 'python' }
+"endif
+
+Plug 'tpope/vim-fugitive'
+if isdirectory('/usr/local/opt/fzf')
+  Plug '/usr/local/opt/fzf' | Plug 'junegunn/fzf.vim'
+else
+  Plug 'junegunn/fzf', { 'dir': '~/.fzf', 'do': './install --all' }
+  Plug 'junegunn/fzf.vim'
+endif
+
+" Others
+Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
+Plug 'scrooloose/nerdtree', { 'on':  'NERDTreeToggle' }
+Plug 'Xuyuanp/nerdtree-git-plugin', { 'on':  'NERDTreeToggle' }
+Plug 'tpope/vim-surround'
+Plug 'Yggdroot/indentLine'
+Plug 'scrooloose/nerdcommenter'
+Plug 'jiangmiao/auto-pairs'
+Plug 'sheerun/vim-polyglot'
+Plug 'yuttie/comfortable-motion.vim'
+
+"Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }}
+
+"Markdown
+function! BuildComposer(info)
+  if a:info.status != 'unchanged' || a:info.force
+    if has('nvim')
+      !cargo build --release
+    else
+      !cargo build --release --no-default-features --features json-rpc
+    endif
+  endif
+endfunction
+
+""Plug 'euclio/vim-markdown-composer', { 'do': function('BuildComposer') }
+
+call plug#end()
+
+" }}}
+" Global stuff ============================={{{
+set runtimepath+=~/.fzf
+let g:quantum_italics=1
+set termguicolors
+colorscheme quantum                     " Use the gruvbox colorscheme: https://github.com/morhetz/gruvbox
+set background=dark                     " Use a dark background
+set scrolloff=5                         " Keep at least 3 lines above/below when scrolling
+set lazyredraw                          " Don't update the display while executing macros
+set tabstop=4                           " Tab indentation levels every four columns
+set shiftwidth=4                        " Indent/outdent by four columns (when pressing >>)
+set expandtab                           " Convert all tabs that are typed into spaces (it has a better compatibility with other computers)
+set shiftround                          " Always indent/outdent to nearest tabstop
+set smarttab                            " Use shiftwidths at left margin, tabstops everywhere else
+set laststatus=2                        " Always show the statusline
+set number                              " Don't display line numbers
+set numberwidth=4
+set relativenumber
+set clipboard=unnamedplus               " O registrador * vira unnamed, permite que os textos copiados pelo vim vão para o clipboard
+set backspace=indent,eol,start          " Fix backspace
+set hlsearch                            " Highlight search
+set incsearch ignorecase                " Increase search
+set noswapfile                          " Don't use swap file
+set smartcase                           " Override the 'ignorecase' option if the search pattern contains upper case characters.
+set showcmd                             " Show commands at bottom
+set hidden                              " Switch buffers without the need of saving them
+set path=.,**                           " Set path to the current and children directories
+set splitbelow splitright               " Split belor and/or right when opening new buffers
+set list listchars=eol:$,trail:∙ listchars+=tab:│\  fillchars+=vert:│,fold:\
+set foldenable foldmethod=marker
+set cursorline
+set colorcolumn=80
+set shortmess+=c                        " don't give |ins-completion-menu| messages.
+set updatetime=300                      " Smaller updatetime for CursorHold & CursorHoldI
+set cmdheight=2                         " Better display for messages
+set signcolumn=yes                      " always show signcolumns
+" }}}
+" General mappings ========================={{{
+
+" Opens an edit command with the path of the currently edited file filled in
+nnoremap ,e :e <C-R>=expand("%:p:h") . "/" <CR>
+
+" Find faster
+nnoremap ,f :find <C-R>=fnameescape(expand('%:p:h')). '/'<CR>
+
+"Change directory to the dir of the current buffer
+noremap ,cd :cd %:p:h<CR>
+
+" Window buffer navigation
+nnoremap <C-h> <C-w>h
+nnoremap <C-j> <C-w>j
+nnoremap <C-k> <C-w>k
+nnoremap <C-l> <C-w>l
+
+" Make ; works like a : in normal mode, then i don't have to press <S-;> to go to the command line
+nnoremap ; :
+nnoremap : ;
+
+" Fix the go to next line if wrap is enabled
+nnoremap <expr> j v:count ? 'j' : 'gj'
+nnoremap <expr> k v:count ? 'k' : 'gk'
+
+" Quickly search
+nnoremap ,s :g//#<Left><Left>
+
+" A better search (search for the letters under cursor)
+vnoremap * :<C-u>call <SID>VSetSearch()<CR>//<CR>
+vnoremap # :<C-u>call <SID>VSetSearch()<CR>??<CR>
+nnoremap * *``
+nnoremap g* g*``
+
+" Change the word under cursor, highlight the others in the file, and you can repeat the change pressing dot
+nnoremap c*  *Ncgn
+nnoremap c*c #``cgN
+vnoremap c*  *Ncgn
+
+" Remove all trailing whitespace by pressing F5
+nnoremap <silent> <F5> :let _s=@/ <Bar> :%s/\s\+$//e <Bar> :let @/=_s <Bar> :nohl <Bar> :unlet _s <CR>
+
+" Keep selection after indenting
+vnoremap < <gv
+vnoremap > >gv
+
+" Remove the Windows ^M - when the encodings gets messed up
+nnoremap ,m mmHmt:%s/<C-V><cr>//ge<cr>'tzt'm
+
+" Allow saving of files as sudo
+command! W silent w !sudo tee > /dev/null %
+
+" Fix indentation, changed the map, so that if i have the mark 'm', this map won't destroy it
+"nnoremap g= mmgg=G`m
+nnoremap g= gg=G``
+
+" A cool mapping that insert current time info
+inoremap <silent> <C-G><C-T> <C-R>=repeat(complete(col('.'),map(["%Y-%m-%d %H:%M:%S","%a, %d %b %Y %H:%M:%S %z","%Y %b %d","%d-%b-%y","%a %b %d %T %Z %Y","%Y-%m-%d %a %I:%M %p"],'strftime(v:val)')+[localtime()]),0)<CR>
+
+" Insert new line, but stay in normal mode
+" Ref: https://www.reddit.com/r/vim/comments/7yzblt/what_was_your_best_vimrc_addition/dumcoya/?utm_content=permalink&utm_medium=front&utm_source=reddit&utm_name=vim
+nnoremap <silent> [<space>  :<c-u>put!=repeat([''],v:count)<bar>']+1<cr>
+nnoremap <silent> ]<space>  :<c-u>put =repeat([''],v:count)<bar>'[-1<cr>
+
+" Make 0 go to the first character rather than the beginning
+" of the line. When we're programming, we're almost always
+" interested in working with text rather than empty space. If
+" you want the traditional beginning of line, use ^
+nnoremap 0 ^
+nnoremap ^ 0
+
+" These are very similar keys. Typing 'a will jump to the line in the current
+" file marked with ma. However, `a will jump to the line and column marked
+" with ma.  It’s more useful in any case I can imagine, but it’s located way
+" off in the corner of the keyboard. The best way to handle this is just to
+" swap them: http://items.sjbach.com/319/configuring-vim-right
+nnoremap ' `
+nnoremap ` '
+
+" Resize windows with arrow keys
+nnoremap <C-Left> :vertical resize +2<CR>
+nnoremap <C-Right> :vertical resize -2<CR>
+nnoremap <C-Up> :resize -2<CR>
+nnoremap <C-Down> :resize +2<CR>
+
+" Switch buffer
+nnoremap <bs> <c-^>
+
+" copy current 'filename into system clipboard - mnemonic:' (c)urrent(f)ilename
+" this is helpful to paste someone the path you're looking at
+" ~/.c-vimrc
+nnoremap <silent> ,cf :let @* = expand("%:~")<CR>
+" /home/leonardo/.c-vimrc
+nnoremap <silent> ,cr :let @* = expand("%")<CR>
+" .c-vimrc
+nnoremap <silent> ,cn :let @* = expand("%:t")<CR>
+
+" Search mappings: These will make it so that going to the next one in a
+" search will center on the line it's found in.
+nnoremap n nzzzv
+nnoremap N Nzzzv
+
+" Source this line, place your cursor on ), press zl and you'll understand
+"    println()foo
+nnoremap zl :let @z=@"<cr>x$p:let @"=@z<cr>
+
+" }}}
+" Functions ================================{{{
+
+" map '<CR>' in command-line mode to execute the function below
+cnoremap <expr> <CR> CCR()
+function! CCR()       " See https://gist.github.com/romainl/047aca21e338df7ccf771f96858edb86
+    " grab the current command-line
+    let cmdline = getcmdline()
+
+    " does it end with '#' or 'number' or one of its abbreviations?
+    if cmdline =~ '\v\C/(#|nu|num|numb|numbe|number)$'
+        " press '<CR>' then ':' to enter command-line mode
+        return "\<CR>:"
+    else
+        " press '<CR>'
+        return "\<CR>"
+    endif
+endfunction
+
+" Search by the word visual selected, see: http://got-ravings.blogspot.com.br/2008/07/vim-pr0n-visual-search-mappings.html
+function! s:VSetSearch()
+    let temp = @@
+    norm! gvy
+    let @/ = '\V' . substitute(escape(@@, '\'), '\n', '\\n', 'g')
+    let @@ = temp
+endfunction
+
+" It lets '%' works for other things, like if/endif, tags, etc
+" Load matchit.vim, but only if the user hasn't installed a newer version.
+if !exists('g:loaded_matchit') && findfile('plugin/matchit.vim', &rtp) ==# ''
+    runtime! macros/matchit.vim
+endif
+
+" Enable undo changes to a file after closing and reopening
+if has('persistent_undo')
+    silent call system('mkdir -p ~/.vim/tmp/undo')
+    set undofile
+    set undodir=~/.vim/tmp/undo/
+endif
+
+" }}}
+" AutoCMD's ================================{{{
+if has('autocmd')
+    " Show spaces as red if there's nothing after it (from Greg Hurrel)
+    augroup TrailWhiteSpaces
+        highlight ColorColumn ctermbg=1
+        autocmd BufWinEnter <buffer> match Error /\s\+$/
+        autocmd InsertEnter <buffer> match Error /\s\+\%#\@<!$/
+        autocmd InsertLeave <buffer> match Error /\s\+$/
+        autocmd BufWinLeave <buffer> call clearmatches()
+    augroup END
+
+    " Ref: https://github.com/thoughtbot/dotfiles/blob/master/vimrc#L35
+    " When editing a file, always jump to the last known cursor position.
+    " Don't do it for commit messages, when the position is invalid, or when
+    " inside an event handler (happens when dropping a file on gvim).
+    augroup vimrc-remember-cursor-position
+        autocmd BufReadPost *
+                    \ if &ft != 'gitcommit' && line("'\"") > 0 && line("'\"") <= line("$") |
+                    \   exe "normal g`\"" |
+                    \ endif
+    augroup END
+
+endif
+
+" }}}
+" Plugins {{{
+
+" Nerdtree
+" Toggle NERDTree with F6
+nnoremap <tab> :NERDTreeToggle<CR>
+
+" Close NERDTree with Shift-TAB
+nnoremap <S-Tab> :NERDTreeClose<CR>
+
+" Show the bookmarks table on startup
+let NERDTreeShowBookmarks = 1
+
+" Autoclose nerdtree if it is the only open buffer
+augroup nerdtree_close
+    autocmd bufenter * if (winnr("$") == 1 && exists("b:NERDTree") && b:NERDTree.isTabTree()) | q | endif
+augroup END
+
+
+" fzf.vim
+
+" Mapping selecting mappings
+" Show avaliable mappings
+nmap <leader><tab> <plug>(fzf-maps-n)
+xmap <leader><tab> <plug>(fzf-maps-x)
+omap <leader><tab> <plug>(fzf-maps-o)
+
+" Insert mode completion
+imap <c-x><c-k> <plug>(fzf-complete-word)
+imap <c-x><c-f> <plug>(fzf-complete-path)
+imap <c-x><c-j> <plug>(fzf-complete-file-ag)
+imap <c-x><c-l> <plug>(fzf-complete-line)
+
+" Advanced customization using autoload functions
+inoremap <expr> <c-x><c-m> fzf#vim#complete#word({'left': '15%'})
+
+command! Plugs call fzf#run({
+            \ 'source':  map(sort(keys(g:plugs)), 'g:plug_home."/".v:val'),
+            \ 'options': '--delimiter / --nth -1',
+            \ 'down':    '~20%',
+            \ 'sink':    'Explore'})
+
+let g:fzf_colors =
+            \ { 'fg':      ['fg', 'Normal'],
+            \ 'bg':      ['bg', 'Normal'],
+            \ 'hl':      ['fg', 'Comment'],
+            \ 'fg+':     ['fg', 'CursorLine', 'CursorColumn', 'Normal'],
+            \ 'bg+':     ['bg', 'CursorLine', 'CursorColumn'],
+            \ 'hl+':     ['fg', 'Statement'],
+            \ 'info':    ['fg', 'PreProc'],
+            \ 'border':  ['fg', 'Ignore'],
+            \ 'prompt':  ['fg', 'Conditional'],
+            \ 'pointer': ['fg', 'Exception'],
+            \ 'marker':  ['fg', 'Keyword'],
+            \ 'spinner': ['fg', 'Label'],
+            \ 'header':  ['fg', 'Comment'] }
+
+let g:fzf_action = {
+            \ 'ctrl-s': 'split',
+            \ 'ctrl-v': 'vsplit'
+            \ }
+
+nnoremap <space>ff  :Files<CR>
+nnoremap <space>fl  :Lines<CR>
+nnoremap <space>fbl :BLines<CR>
+nnoremap <space>fh  :Files<CR>
+nnoremap <space>gb  :Buffers<CR>
+nnoremap <space>p   :History<CR>
+
+set wildmode=list:longest,list:full
+set wildignore+=*.o,*.obj,.git,*.rbc,*.pyc,__pycache__
+"let $FZF_DEFAULT_COMMAND =  "find * -path '*/\.*' -prune -o -path 'node_modules/**' -prune -o -path 'target/**' -prune -o -path 'dist/**' -prune -o  -type f -print -o -type l -print 2> /dev/null"
+"let $FZF_DEFAULT_COMMAND = 'rg --hidden -l ""'
+
+" Deoplete
+let g:deoplete#enable_at_startup = 1
+
+" Lightline
+let g:lightline = {
+    \ 'colorscheme': 'quantum',
+    \ 'active': {
+    \   'left': [ [ 'mode', 'paste'], [ 'filename', 'modified' ] ],
+    \   'right': [ [ 'lineinfo' ], ['percent'], [ 'fileformat', 'fileencoding', 'filetype'] ]
+    \ },
+    \ 'separator': { 'left': '', 'right': '' },
+    \ 'subseparator': { 'left': '|', 'right': '|' },
+    \ 'component_function': {
+    \   'cocstatus': 'coc#status'
+    \ },
+    \ }
+
+
+let g:airline#extensions#tabline#enabled = 1
+let g:airline_powerline_fonts = 1
+
+let g:vim_json_syntax_conceal = 0
+
+let g:SuperTabDefaultCompletionType = "<c-n>"
+
+
+
+autocmd FileType yaml setlocal ts=2 sts=2 sw=2 expandtab
+let g:comfortable_motion_scroll_down_key = "j"
+let g:comfortable_motion_scroll_up_key = "k"
+let g:comfortable_motion_no_default_key_mappings = 1
+
+
+" Coc.vim
+
+" Use tab for trigger completion with characters ahead and navigate.
+" Use command ':verbose imap <tab>' to make sure tab is not mapped by other plugin.
+inoremap <silent><expr> <TAB>
+      \ pumvisible() ? "\<C-n>" :
+      \ <SID>check_back_space() ? "\<TAB>" :
+      \ coc#refresh()
+inoremap <expr><S-TAB> pumvisible() ? "\<C-p>" : "\<C-h>"
+
+function! s:check_back_space() abort
+  let col = col('.') - 1
+  return !col || getline('.')[col - 1]  =~# '\s'
+endfunction
+
+" Use <c-space> for trigger completion.
+inoremap <silent><expr> <c-space> coc#refresh()
+
+" Use <cr> for confirm completion, `<C-g>u` means break undo chain at current position.
+" Coc only does snippet and additional edit on confirm.
+inoremap <expr> <cr> pumvisible() ? "\<C-y>" : "\<C-g>u\<CR>"
+
+" Use `[c` and `]c` for navigate diagnostics
+nmap <silent> [c <Plug>(coc-diagnostic-prev)
+nmap <silent> ]c <Plug>(coc-diagnostic-next)
+
+" Remap keys for gotos
+nmap <silent> gd <Plug>(coc-definition)
+nmap <silent> gy <Plug>(coc-type-definition)
+nmap <silent> gi <Plug>(coc-implementation)
+nmap <silent> gr <Plug>(coc-references)
+
+" Use K for show documentation in preview window
+nnoremap <silent> K :call <SID>show_documentation()<CR>
+
+function! s:show_documentation()
+  if &filetype == 'vim'
+    execute 'h '.expand('<cword>')
+  else
+    call CocAction('doHover')
+  endif
+endfunction
+
+" Highlight symbol under cursor on CursorHold
+autocmd CursorHold * silent call CocActionAsync('highlight')
+
+" Remap for rename current word
+nmap <leader>rn <Plug>(coc-rename)
+
+" Remap for format selected region
+vmap <leader>f  <Plug>(coc-format-selected)
+nmap <leader>f  <Plug>(coc-format-selected)
+
+augroup mygroup
+  autocmd!
+  " Setup formatexpr specified filetype(s).
+  autocmd FileType typescript,json setl formatexpr=CocAction('formatSelected')
+  " Update signature help on jump placeholder
+  autocmd User CocJumpPlaceholder call CocActionAsync('showSignatureHelp')
+augroup end
+
+" Remap for do codeAction of selected region, ex: `<leader>aap` for current paragraph
+vmap <leader>a  <Plug>(coc-codeaction-selected)
+nmap <leader>a  <Plug>(coc-codeaction-selected)
+
+" Remap for do codeAction of current line
+nmap <leader>ac  <Plug>(coc-codeaction)
+" Fix autofix problem of current line
+nmap <leader>qf  <Plug>(coc-fix-current)
+
+" Use `:Format` for format current buffer
+command! -nargs=0 Format :call CocAction('format')
+
+" Use `:Fold` for fold current buffer
+command! -nargs=? Fold :call     CocAction('fold', <f-args>)
+
+
+
+
+" Using CocList
+" Show all diagnostics
+nnoremap <silent> <space>a  :<C-u>CocList diagnostics<cr>
+" Manage extensions
+nnoremap <silent> <space>e  :<C-u>CocList extensions<cr>
+" Show commands
+nnoremap <silent> <space>c  :<C-u>CocList commands<cr>
+" Find symbol of current document
+nnoremap <silent> <space>o  :<C-u>CocList outline<cr>
+" Search workspace symbols
+nnoremap <silent> <space>s  :<C-u>CocList -I symbols<cr>
+" Do default action for next item.
+nnoremap <silent> <space>j  :<C-u>CocNext<CR>
+" Do default action for previous item.
+nnoremap <silent> <space>k  :<C-u>CocPrev<CR>
+" Resume latest coc list
+nnoremap <silent> <space>p  :<C-u>CocListResume<CR>
+
+
+" }}}
+
diff --git a/.config/polybar/battery-notify b/.config/polybar/battery-notify
deleted file mode 100755
index 8f972d5..0000000
--- a/.config/polybar/battery-notify
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env bash
-#
-# This script will alert when battery is less than 20% and discharging
-# Created by Daniel Neemann
-
-while :; do
-	n=$(cat /sys/class/power_supply/BAT0/capacity)
-	y=$(cat /sys/class/power_supply/BAT0/status)
-	if [ "$n" -lt "10" ] && [ "$y" = "Discharging" ]; then
-	    notify-send "battery level is low! - $n%"
-	fi
-	sleep 5m
-done
diff --git a/.config/polybar/cmus.sh b/.config/polybar/cmus.sh
deleted file mode 100755
index 4e58498..0000000
--- a/.config/polybar/cmus.sh
+++ /dev/null
@@ -1,40 +0,0 @@
-#!/bin/bash
-
-
-cmusstatus=$(cmus-remote -C status)
-grep position <<< "$cmusstatus" 1>/dev/null 2>&1
-if [ ! $? -eq 0 ]; then exit; fi
-
-prepend_zero () {
-    seq -f "%02g" $1 $1
-}
-
-strindex() { 
-  x="${1%%$2*}"
-  [[ "$x" = "$1" ]] && echo -1 || echo "${#x}"
-}
-
-get_all_but_first() {
-  shift
-  echo "$@"
-}
-
-get_stat() {
-  line=$(grep "$1" -m 1 <<< "$cmusstatus")
-  a=$(strindex "$line" "$1")
-  sub="${line:a}"
-  echo "$(get_all_but_first $sub)"
-}
-
-
-
-position=$(get_stat position)
-minutes1=$(prepend_zero $(($position / 60 )))
-seconds1=$(prepend_zero $(($position % 60)))
-
-duration=$(get_stat duration)
-minutes2=$(prepend_zero $(($position / 60)))
-seconds2=$(prepend_zero $(($duration % 60)))
-
-echo -n " $(cmus-remote -Q | egrep "tag artist|title" | sed 's/tag artist //;s/tag title //' | sed 'N;s/\n/ - /') [$minutes1:$seconds1 / $minutes2:$seconds2]"
-
diff --git a/.config/polybar/config b/.config/polybar/config
deleted file mode 100644
index 1fc5bd8..0000000
--- a/.config/polybar/config
+++ /dev/null
@@ -1,518 +0,0 @@
-;=====================================================
-;
-;   To learn more about how to configure Polybar
-;   go to https://github.com/jaagr/polybar
-;
-;   The README contains alot of information
-;
-;=====================================================
-
-[colors]
-background = ${xrdb:background}
-background-alt = #3c3836
-foreground = ${xrdb:foreground}
-foreground-alt = #555
-primary = #458588
-orange = #d65d0e
-secondary = #689d6a
-alert = ${xrdb:color1}
-
-[bar/example]
-;monitor = ${env:MONITOR:HDMI-1}
-width = 100%
-height = 21
-;offset-x = 3%
-;offset-y = 0
-radius = 1.0
-fixed-center = true
-border-top-size = 10
-border-left-size = 10
-border-right-size = 10
-border-bottom-size = 6
-
-monitor = LVDS
-background = ${colors.background}
-foreground = ${colors.foreground}
-
-;line-size = 2
-;line-color = #FF00FF
-
-;border-size = 0
-border-color = #282828
-
-padding-left = 0
-padding-right = 0
-
-module-margin-left = 1
-module-margin-right = 0
-
-font-0 = curie:pixelsize=10;1
-font-1 = Font Awesome 5 Free:pixelsize=10;3
-font-2 = Font Awesome 5 Free:style=Solid:pixelsize=10;2
-font-3 = Font Awesome 5 Brands:pixelsize=10;3
-font-4 = siji:pixelsize=9;2
-
-modules-left = i3
-modules-center = date
-modules-right = wlan volume battery
-
-tray-position = right
-tray-padding = 2
-;tray-transparent = true
-;tray-background = #0063ff
-
-;wm-restack = i3
-
-;override-redirect = true
-
-;scroll-up = i3wm-wsnext
-;scroll-down = i3wm-wsprev
-
-cursor-click = pointer
-cursor-scroll = ns-resize
-
-;========================================
-
-[module/xwindow]
-type = internal/xwindow
-label = %title:0:30:...%
-
-;========================================
-
-[module/xkeyboard]
-type = internal/xkeyboard
-blacklist-0 = num lock
-
-format-prefix = "  "
-format-prefix-foreground = ${colors.foreground}
-format-prefix-background = ${colors.foreground-alt}
-
-label-layout = " %layout% "
-label-layout-foreground = ${colors.foreground}
-label-layout-background = ${colors.primary}
-
-label-indicator-padding = 1
-label-indicator-margin = 0
-label-indicator-background = ${colors.orange}
-
-;=========================================
-
-[module/filesystem]
-type = internal/fs
-interval = 25
-
-mount-0 = /
-
-label-mounted = %{F#0a81f5}%mountpoint%%{F-}: %percentage_used%%
-label-unmounted = %mountpoint% not mounted
-label-unmounted-foreground = ${colors.foreground-alt}
-
-;=========================================
-;				i3
-;========================================
-
-[module/i3]
-type = internal/i3
-format = <label-state> <label-mode>
-index-sort = true
-wrapping-scroll = false
-
-; Only show workspaces on the same output as the bar (default = false)
-pin-workspaces = true
-
-label-mode-padding = 2
-label-mode-foreground = #000
-label-mode-background = ${colors.primary}
-
-; focused = Active workspace on focused monitor
-label-focused = %icon%
-label-focused-background = ${colors.foreground-alt}
-label-focused-underline = ${colors.primary}
-label-focused-padding = 2
-
-; unfocused = Inactive workspace on any monitor
-label-unfocused = %icon%
-label-unfocused-padding = 2
-
-; visible = Active workspace on unfocused monitor
-label-visible = %icon%
-label-visible-background = ${colors.alert}
-label-visible-underline = ${colors.alert}
-label-visible-padding = 2
-
-; urgent = Workspace with urgency hint set
-label-urgent = %icon%
-label-urgent-background = ${colors.orange}
-label-urgent-padding = 2
-
-fuzzy-match = true
-ws-icon-0 = 1;
-ws-icon-1 = 2;
-ws-icon-2 = 3;
-ws-icon-3 = 4;
-ws-icon-4 = 5;
-ws-icon-5 = 6;
-ws-icon-6 = 7;
-ws-icon-7 = 8;
-ws-icon-8 = 9;
-ws-icon-9 = 0;
-
-;==========================================
-;				MPD
-;========================================
-
-[module/mpd]
-type = internal/mpd
-format-online = <label-song>  <icon-prev> <icon-stop> <toggle> <icon-next>
-
-icon-prev = 
-icon-stop = 
-icon-play = 
-icon-pause = 
-icon-next = 
-
-label-song-maxlen = 25
-label-song-ellipsis = true
-
-;==========================================
-;				XBACKLIGHT
-;========================================
-
-[module/xbacklight]
-type = internal/xbacklight
-
-output = LVDS
-
-format = <label>
-label = Brightness: %percentage%%
-
-bar-width = 10
-bar-indicator = |
-bar-fill = ─
-bar-empty = ─
-
-;==========================================
-;				BACKLIGHT
-;========================================
-
-[module/backlight-acpi]
-inherit = module/xbacklight
-type = internal/backlight
-card = intel_backlight
-
-;==========================================
-;				CPU
-;========================================
-
-[module/cpu]
-type = internal/cpu
-interval = 2
-format-prefix = "  "
-format-prefix-font = 2
-format-prefix-foreground = ${colors.foreground}
-format-prefix-background = ${colors.foreground-alt}
-label = " %percentage:2%% "
-label-background = ${colors.primary}
-
-;==========================================
-;				MEMORY
-;========================================
-
-[module/memory]
-type     = internal/memory
-interval = 3
-
-format           = <label>
-label            = "%percentage_used%%"
-label-background = ${colors.primary}
-label-foreground = ${colors.foreground}
-label-padding    = 1
-
-format-prefix = 
-
-format-prefix-padding    = 1
-format-prefix-background = ${colors.foreground-alt}
-format-prefix-foreground = ${colors.foreground}
-
-;========================================
-;				WLAN
-;========================================
-
-[module/wlan]
-type = internal/network
-interface = wlp6s0
-interval = 1
-label-maxlen = 30
-; Accumulate values from all interfaces
-; when querying for up/downspeed rate
-; Default: false
-accumulate-stats = true
-
-;format-connected = <ramp-signal><label-connected>
-;ramp-signal-0 = " ▁"
-;ramp-signal-1 = " ▂"
-;ramp-signal-2 = " ▃"
-;ramp-signal-3 = " ▄"
-;ramp-signal-4 = " ▅"
-;ramp-signal-5 = " ▆"
-;ramp-signal-background = ${colors.foreground-alt}
-;ramp-signal-foreground = ${colors.foreground}
-
-label-connected  = " %essid% "
-label-connected-background = ${colors.primary}
-format-connected-prefix = "  "
-format-connected-prefix-font = 2
-format-connected-prefix-background    = ${colors.foreground-alt}
-format-connected-background    = ${colors.primary}
-
-format-packetloss = <animation-packetloss> <label-connected>
-animation-packetloss-0 = ⚠
-animation-packetloss-0-foreground = #ffa64c
-animation-packetloss-1 = 📶
-animation-packetloss-1-foreground = #000000
-; Framerate in milliseconds
-animation-packetloss-framerate = 500
-
-
-format-disconnected = <label-disconnected>
-label-disconnected  = " no wifi "
-format-disconnected-prefix = "  "
-format-disconnected-prefix-font = 2
-format-disconnected-prefix-background = ${colors.foreground-alt}
-format-disconnected-prefix-foreground = ${colors.foreground}
-format-disconnected-background = ${colors.alert}
-format-disconnected-foreground = ${colors.foreground-alt}
-
-;========================================
-;				ETH
-;========================================
-
-[module/eth]
-type = internal/network
-interface = wlp6s0
-interval = 3.0
-
-format-connected-font = 0
-format-connected-underline = #55aa55
-format-connected-prefix = " "
-format-connected-prefix-foreground = ${colors.foreground-alt}
-label-connected = %local_ip%
-
-format-disconnected =
-;format-disconnected = <label-disconnected>
-;format-disconnected-underline = ${self.format-connected-underline}
-;label-disconnected = %ifname% disconnected
-;label-disconnected-foreground = ${colors.foreground-alt}
-
-;========================================
-;				DATE
-;========================================
-
-[module/date]
-type = internal/date
-interval = 5
-
-date = " %a, %b %d,"
-date-alt = " %d-%m-%Y |"
-format-background = ${colors.primary}
-format-foreground = ${colors.foreground}
-
-time = "%H:%M "
-time-alt = "%H:%M:%S "
-format-prefix-font = 4
-format-prefix-background = ${colors.foreground-alt}
-format-prefix-foreground = ${colors.foreground}
-format-prefix = "  "
-
-label = %date% %time%
-
-;========================================
-;				VOLUME
-;========================================
-
-[module/volume]
-type = internal/volume
-
-; The line below is to fix an error with the sound (alsamixer), the error is: error: Disabling module "volume" (reason: Cannot find simple element)
-; Ref: https://github.com/jaagr/polybar/issues/491 and https://github.com/jaagr/polybar/wiki/Module:-volume
-master-soundcard=hw:1
-
-format-volume = <ramp-volume><label-volume>
-label-volume = " %percentage%% "
-label-volume-background = ${colors.primary}
-label-volume-foreground = ${colors.foreground}
-label-muted = "  muted "
-label-muted-foreground = ${colors.foreground-alt}
-label-muted-background = ${colors.alert}
-ramp-volume-background = ${colors.foreground-alt}
-ramp-volume-0 = "  "
-ramp-volume-1 = "  "
-ramp-headphones = 
-
-;========================================
-;			  BATTERY
-;========================================
-
-[module/battery]
-type = internal/battery
-battery = BAT0
-adapter = ADP1
-full-at = 98
-
-label-full = " %percentage%% "
-format-full-prefix = "  "
-format-full-background = ${colors.primary}
-format-full-foreground = ${colors.foreground}
-format-full-prefix-foreground = ${colors.foreground}
-format-full-prefix-background = ${colors.orange}
-
-format-discharging = <ramp-capacity><label-discharging>
-label-discharging = " %percentage%% "
-label-discharging-foreground = ${colors.foreground}
-label-discharging-background = ${colors.primary}
-
-; power symbol
-;ramp-capacity-0 = "  "
-
-ramp-capacity-0 = "  "
-ramp-capacity-0-background = ${colors.alert}
-ramp-capacity-1 = "  "
-ramp-capacity-2 = "  "
-ramp-capacity-3 = "  "
-ramp-capacity-4 = "  "
-ramp-capacity-foreground = ${colors.foreground}
-ramp-capacity-background = ${colors.foreground-alt}
-
-format-charging = <animation-charging><label-charging>
-label-charging = " %percentage%% "
-label-charging-foreground = ${colors.foreground}
-label-charging-background = ${colors.primary}
-
-animation-charging-0 = "  "
-animation-charging-1 = "  "
-animation-charging-2 = "  "
-animation-charging-3 = "  "
-animation-charging-4 = "  "
-animation-charging-foreground = ${colors.foreground}
-animation-charging-background = ${colors.foreground-alt}
-animation-charging-framerate = 750
-
-;========================================
-;			  TEMP
-;========================================
-
-[module/temperature]
-type = internal/temperature
-thermal-zone = 0
-
-warn-temperature = 60
-format-warn = <ramp><label-warn>
-label-warn = " %temperature% "
-label-warn-foreground = ${colors.foreground}
-label-warn-background = ${colors.primary}
-
-format = <ramp><label>
-label = " %temperature% "
-
-ramp-font = 2
-ramp-0 = "  "
-ramp-1 = "  "
-ramp-2 = "  "
-ramp-foreground = ${colors.foreground}
-ramp-background = ${colors.foreground-alt}
-
-;========================================
-;			POWERMENU
-;========================================
-[module/powermenu]
-type = custom/menu
-
-expand-right = true
-
-format-spacing = 1
-
-label-open = "  "
-label-open-font = 2
-label-open-foreground = ${colors.foreground}
-label-open-background = ${colors.foreground-alt}
-label-close =  cancel
-label-close-foreground = ${colors.secondary}
-label-separator = |
-label-separator-foreground = ${colors.foreground-alt}
-
-menu-0-0 =  reboot
-menu-0-0-exec = menu-open-1
-menu-0-1 =  power off
-menu-0-1-exec = menu-open-2
-
-menu-1-0 = cancel
-menu-1-0-exec = menu-open-0
-menu-1-1 = reboot
-menu-1-1-exec = sudo reboot
-
-menu-2-0 = power off
-menu-2-0-exec = sudo poweroff
-menu-2-1 = cancel
-menu-2-1-exec = menu-open-0
-
-;=========================================
-;			VOID UPDATES
-;=========================================
-[module/updates-available]
-type = custom/script
-exec = $HOME/.config/polybar/updates.sh
-click-left = urxvt -e sudo xbps-install -Su
-format = <label>
-format-background = ${colors.primary}
-format-foreground = ${colors.foreground-alt}
-format-padding = 1
-interval = 300
-
-;=========================================
-;			REDSHIFT-STATUS
-;=========================================
-[module/redshift-info]
-type = custom/script
-format = <label>
-format-background = ${colors.primary}
-format-foreground = ${colors.foreground-alt}
-format-padding = 1
-#exec = $HOME/.config/polybar/redshift.sh
-exec = $HOME/bin/redshift-status
-interval = 5
-
-;=========================================
-;			BATTERY-NOTIFY
-;=========================================
-[module/battery-notify]
-type = custom/script
-exec = ~/.config/polybar/battery-notify
-interval = 10
-
-;========================================
-;			CMUS
-;========================================
-[module/cmus]
-type = custom/script
-
-exec = bash ~/.config/polybar/cmus.sh
-exec-if = pgrep -x cmus
-format-prefix = ""
-
-interval = 1
-
-click-left = cmus-remote --pause
-click-right = cmus-remote --stop
-
-format = <label>
-format-underline = ${colors.primary}
-label = %output%
-
-;=======================================
-;			USB Drivers
-;=======================================
-[module/usb]
-type = custom/script
-
-exec = bash ~/.config/polybar/system-usb-udev.sh
-interval = 1
diff --git a/.config/polybar/launch.sh b/.config/polybar/launch.sh
deleted file mode 100755
index d2bf171..0000000
--- a/.config/polybar/launch.sh
+++ /dev/null
@@ -1,13 +0,0 @@
-#!/usr/bin/env sh
-
-# Terminate already running bar instances
-killall -q polybar
-
-# Wait until the processes have been shut down
-while pgrep -u $UID -x polybar >/dev/null; do sleep 1; done
-
-# Launch bar1 and bar2
-polybar example -r &
-
-
-echo "Bars launched..."
diff --git a/.config/polybar/redshift.sh b/.config/polybar/redshift.sh
deleted file mode 100755
index 03b668b..0000000
--- a/.config/polybar/redshift.sh
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/bash
-
-if [ "$(pgrep -x redshift)" ]; then
-    temp=$(redshift -p 2> /dev/null | grep temp | cut -d ":" -f 2 | tr -dc "[:digit:]")
-
-    if [ -z "$temp" ]; then
-        echo "%{F#65737E} #"
-    elif [ "$temp" -ge 5000 ]; then
-        echo "%{F#8FA1B3} #"
-    elif [ "$temp" -ge 4000 ]; then
-        echo "%{F#EBCB8B} #"
-    else
-        echo "%{F#D08770} #"
-    fi
-fi
diff --git a/.config/polybar/system-usb-udev.sh b/.config/polybar/system-usb-udev.sh
deleted file mode 100755
index 05f60b5..0000000
--- a/.config/polybar/system-usb-udev.sh
+++ /dev/null
@@ -1,87 +0,0 @@
-#!/bin/sh
-
-usb_print() {
-    devices=$(lsblk -Jplno NAME,TYPE,RM,SIZE,MOUNTPOINT,VENDOR)
-    output=""
-    counter=0
-
-    for unmounted in $(echo "$devices" | jq -r '.blockdevices[]  | select(.type == "part") | select(.rm == "1") | select(.mountpoint == null) | .name'); do
-        unmounted=$(echo "$unmounted" | tr -d "[:digit:]")
-        unmounted=$(echo "$devices" | jq -r '.blockdevices[]  | select(.name == "'"$unmounted"'") | .vendor')
-        unmounted=$(echo "$unmounted" | tr -d ' ')
-
-        if [ $counter -eq 0 ]; then
-            space=""
-        else
-            space="   "
-        fi
-        counter=$((counter + 1))
-
-        output="$output$space#1 $unmounted"
-    done
-
-    for mounted in $(echo "$devices" | jq -r '.blockdevices[] | select(.type == "part") | select(.rm == "1") | select(.mountpoint != null) | .size'); do
-        if [ $counter -eq 0 ]; then
-            space=""
-        else
-            space="   "
-        fi
-        counter=$((counter + 1))
-
-        output="$output$space#2 $mounted"
-    done
-
-    echo "$output"
-}
-
-usb_update() {
-    pid=$(pgrep -xf "/bin/sh /home/user/.config/polybar/system-usb-udev.sh")
-
-    if [ "$pid" != "" ]; then
-        kill -10 "$pid"
-    fi
-}
-
-case "$1" in
-    --update)
-        usb_update
-        ;;
-    --mount)
-        devices=$(lsblk -Jplno NAME,TYPE,RM,MOUNTPOINT)
-
-        for mount in $(echo "$devices" | jq -r '.blockdevices[]  | select(.type == "part") | select(.rm == "1") | select(.mountpoint == null) | .name'); do
-            # udisksctl mount --no-user-interaction -b "$mount"
-
-            # mountpoint=$(udisksctl mount --no-user-interaction -b $mount)
-            # mountpoint=$(echo $mountpoint | cut -d " " -f 4 | tr -d ".")
-            # terminal -e "bash -lc 'filemanager $mountpoint'"
-
-            mountpoint=$(udisksctl mount --no-user-interaction -b "$mount")
-            mountpoint=$(echo "$mountpoint" | cut -d " " -f 4 | tr -d ".")
-            termite -e "bash -lc 'mc $mountpoint'" &
-        done
-
-        usb_update
-        ;;
-    --unmount)
-        devices=$(lsblk -Jplno NAME,TYPE,RM,MOUNTPOINT)
-
-        for unmount in $(echo "$devices" | jq -r '.blockdevices[]  | select(.type == "part") | select(.rm == "1") | select(.mountpoint != null) | .name'); do
-            udisksctl unmount --no-user-interaction -b "$unmount"
-            udisksctl power-off --no-user-interaction -b "$unmount"
-        done
-
-        usb_update
-        ;;
-    *)
-        trap exit INT
-        trap "echo" USR1
-
-        while true; do
-            usb_print
-
-            sleep 60 &
-            wait
-        done
-        ;;
-esac
diff --git a/.config/polybar/updates.sh b/.config/polybar/updates.sh
deleted file mode 100755
index 3d67f4d..0000000
--- a/.config/polybar/updates.sh
+++ /dev/null
@@ -1,18 +0,0 @@
-#!/usr/bin/env bash
-
-#updates=$(xbps-install --update --dry-run --sync | wc -l)
-#if [ "$updates" -gt 0 ]; then
-#    echo "# $updates"
-#else
-#    echo ""
-#fi
-
-
-updates=$(xbps-install --update --dry-run --sync | wc -l)
-warning_color='#ff5555'
-
-if [ "$updates" -eq 0 ]; then
-	echo ""
-else
-	echo "%{F${warning_color}}%{F-} ${updates}"
-fi
diff --git a/.config/sxhkd/sxhkdrc b/.config/sxhkd/sxhkdrc
deleted file mode 100644
index dace6e8..0000000
--- a/.config/sxhkd/sxhkdrc
+++ /dev/null
@@ -1,206 +0,0 @@
-# wm independent hotkeys {{{
-
-# terminal emulator
-super + Return
-	st -g 130x40
-
-# program launcher
-super + d
-	dmenu_run -i -l 3 -fn 'iosevka Nerd Font:size=11' -p ' Search  ' -nb '#2f343f' -nf '#e7e8eb' -sb '#81A1C1' -sf '#2f343f'
-
-# make sxhkd reload its configuration files:
-super + shift + c
-	pkill -USR1 -x sxhkd
-
-# }}}
-# bspwm hotkeys {{{
-
-# quit bspwm normally
-super + alt + Escape
-	bspc quit
-
-# close and kill
-super + {_,shift + }q
-	bspc node -{c,k}
-
-# alternate between the tiled and monocle layout
-#super + m
-	#bspc desktop -l next
-
-# send the newest marked node to the newest preselected node
-super + y
-	bspc node newest.marked.local -n newest.!automatic.local
-
-# swap the current node and the biggest node
-super + g
-	bspc node -s biggest
-
-# }}}
-# state/flags {{{
-
-# set the window state
-super + {t,shift + t,@space,f}
-    bspc node -t {tiled,pseudo_tiled,floating,fullscreen}
-
-# set the node flags
-super + ctrl + {m,x,y,z}
-    bspc node -g {marked,locked,sticky,private}
-
-# }}}
-# focus/swap {{{
-
-# focus the node in the given direction
-super + {_,shift + }{h,j,k,l}
-	bspc node -{f,s} {west,south,north,east}
-
-# focus the next/previous node in the current desktop (similar to super + tab but on the same workspace)
-#super + {_,shift + }c
-	#bspc node -f {next,prev}.local
-
-# focus the next/previous desktop in the current monitor
-super + bracket{left,right}
-	bspc desktop -f {prev.local,next.local}
-
-# focus the last node/desktop
-super + {grave,Tab}
-	bspc {node,desktop} -f last
-
-# focus the older or newer node in the focus history
-super + {o,i}
-	bspc wm -h off; \
-	bspc node {older,newer} -f; \
-	bspc wm -h on
-
-# focus or send to the given desktop
-super + {_,shift + }{1-9,0}
-	bspc {desktop -f,node -d} '^{1-9,10}'
-
-# }}}
-# preselect {{{
-
-# preselect the direction
-super + ctrl + {h,j,k,l}
-	bspc node -p {west,south,north,east}
-
-# preselect the ratio
-super + ctrl + {1-9}
-	bspc node -o 0.{1-9}
-
-# cancel the preselection for the focused node
-super + ctrl + space
-	bspc node -p cancel
-
-# cancel the preselection for the focused desktop
-super + ctrl + shift + space
-	bspc query -N -d | xargs -I id -n 1 bspc node id -p cancel
-
-# }}}
-# move/resize {{{
-
-# expand a window by moving one of its side outward
-super + alt + {h,j,k,l}
-	bspc node -z {left -20 0,bottom 0 20,top 0 -20,right 20 0}
-
-# contract a window by moving one of its side inward
-super + alt + shift + {h,j,k,l}
-	bspc node -z {right -20 0,top 0 20,bottom 0 -20,left 20 0}
-
-# move a floating window
-super + {Left,Down,Up,Right}
-	bspc node -v {-20 0,0 20,0 -20,20 0}
-
-# }}}
-
-##########################
-# User bindings
-##########################
-
-# Letter keybindings {{{
-# Open st with tmux
-super + shift + Return
-    st -e tmux new-session -s main
-
-# Reload bspwm
-super + F5
-    $HOME/.config/bspwm/bspwmrc
-
-# cmus-status script
-super + c
-    $HOME/bin/cmus-status
-
-## Browser and Telegram
-super + shift + {b, t}
-    {$BROWSER 2>&-, Telegram 2>&-}
-
-# Reboot system
-super + shift + BackSpace
-    $HOME/bin/prompt "Are you sure you want to reboot?" "sudo reboot"
-
-# Screenshot (copying to clipboard)
-super + {s, shift + s}
-    {scrot -e 'xclip -selection clipboard -t image/png $f && rm -f $f', scrot -se 'xclip -selection clipboard -t image/png $f && rm -f $f'}
-
-# Screenshot (saving to some directory)
-super + {Print, shift + Print}
-    {scrot -e 'mv $f ~/Pictures/scrot' && sleep 1 && exec notify-send 'screenshot has been saved in ~/Pictures/scrot', scrot -se 'mv $f ~/Pictures/scrot/' && sleep 1 && exec notify-send 'screenshot has been saved in ~/Pictures/scrot'}
-
-# Open ranger/ranger with sudo
-super + {r, shift + r}
-    {st -n ranger -c ranger -e ranger, st -n ranger -c ranger -e sudo ranger}
-
-# Open Neomutt/Newsboat
-super + {n, shift + n}
-    {st -n neomutt -c neomutt -e neomutt, st -n newsboat -c newsboat -e newsboat}
-
-# Weechat/dmoji script
-super + {w, shift + w}
-    {st -n weechat -c weechat -e weechat-curses, $HOME/bin/dmoji}
-
-# Turn off the sound and stop cmus/shutdown computer
-super + {x, shift + x}
-    {amixer sset Master mute ; $HOME/.config/i3/locki3.sh, $HOME/bin/prompt "Are you sure you want to shutdown?" "sudo poweroff -h now"}
-
-# Record the screen/Stop recording the scren
-alt + {r, shift + r}
-    {$HOME/bin/record-slop, killall ffmpeg && notify-send "FFmpeg" "Gravação da tela finalizada!"}
-
-super + u
-    scratchtermtoggle
-
-# When you're watching educational videos and someone comes up to you:
-# It mutes your sound, goes to another workspace with vim and zathura opened to pretend you are doing something useful
-super + shift + Delete
-    amixer sset Master mute ; bspc desktop -f '^8' ; st -e vim ~/.vimrc ; zathura $HOME/Documents/library/Linux/Guia\ Foca\ Linux\ -\ Intermediário.pdf
-
-# }}}
-# Media {{{
-
-# Mute sound
-super + F8
-    amixer sset Master toggle
-
-# Conflited binding
-super + m
-    tmux new-window -t main cmus
-
-# Deprecated (fucking scratchpad on bspwm)
-super + shift + m
-    tmux split-window -t main -v && tmux send-keys -t main 'cmus-lyrics | less' 'Enter'
-
-# Play/Pause a song on cmus
-super + {p, shift + p}
-    cmus-remote {--play, --pause}
-
-# Increase/dicrease sound
-super + {minus, equal}
-    amixer sset Master 2%{-,+}
-
-# Increase a lot the sound
-super + shift + {minus, equal}
-    amixer sset Master 5%{-,+}
-
-# {Previous,Next} music
-super + {comma, period}
-    cmus-remote {--prev, --next} && pkill dunst && cmus-status
-
-# }}}
diff --git a/.config/sxiv/exec/key-handler b/.config/sxiv/exec/key-handler
deleted file mode 100755
index 226e015..0000000
--- a/.config/sxiv/exec/key-handler
+++ /dev/null
@@ -1,16 +0,0 @@
-#!/bin/sh
-while read file
-do
-        case "$1" in
-        "C-d")
-                mv "$file" ~/.local/share/Trash/ ;;
-        "C-r")
-                convert -rotate 90 "$file" "$file" ;;
-        "C-c")
-                echo -n "$file" | xclip -selection clipboard ;;
-        "C-w")
-                setroot -f "$file" ;;
-        "C-m")
-                mv "$file" ~/Pictures/Wallpapers/ ;;
-        esac
-done
diff --git a/.gitconfig b/.gitconfig
index c9d77e5..127e3e2 100644
--- a/.gitconfig
+++ b/.gitconfig
@@ -2,17 +2,42 @@
     email = leonardof@tutanota.com
     name = Leonardo F.
 [core]
-    editor = vim
+    editor = nvim
+    pager = less -#2 -N -S
+
 [merge]
     tool = vimdiff
+[mergetool]
+    prompt = true
+
+[branch]
+  autosetuprebase = always # 'git pull' irá dar rebase ao invés de merge
+
 [alias]
     s = status
     p = push
     cm = commit -m
-    hist = log --pretty=format:\"%h %ad | %s%d [%an]\" --graph --date=short
-    hist1 = log --pretty=format:"%C(yellow)%h%Cred%d\\ %Creset%s%Cblue\\ [%cn]" --decorate
-    aliases = config --get-regexp alias
+    full-log = log --stat --decorate --source -p
+    histg = log --graph --pretty=format:'%C(yellow)%h%C(bold white red)%d%Creset %s %C(bold green)%cr %Creset%C(white)%an' --abbrev-commit --date=relative
+    date-log = log --pretty=format:'%C(yellow)%h%C(reset) - %an [%C(green)%ar%C(reset)] %s'
+    aliases = git config -l | grep alias | cut -c 7-
+    unstage = reset
+    uncommit = reset --soft HEAD^
+
+    # https://www.christianengvall.se/untrack-files-local-repository-keep-origin-git/
+    assume-unchanged = update-index --assume-unchanged
+
+    diff = diff --ignore-space-at-eol -b -w --ignore-blank-lines
+    update = !git fetch upstream && git rebase upstream/`git rev-parse --abbrev-ref HEAD`
+
 [difftool]
     prompt = false
 [diff]
     tool = vimdiff
+
+[push]
+    default = current # Push irá enviar o branch atual e cria no remote caso não exista
+
+[apply]
+    whitespace = nowarn # Não notificar sobre espaço em branco faltando no EOF
+
diff --git a/.mkshrc b/.mkshrc
deleted file mode 100644
index 96ddb97..0000000
--- a/.mkshrc
+++ /dev/null
@@ -1,75 +0,0 @@
-#!/bin/mksh
-
-bind ^L=clear-screen
-bind ^K=up-history
-bind ^J=down-history
-umask 077
-
-PS1='$(pwd | sed "s,^$HOME,~,") $(print "\033[0;36m$\033[00m") '
-
-HISTSIZE=256
-HISTFILE=/tmp/.`id -nu`-history
-
-export SHELL=/bin/mksh
-export PAGER=less
-export EDITOR=vim
-export BROWSER=palemoon
-export BROWSERCLI=w3m
-export READER=zathura
-export IMAGEVIEWER=sxiv
-export VIDEOPLAYER=mpv
-export PATH=$PATH:$HOME/bin:$HOME/bin/ascii:/opt/altera/12.1sp1/quartus/bin/:/opt/altera/10.1sp1/modelsim_ase/linuxaloem/
-
-alias c=clear
-alias e="$EDITOR"
-alias ..="cd .."
-alias which='command -v'
-alias xmo='xmodmap ~/.Xmodmap'
-alias kpcli='kpcli --kdb $HOME/syncthing/keepass/keypass.kdb'
-alias dotfiles="/usr/bin/git --git-dir=$HOME/dotfiles/ --work-tree=$HOME"
-chaturbate(){ mpv --ytdl-format=slow-2 "$@" ;}
-
-'!!'() {
-	echo "$(history -1 | grep -oP "(?<=\t).*$")"
-	$(history -1 | grep -oP "(?<=\t).*$")
-}
-
-# ix.io - txt file upload
-ix() {
-    curl -sF f:1='<-' ix.io < "$*"
-}
-
-# iotek - txt file upload
-io(){
-    curl -sT- https://p.iotek.org < "$*"
-}
-
-### uguu - txt/images upload only for 24 hours
-uguu () {
-    for i in $*; do
-        curl -i -F file=@"$i" https://uguu.se/api.php?d=upload-tool | grep https
-    done
-}
-
-fuwa() {
-    for i in "$@"; do
-        curl -s -F file=@$i} https://fuwa.se/api/upload
-    done
-}
-
-### mixtape - txt/image upload up to 100MB
-mix() {
-    for i in "$@"; do
-        curl -sf -F files[]=$i https://mixtape.moe/upload.php
-    done
-}
-
-# anonfile - any file upload up to 10gb (this site is like transfer.sh) - the link is a download link
-anon() {
-    for i in "$@"; do
-        curl -F document=@$i https://anonfiles.cc/api/upload
-    done
-}
-
-source "$HOME/.vim/gruvbox_256palette.sh"
-#source $HOME/.aliases
diff --git a/.newsboat/.gitignore b/.newsboat/.gitignore
deleted file mode 100644
index 318073e..0000000
--- a/.newsboat/.gitignore
+++ /dev/null
@@ -1,2 +0,0 @@
-cache.db
-cache.db.lock
diff --git a/.newsboat/config b/.newsboat/config
deleted file mode 100644
index 4117a69..0000000
--- a/.newsboat/config
+++ /dev/null
@@ -1,116 +0,0 @@
-# Settings ======================{{{
-
-#notify-xterm yes
-
-# Reload automaticaly on start up
-#auto-reload yes
-reload-time 30
-#reload-only-visible-feeds yes
-#suppress-first-reload yes
-#refresh-on-startup no
-user-agent "Liferea/1.4.14 (Linux; en_US.UTF8; http://liferea.sf.net/)"
-
-external-url-viewer "urlview"
-
-# Define sort by date (asc: newers on top)
-article-sort-order date-asc
-
-# Confirm quit in main view
-confirm-exit yes
-
-# Define default browser
-browser $BROWSER
-#download-full-page yes		# for feeds with link only then dl full page
-download-retries 4
-download-timeout 60
-save-path ~/Downloads
-feedlist-format " %n %4i %11u %t -- %T"
-articlelist-format  "%4i %f %D   %?T? -- %-17T --  ?%t"
-notify-format       "%d new articles (%n unread articles, %f unread feeds)"
-show-read-feeds no
-show-read-articles no
-notify-program      "/usr/bin/notify-send"
-#goto-next-feed no
-#max-items 500
-#refresh-on-startup no
-#text-width 72
-#prepopulate-query-feeds yes
-
-# }}}
-# Hotkey ========================{{{
-
-# vim like navigation
-bind-key j down
-bind-key k up
-bind-key m toggle-show-read-feeds
-bind-key ^D pagedown
-bind-key ^U pageup
-bind-key / open-search tagselection
-bind-key U show-urls
-
-bind-key i sort
-bind-key I rev-sort
-
-bind-key g home all
-bind-key G end all
-
-unbind-key l
-bind-key l open
-bind-key h quit
-bind-key ESC hard-quit
-
-# use macro prefix key ( default: , )
-
-# Open image with feh
-macro i set browser "$IMAGEVIEWER %u"; open-in-browser ; set browser "$BROWSER %u"
-
-macro m set browser "mpv %u"; open-in-browser ; set browser "$BROWSER %u"
-
-# open in cli web browser
-# w3m: https://www.youtube.com/watch?v=Z22cFTB-uqg
-# tmux: https://www.youtube.com/watch?v=ZNM1KfqpyGo
-# macro o set browser "$BROWSERCLI %u"; open-in-browser ; set browser "$BROWSER %u"
-#macro o set browser "tmux split-window && tmux send-keys '$BROWSERCLI %u && tmux kill-pane\n'"; open-in-browser ; set browser "$BROWSER %u"
-macro o set browser "tmux split-window && tmux send-keys '$BROWSER %u\n'"; open-in-browser ; set browser "$BROWSER %u"
-
-macro r set browser "tmux split-window && tmux send-keys 'rtv %u\n'"; open-in-browser ; set browser "$BROWSER %u"
-
-# add video or audio to play queue using mpv (requires: task-spooler, mpv, youtube-dl)
-# task-spooler: https://www.youtube.com/watch?v=wv8D8wT20ZY
-# youtube-dl: https://www.youtube.com/watch?v=MFxlwVhwayg
-#macro p set browser "tsp mpv --ontop --no-border --force-window --autofit=500x280 --geometry=-15-10 %u"; open-in-browser ; set browser "$BROWSER %u"
-macro p set browser "mpv --ontop --no-border --force-window --autofit=500x280 --geometry=-15-10 %u"; open-in-browser ; set browser "$BROWSER %u"
-
-# Ref: https://github.com/LukeSmithxyz/voidrice/blob/master/.newsboat/config#L36
-macro d set browser "dmenuhandler"; open-in-browser ; set browser linkhandler
-
-#}}}
-# Colors ========================{{{
-
-highlight feedlist    "^  *[0-9]+  *N  "                    color156 default
-highlight articlelist "^  *[0-9]+  *N  "                    color156 default
-
-highlight article     "(^Feed:.*|^Title:.*|^Author:.*)"     color75  default
-highlight article     "(^Link:.*|^Date:.*)"                 color75  default
-highlight article     "^Podcast Download URL:.*"            color71  default
-highlight article     "^Links:"                             white    color240 underline
-highlight article     "\\[[0-9][0-9]*\\]"                   color72  default  bold
-highlight article     "\\[image [0-9][0-9]*\\]"             color72  default  bold
-highlight article     "\\[embedded flash: [0-9][0-9]*\\]"   color72  default  bold
-highlight article     ":.*\\(link\\)$"                      color74  default
-highlight article     ":.*\\(image\\)$"                     color74  default
-highlight article     ":.*\\(embedded flash\\)$"            color74  default
-
-color listnormal_unread										default  default
-color listfocus_unread										default  color240 bold
-color listnormal                                            color7   default
-color listfocus                                             default  color240 bold
-color info                                                  color15  color241
-
-# }}}
-# Surfraw bookmarks ============={{{
-
-# references: https://newsbeuter.wordpress.com/2007/08/27/bookmarking/
-bookmark-cmd "~/bin/newsboat_bookmarks_surfraw"
-
-# }}}
diff --git a/.newsboat/history.cmdline b/.newsboat/history.cmdline
deleted file mode 100644
index e69de29..0000000
diff --git a/.newsboat/history.search b/.newsboat/history.search
deleted file mode 100644
index e69de29..0000000
diff --git a/.newsboat/queue b/.newsboat/queue
deleted file mode 100644
index e69de29..0000000
diff --git a/.newsboat/urls b/.newsboat/urls
deleted file mode 100644
index 2ef39b9..0000000
--- a/.newsboat/urls
+++ /dev/null
@@ -1,147 +0,0 @@
-# Query Feeds ==========={{{
-
-# http://www.offensivethinking.org/blog/2009/05/12/efficient-rss-reading.html
-# https://github.com/gpakosz/.newsbeuter/blob/master/urls
-# http://www.newsbeuter.org/doc/newsbeuter.html#_query_feeds
-# query:<name of feed>:<filter expression> [<tag> ...]
-
-"query:All Unread Articles:unread = \"yes\""
-"query:All Articles Linux:tags # \"Linux\"" "Linux"
-"query:All Articles Linux-CLI:tags # \"Linux-CLI\"" "Linux-CLI"
-"query:All Articles Video-Linux:tags # \"Video-Linux\"" "Video-Linux"
-"query:All Articles Linux-Subreddit:tags # \"Linux-Subreddit\"" "Linux-Subreddit"
-"query:All Articles News:tags # \"News\"" "News"
-"query:All Articles YouTube:tags # \"YouTube\"" "YouTube"
-"query:All Articles Video-English:tags # \"Video-English\"" "Video-English"
-
-# }}}
-http://www.mairovergara.com/feed "Blog" "~Mairo Vergara"
-# News =================={{{
-
-http://feeds.bbci.co.uk/news/rss.xml "News" "~BBC"
-http://g1.globo.com/dynamo/rss2.xml "News"
-http://pox.globo.com/rss/g1/tecnologia/ "Tech News"
-https://feeds2.feedburner.com/canaltechbr "Tech News"
-https://rss.tecmundo.com.br/feed "Tech News" "~TecMundo"
-
-# }}}
-# Reddit ================{{{
-
-https://www.reddit.com/r/commandline/.rss "Linux-Subreddit" "~/r/commandline"
-https://www.reddit.com/r/AskProgramming/.rss "Linux-Subreddit" "~/r/AskProgramming"
-https://www.reddit.com/r/C_Programming/.rss "Linux-Subreddit" "~/r/C_Programming"
-https://www.reddit.com/r/learnprogramming/.rss "Linux-Subreddit" "~/r/learnprogramming"
-https://www.reddit.com/r/linux/.rss "Linux-Subreddit" "~/r/linux"
-https://www.reddit.com/r/linux4noobs/.rss "Linux-Subreddit" "~/r/linux4noobs"
-https://www.reddit.com/r/OutOfTheLoop/.rss "Linux-Subreddit" "~/r/OutOfTheLoop"
-https://www.reddit.com/r/programming/.rss "Linux-Subreddit" "~/r/Programming"
-https://www.reddit.com/r/tmux/.rss "Linux-Subreddit" "~/r/tmux"
-https://www.reddit.com/r/LinuxActionShow/.rss "Linux-Subreddit" "~/r/LinuxActionShow"
-https://www.reddit.com/r/unixporn/.rss "Linux-Subreddit" "~/r/Unixporn"
-https://www.reddit.com/r/gnu/.rss "Linux-Subreddit" "~/r/gnu"
-https://www.reddit.com/r/archlinux/.rss "Linux-Subreddit" "~/r/ArchLinux"
-https://www.reddit.com/r/linux_devices/.rss "Linux-Subreddit" "~/r/Linux_devices"
-https://www.reddit.com/r/UnixProTips/.rss "Linux-Subreddit" "~/r/UnixProTips"
-https://www.reddit.com/r/zsh/.rss "Linux-Subreddit" "~/r/zsh"
-https://www.reddit.com/r/urxvt/.rss "Linux-Subreddit" "~/r/urxvt"
-https://www.reddit.com/r/bash/.rss "Linux-Subreddit" "~/r/bash"
-https://www.reddit.com/r/ScriptSwap/.rss "Linux-Subreddit" "~/r/ScriptSwap"
-https://www.reddit.com/r/vim/.rss "Linux-Subreddit" "~/r/vim"
-https://www.reddit.com/r/vim_magic/.rss "Linux-Subreddit" "~/r/vim_magic"
-https://www.reddit.com/r/vimplugins/.rss "Linux-Subreddit" "~/r/vim_plugins"
-https://www.reddit.com/r/linuxprojects/.rss "Linux-Subreddit" "~/r/linuxprojects"
-https://www.reddit.com/r/usefulscripts/.rss "Linux-Subreddit" "~/r/usefulscripts"
-https://www.reddit.com/r/i3wm/.rss "Linux-Subreddit" "~/r/i3wm"
-https://www.reddit.com/r/debian/.rss "Linux-Subreddit" "~/r/debian"
-https://www.reddit.com/r/opensource/.rss "Linux-Subreddit" "~/r/opensource"
-https://www.reddit.com/r/xubuntu/.rss "Linux-Subreddit" "~/r/xubuntu"
-https://www.reddit.com/r/xfce/.rss "Linux-Subreddit" "~/r/xfce"
-https://www.reddit.com/r/coolgithubprojects/.rss "Linux-Subreddit" "~/r/coolgithubprojects"
-https://www.reddit.com/r/selfhosted/.rss "Linux-Subreddit" "~/r/selfhosted"
-
-# }}}
-# Youtube ==============={{{
-# How to get youtube rss feeds:
-# https://www.youtube.com/feeds/videos.xml?channel_id=YOUR_CHANNEL_ID
-
-
-https://www.youtube.com/feeds/videos.xml?channel_id=UCrWvhVmt0Qac3HgsjQK62FQ "YouTube" "~Curso em video"
-https://www.youtube.com/feeds/videos.xml?channel_id=UC-NwgkrLPYmzM-xoLr2GX-Q "YouTube" "~Ideias Radicais"
-https://www.youtube.com/feeds/videos.xml?channel_id=UCuQ8zW9VmVyml7KytSqJDzg "YouTube" "~Papo Binario"
-https://www.youtube.com/feeds/videos.xml?channel_id=UCGObNjkNjo1OUPLlm8BTb3A "YouTube" "~Fabrica de Noobs"
-
-# }}}
-# Video-English ========={{{
-
-https://www.youtube.com/feeds/videos.xml?channel_id=UCGxIAAnrhkCy6H2DRz-t6Qw "Video-English" "~Tim Explica"
-https://www.youtube.com/feeds/videos.xml?channel_id=UCskEPRzGlsYHs_a5SJyCXag "Video-English" "~SmallAdventages"
-https://www.youtube.com/feeds/videos.xml?user=MairoVergara "Video-English" "~Mairo Vergara"
-https://www.youtube.com/feeds/videos.xml?user=MrTeacherPaulo "Video-English" "~MrTeacher Paulo"
-
-# }}}
-# Video-Linux ==========={{{
-
-https://www.youtube.com/feeds/videos.xml?channel_id=UCkf4VIqu3Acnfzuk3kRIFwA "Video-Linux" "~Gotbletu"
-https://www.youtube.com/feeds/videos.xml?channel_id=UCEf5U1dB5a2e2S-XUlnhxSA "Video-Linux" "~Diolinux"
-https://www.youtube.com/feeds/videos.xml?channel_id=UCkK9UDm_ZNrq_rIXCz3xCGA "Video-Linux" "~Brian Landuke"
-https://www.youtube.com/feeds/videos.xml?channel_id=UCxQKHvKbmSzGMvUrVtJYnUA "Video-Linux" "~LearnLinux.tv"
-https://www.youtube.com/feeds/videos.xml?channel_id=UC2eYFnH61tmytImy1mTYvhA "Video-Linux" "~Luke Smith"
-https://www.youtube.com/feeds/videos.xml?user=Ubiquitous1980 "Video-Linux" "~NixUser1980"
-https://www.youtube.com/feeds/videos.xml?user=sabiddle "Video-Linux" "~Shawn Biddle"
-https://www.youtube.com/feeds/videos.xml?user=MinuteVimTricks "Video-Linux" "~Minute Vim Tricks"
-https://www.youtube.com/feeds/videos.xml?user=muktware "Video-Linux" "~Swapnil Bhartiya"
-https://www.youtube.com/feeds/videos.xml?user=GamesOpenSource "Video-Linux" "~Open Source Games"
-https://www.youtube.com/feeds/videos.xml?user=quidsup "Video-Linux" "~quidsup"
-https://www.youtube.com/feeds/videos.xml?user=yuejdesigner85 "Video-Linux" "~fuzicast"
-https://www.youtube.com/feeds/videos.xml?user=tuxreviews "Video-Linux" "~The Linux Gamer"
-https://www.youtube.com/feeds/videos.xml?user=sneekylinux "Video-Linux" "~sneeklinux"
-https://www.youtube.com/feeds/videos.xml?user=connermcd "Video-Linux" "~Conner McDaniel"
-http://vimcasts.org/feeds/ogg "Video-Linux" "~Vimcasts"
-
-# }}}
-# Linux-CLI ============={{{
-
-http://feeds2.feedburner.com/Command-line-fu "Linux-CLI" "~Command Line Fu"
-http://vi.stackexchange.com/feeds "Linux-CLI" "~StackExchange: vim"
-http://unix.stackexchange.com/feeds/tag/zsh "Linux-CLI" "~StackExchange: zsh"
-http://feeds.pinboard.in/rss/t:bash/ "Linux-CLI" "~Pinboard: bash"
-http://feeds.pinboard.in/rss/t:zsh/ "Linux-CLI" "~Pinboard: zsh"
-http://feeds.pinboard.in/rss/t:mksh/ "Linux-CLI" "~Pinboard: mksh"
-http://feeds.pinboard.in/rss/t:tmux/ "Linux-CLI" "~Pinboard: tmux"
-http://www.pgrs.net/feed/ "Linux-CLI"
-https://sanctum.geek.nz/arabesque/feed/ "Linux-CLI"
-http://www.catonmat.net/feed/ "Linux-CLI"
-https://bbs.archlinux.org/extern.php?action=feed&tid=213092&type=atom "Linux-CLI" "~Arch Linux Forum: w3m tip tricks"
-https://bbs.archlinux.org/extern.php?action=feed&tid=93025&type=atom "Linux-CLI" "~Arch Linux Forum: Ranger"
-https://bbs.archlinux.org/extern.php?action=feed&fid=27&type=atom "Linux-CLI" "~Arch Linux Forum: Community Contributions"
-
-# }}}
-# Linux ================={{{
-
-http://feeds.feedburner.com/tocadotux "Linux" "~Toca do Tux"
-http://www.ubuntugeek.com/feed "Linux" "~UbuntuGeek"
-http://www.bashoneliners.com/oneliners/feeds/oneliner/ "Linux" "~BashOnliners"
-http://www.tuxmachines.org/node/feed "Linux"
-http://www.addictivetips.com/category/ubuntu-linux-tips/feed/ "Linux" "~Addictive Tips"
-http://linuxblog.darkduck.com/feeds/posts/default "Linux"
-http://net.tutsplus.com/feed/ "Linux" "~Tuts+"
-http://www.tecmint.com/feed "Linux" "~TecMint"
-http://www.dedoimedo.com/rss_feed.xml "Linux"
-http://www.flynsarmy.com/feed/ "Linux" "~Flynsarm"
-http://lxer.com/module/newswire/headlines.rss "Linux"
-http://rss.slashdot.org/Slashdot/slashdotLinux "Linux" "~SlashDot"
-http://feeds.pinboard.in/rss/t:linux "Linux" "~Pinboard: Linux"
-http://iloveubuntu.net/rss.xml "Linux" "~I love Ubuntu"
-http://www.phoronix.com/rss.php "Linux"
-http://www.techdrivein.com/feeds/posts/default?alt=rss "Linux"
-http://www.ghacks.net/feed/ "Linux"
-http://www.noobslab.com/feeds/posts/default "Linux" "~NoobsLab"
-http://blog.dustinkirkland.com/feeds/posts/default?alt=rss "Linux"
-http://ubuntuhandbook.org/index.php/feed/ "Linux"
-http://ubuntuforums.org/external.php?type=RSS2&forumids=100 "Linux"
-https://xfce.org/feed?lang=en "Linux"
-http://www.newthinktank.com/feed/ "Linux" "~DerekBanas"
-
-# }}}
-https://distrowatch.com/news/headline.xml
-http://feeds.feedburner.com/d0od
diff --git a/.tmux.conf b/.tmux.conf
index d2731e8..7d19457 100644
--- a/.tmux.conf
+++ b/.tmux.conf
@@ -1,335 +1,88 @@
-# Global stuff ============================={{{
-
-# Change C-B to C-Space
-unbind C-B
-set -g prefix C-Space
-
-# Start numbering tags at 1
-set -g base-index 1
-
-# tmux display things in 256 colors
-#set -g default-terminal "tmux-256color-italic"
-#set -g default-terminal "rxvt-unicode-256color"
 set -g default-terminal "screen-256color"
-
-# Color current pane
-set-option -g window-style 'bg=colour0'
-#set-option -g window-active-style 'bg=colour234'
-
-# enable terminal compability
-set-option -ga terminal-overrides ",tmux-256color-italic:Tc"
-
-# Faster command sequences
-set -s escape-time 0
-
-# Automatically renumber window numbers on closing a pane (tmux >= 1.7).
-set -g renumber-windows on
-
-# Run pipes-vertical if there's no action in 300 seconds
-#set -g lock-after-time 500
-#set -g lock-command "~/bin/ascii/pipes-vertical -p 5 -R"
-
-# Don't automatic rename windows
-set-window-option -g automatic-rename on
+set-option -ga terminal-overrides ",screen-256color:Tc"
+set-option -g escape-time 0
 set-option -g allow-rename on
-
-#}}}
-# Copy things =============================={{{
-
-bind-key Escape copy-mode			# enter copy mode; default [
-bind-key C-v paste-buffer				# paste; (default hotkey: ] )
-bind-key P choose-buffer 			# tmux clipboard history
-bind-key + delete-buffer \; display-message "Deleted current Tmux Clipboard History"
-
-
-# Send To Tmux Clipboard or System Clipboard
-bind-key < run-shell "tmux set-buffer -- \"$(xsel -o -b)\"" \; display-message "Copy To Tmux Clipboard"
-bind-key > run-shell 'tmux show-buffer | xsel -i -b' \; display-message "Copy To System Clipboard"
-
-# set the current tmux version (use this variable on if-shell commands)
-run-shell "tmux set-environment -g TMUX_VERSION $(tmux -V | cut -c 6-)"
-
-# vim copy mode rebinds for (tmux 2.4+)
-# https://shapeshed.com/custom-vim-bindings-in-tmux-2-4/
-# https://github.com/tmux/tmux/issues/754#issuecomment-303156000
-# https://stackoverflow.com/a/40902312
-# Note: rectangle-toggle (aka Visual Block Mode) > hit v then C-v to trigger it
-if-shell -b '[ "$(echo "$TMUX_VERSION >= 2.4" | bc)" = 1 ]' \
-  'bind-key -T copy-mode-vi v send-keys -X begin-selection; \
-  bind-key -T copy-mode-vi V send-keys -X select-line; \
-  bind-key -T copy-mode-vi C-v send-keys -X rectangle-toggle; \
-  bind-key -T choice-mode-vi h send-keys -X tree-collapse ; \
-  bind-key -T choice-mode-vi l send-keys -X tree-expand ; \
-  bind-key -T choice-mode-vi H send-keys -X tree-collapse-all ; \
-  bind-key -T choice-mode-vi L send-keys -X tree-expand-all ; \
-  bind-key -T copy-mode-vi MouseDragEnd1Pane send-keys -X copy-pipe "xclip -in -selection clipboard"; \
-  bind-key -T copy-mode-vi C-c send-keys -X copy-pipe "xclip -in -selection clipboard"'
-#}}}
-# Visual configuration ====================={{{
-
-# refresh the status bar every 1 second.
-set-option -g status-interval 1
-
-# loud or quiet?
-set-option -g visual-activity off
-set-option -g visual-bell off
-set-option -g visual-silence off
-set-window-option -g monitor-activity off
-set-option -g bell-action none
-
-set-option -g status "on"
-
-# Default statusbar colors
-#set-option -g status-bg colour0 #bg1
-#set-option -g status-fg colour195 #fg1
-
-# Default window title colors
-#set-window-option -g window-status-bg colour35
-#set-window-option -g window-status-fg colour235 #bg1
-
-#set-window-option -g window-status-activity-bg colour235 #bg1
-#set-window-option -g window-status-activity-fg colour227 #fg3
-
-# Active window title colors
-#set-window-option -g window-status-current-bg default
-#set-window-option -g window-status-current-fg colour0 #bg1
-
-# pane divider color; active pane
-# helps when you have more than two panes.
-# version 1.8 makes it easy to see 2 panes now
-#set-option -g pane-active-border-fg colour223 #fg2
-#set-option -g pane-border-fg colour235 #bg1
-
-# Message infos
-set-option -g message-bg colour240 #bg2
-set-option -g message-fg colour223 #fg1
-
-# Writting commands inactive
-set-option -g message-command-bg colour239 #fg3
-set-option -g message-command-fg colour223 #bg1
-
-# Pane number display
-#set-option -g display-panes-active-colour colour223 #fg2
-#set-option -g display-panes-colour colour242 #bg1
-
-# Clock
-set-window-option -g clock-mode-colour colour109 #blue
-
-# Bell
-set-window-option -g window-status-bell-style fg=colour235,bg=colour167 #bg, red
-
-# Theme settings mixed with colors (unfortunately, but there is no cleaner way)
-#set-option -g status-attr "none"
-#set-option -g status-justify "left"
-#set-option -g status-left-attr "none"
-#set-option -g status-left-length "80"
-#set-option -g status-right-attr "none"
-#set-option -g status-right-length "100"
-
-set -g status-justify centre
-set -g status-style "bg=black"
-set -ag status-style "fg=white"
-
-set-window-option -g window-status-activity-attr "none"
-set-window-option -g window-status-attr "none"
-set-window-option -g window-status-separator " "
-
-#W  = Tmux window name
-#I  = Tmux window number
-#F  = '*' display in the active window
-#h  = Computer host name
-#S  = Tmux session name
-#set -g status-left "#[fg=colour248,bg=colour0] #S "
-#set -g status-right "#{?client_prefix,#[fg=colour75]#[reverse] @ #[noreverse],#[fg=colour1]} #[fg=red,dim,bg=default,bright]#(~/bin/tmux-spotify both) #[fg=colour4]#(cut -d' ' -f1-3 /proc/loadavg) #[fg=white]| #[fg=colour14,bg=default]%a, %H:%M:%S #[fg=white]| #[fg=colour30,bg=default,bright]%d/%m/%Y "
+set -g renumber-windows on    # Caso tenha 3 janelas e a 2ª é fechada, a 3ª vira a 2ª e uma 3ª é criada
+set-option -g history-limit 8192
+# split pane
+bind \ split-window -h -c "#{pane_current_path}"
+bind - split-window -v -c "#{pane_current_path}"
+# split full window (tmux 2.3+)
+bind-key | split-window -fh -c "#{pane_current_path}"
+bind-key _ split-window -fv -c "#{pane_current_path}"
 
 
+set -g mouse on
+set -g @scroll-speed-num-lines-per-scroll "1"
 
-#+--------+
-#+ Status +
-#+--------+
+# Substituir o prefixo padrão para Ctrl-space
+unbind C-b
+set -g prefix C-space
+bind C-space send-prefix
 
-#set -g status-left "#[fg=black,bg=blue,bold] #S "
-#set -g status-right "#{prefix_highlight}#[fg=white,bg=brightblack] %Y-%m-%d #[fg=white,bg=brightblack,nobold,noitalics,nounderscore]|#[fg=white,bg=brightblack] %H:%M #[fg=cyan,bg=brightblack,nobold,noitalics,nounderscore] #[fg=black,bg=cyan,bold] #H "
-#
-##+--- Windows ---+
-#set -g window-status-format " #[fg=white,bg=brightblack]#I #[fg=white,bg=brightblack]#W #F"
-#set -g window-status-current-format " #[fg=black,bg=cyan]#I#[fg=black,bg=cyan,nobold,noitalics,nounderscore] #[fg=black,bg=cyan]#W #F"
-#set -g window-status-separator ""
+# Inicia a contagem das janelas a partir de 1, e não 0 (default)
+set-option -g base-index 1
+setw -g pane-base-index 1
 
-set -g window-status-separator ""
-set -g status-left ""
-set -g status-right ""
-setw -g window-status-format " #[fg=colour60]#W    "
-setw -g window-status-current-format " #[fg=colour15]#W    "
+bind-key -n M-k select-pane -t :.-    # prev pane
+bind-key -n M-j select-pane -t :.+    # next pane
+bind-key -n M-h select-window -t :-   # previous window
+bind-key -n M-l select-window -t :+   # next window
 
-#setw -g window-status-format "#[fg=colour195]#[bg=colour240] #I:#[bg=colour240]#[fg=colour195] #W "
-#setw -g window-status-current-format "#[bg=colour35]#[fg=colour235,bold] #I:#[fg=colour235,bold]#[bg=colour35] #W "
+# Sincroniza todos os painéis em uma janela
+bind M-y setw synchronize-panes
 
-# }}}
-# Mouse mode ==============================={{{
+# Aumenta/Diminui o painél
+bind-key -r H resize-pane -L +10
+bind-key -r J resize-pane -D +10
+bind-key -r K resize-pane -U +10
+bind-key -r L resize-pane -R +10
 
-# mouse to highlight and copy; to paste use prefix + ]
-# http://awhan.wordpress.com/2012/04/18/tmux-copy-paste-with-mouse/
+bind r source-file $HOME/.tmux.conf \; display "Configurações recarregadas."
 
-# temporarily allow regular terminal copy mode while mouse mode is enable
-# visual line:  shift+mouse
-# visual block: ctrl+shift+mouse <-- only works on some terminals
-# visual block: ctrl+mouse <-- (while mouse mode is disable) only works on some terminals
+# Troca janelas de posição
+bind-key Left swap-window -t -1
+bind-key Right swap-window -t +1
 
-# toggle mouse mode (tmux 2.1 or higher)
-# https://www.reddit.com/r/tmux/comments/3paqoi/tmux_21_has_been_released/cw552qd
+# Necessário ao scroll dentro de um editor
+unbind m
 bind-key m set-option -g -q mouse on \; display-message 'Mouse: ON'
 bind-key M set-option -g -q mouse off \; display-message 'Mouse: OFF'
 
-# }}}
-# Layouts =================================={{{
-# demo video: http://www.youtube.com/watch?v=sxw-n5Du600
-# http://amjith.blogspot.com/2011/08/scripting-tmux-layouts.html
-# http://unix.stackexchange.com/a/17118
-# -v = split horizontal
-# -h = split veritical
-
-# Main layout to floating WM
-#bind-key M-a send-keys "tmux rename-window -t 1 chat && clear && weechat-curses" 'Enter' \; \
-#	new-window -n mail -c $HOME \; \
-#	send-keys -t mail 'neomutt' 'Enter' \; \
-#	new-window -n ranger -c $HOME \; \
-#	send-keys -t ranger 'ranger' 'Enter' \; \
-#	new-window -n 'rss' -c $HOME \; \
-#	send-keys -t 'rss' 'newsboat' 'Enter' \; \
-#	new-window -n torrent -c $HOME \; \
-#	send-keys -t torrent 'transmission-remote-cli' 'Enter'\; \
-#	split-window -t torrent -v -p 63 \; \
-#	send-keys -t torrent 'tpb ' \; \
-#	split-window -t torrent -h \; \
-#	send-keys -t torrent 'ranger ~/Downloads/torrents' 'Enter' \; \
-#	new-window -n todo -c $HOME \; \
-#	send-keys -t todo 'sleep 30 && bin/todo-notify 'todo' && todo -s' 'Enter'
-
-# Main layout to tiling wm
-bind-key M-a new-window -n 'rss' -c $HOME \; \
-    send-keys -t 'rss' 'newsboat' 'Enter' \; \
-    new-window -n torrent -c $HOME \; \
-    send-keys -t torrent 'tsm-start && transmission-remote-cli' 'Enter'\; \
-    split-window -t torrent -v -p 63 \; \
-    send-keys -t torrent 'tpb ' \; \
-    split-window -t torrent -h \; \
-    send-keys -t torrent 'ranger ~/Downloads/torrents' 'Enter' \; \
-    new-window -n todo -c $HOME \; \
-    send-keys -t todo 'sleep 30 && bin/todo-notify 'todo' && todo -s' 'Enter'
-
-bind-key M-w new-window -n work -c $HOME \; \
-	send-keys -t work 'vim' 'Enter'\; \
-	split-window -t work -fv -p 27 -c "#{pane_current_path}" \; \
-	send-keys -t work 'clear && cdfac' C-j \; \
-	split-window -t work -h -p 27 -c "#{pane_current_path}" \; \
-	send-keys -t work 'tmux clock-mode' C-j
-
-# Info
-bind-key M-f new-window -n fm -c $HOME \; \
-	send-keys -t fm 'clear && figlet system info' 'Enter' \; \
-	split-window -t fm \; \
-	send-keys -t fm 'htop' 'Enter' \; \
-	split-window -t fm -fh -p 27 -c "#{pane_current_path}" \; \
-	send-keys -t fm 'tmux clock-mode' 'Enter'
-
-# }}}
-# Keybindings =============================={{{
-
-# Set keybindings as vim like
-set-window-option -g mode-keys vi
-
-# Video: http://www.youtube.com/watch?v=guB4WuVFhtY
-# Urlviewer; grab links from any tmux window/pane and open it with external apps
-# https://wiki.archlinux.org/index.php/Tmux#Browsing_URL.27s
-bind-key u capture-pane \; save-buffer /tmp/tmux-buffer \; new-window -n "urlview" '$SHELL -c "urlview < /tmp/tmux-buffer"'
-
-# reload config
-bind-key r source-file ~/.tmux.conf \; display-message "Configuration reloaded"
-
-# edit tmux config
-bind-key e new-window -n 'conf' '${EDITOR:-vim} ~/.tmux.conf && tmux source ~/.tmux.conf && tmux display "~/.tmux.conf sourced"'
-
-# split pane (tmux 1.9+)
-bind-key \ split-window -h -c "#{pane_current_path}"	# vertical split (default prefix-%)
-bind-key - split-window -v -c "#{pane_current_path}"	# horizontal split (default prefix-")
-
-# split full window (tmux 2.3+)
-bind-key | split-window -fh -c "#{pane_current_path}"
-bind-key _ split-window -fv -c "#{pane_current_path}"
-
-# Vim-like key bindings for pane navigation (default uses cursor keys)
-unbind h
-bind h select-pane -L
-unbind j
-bind j select-pane -D
-unbind k
-bind k select-pane -U
-unbind l # normally used for last-window
-bind l select-pane -R
-
-# resize panes
-bind-key -r J resize-pane -D 1
-bind-key -r K resize-pane -U 1
-bind-key -r H resize-pane -L 1
-bind-key -r L resize-pane -R 1
-
-# cycle windows/panes (no prefix)
-bind-key -n M-k select-pane -t :.-	# prev pane
-bind-key -n M-j select-pane -t :.+	# next pane
-bind-key -n M-h select-window -t :-	# previous window
-bind-key -n M-l select-window -t :+	# next window
-
-# sync panes; send what you are typing to other panes
+# Sincroniza painéis de uma janela
 bind-key C-s set-window-option synchronize-panes
 
-bind-key y capture-pane \; save-buffer /tmp/tmux-buffer \; \
-	new-window -n "w3m" '$SHELL -c "w3m < /tmp/tmux-buffer"'
-
-# clear screen and scrollback history
-bind-key -n C-l send-keys C-l \; run 'tmux clear-history'
-
-# prefix C-a to switch to the last window
-bind-key C-a last-window
+##########
+# Themes #
+##########
 
-# new window with the current path (tmux 1.9+)
-bind-key c new-window -c "#{pane_current_path}"
+bind-key b set-option status
+# status line
+set -g status-justify left
+set -g status-bg default
+set -g status-fg default
+set -g status-interval 2
 
-# swap windows/panes
-bind-key -n M-Left swap-window -t -1
-bind-key -n M-Right swap-window -t +1
-
-# kill window/pane without confirmation
-# http://unix.stackexchange.com/a/30283
-bind-key & kill-window
-bind-key x kill-pane
+setw -g window-status-format "#[fg=colour3] •#[fg=colour8] #W "
+setw -g window-status-current-format "#[fg=colour2] •#[fg=colour7] #W "
+set -g status-position bottom
+set -g status-justify centre
+set -g status-left "  #[fg=colour3]• #[fg=colour2]• #[fg=colour4]•"
+set -g status-right " #[fg=colour4] •#[fg=colour8] #S  "
 
-bind-key -T copy-mode-vi 'u' send-keys -X copy-selection \; new-window -n youtube \; send-keys -t youtube 'mpsyt /"$(tmux show-buffer)" && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 'i' send-keys -X copy-selection \; new-window -n imagegoogle \; send-keys -t imagegoogle 'surfraw imagesgoogle "$(tmux show-buffer)" && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 'g' send-keys -X copy-selection \; new-window -n google \; send-keys -t google 'surfraw google "$(tmux show-buffer)" && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 'p' send-keys -X copy-selection \; new-window -n wikipedia \; send-keys -t wikipedia 'sr wikipedia "$(tmux show-buffer)" && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 'u' send-keys -X copy-selection \; new-window -n youtube \; send-keys -t youtube 'mpsyt /"$(tmux show-buffer)" && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 'O' send-keys -X copy-selection \; new-window -n w3m \; send-keys -t w3m 'w3m "$(tmux show-buffer)" && tmux kill-window' 'Enter'
+bind-key u capture-pane \; save-buffer /tmp/tmux-buffer \; new-window -n "urlview" '$SHELL -c "urlview < /tmp/tmux-buffer"'
 
-# translate, dictionary, text to speech
-bind-key -T copy-mode-vi 't' send-keys -X copy-selection \; new-window -n translate \; send-keys -t translate 'trans :pt "$(tmux show-buffer)" | w3m && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 'd' send-keys -X copy-selection \; new-window -n dict \; send-keys -t dict 'trans -d "$(tmux show-buffer)" | w3m && tmux kill-window' 'Enter'
-bind-key -T copy-mode-vi 's' send-keys -X copy-selection \; new-window -n speak \; send-keys -t speak 'trans -brief "$(tmux show-buffer)" -play && tmux kill-window' 'Enter'
+set -g @plugin 'tmux-plugins/tpm'
+set -g @plugin 'tmux-plugins/tmux-open'
+set -g @plugin 'tmux-plugins/tmux-yank'
+set -g @plugin 'tmux-plugins/tmux-resurrect'
+set -g @plugin 'tmux-plugins/tmux-continuum'
 
-bind-key -n 'M-\' new-window -n locate \; send-keys -t locate "fzf-locate && tmux kill-window\n"
-bind-key -n 'C-\' new-window -n bookmarks -c $HOME \; \
-    send-keys 'fzf-surfraw && tmux kill-window' 'Enter'
+set -g @yank_action 'copy-pipe' # or 'copy-pipe-and-cancel' for the default
 
-# use vim as copy mode
-bind-key v capture-pane \; save-buffer /tmp/tmux-buffer \; new-window -n "vim-copymode" '$SHELL -c "vim /tmp/tmux-buffer"'
+set -g @continuum-restore 'on'
 
-# ask user to input window number they wish to swap with
-# references: https://stackoverflow.com/questions/33396831/how-to-force-tmux-to-wait-for-output-from-command-prompt
-# bind T command-prompt -p "Swap current window with?:" "swap-window -t '%1'"
-bind-key S command-prompt -p "Swap current pane with?:" "swap-pane -t '%1'"
+run -b '~/.tmux/plugins/tpm/tpm'
 
-# }}}
-# Test ====================================={{{
 
-# }}}
 
diff --git a/.urlview b/.urlview
index e03d03b..3bd9c0c 100644
--- a/.urlview
+++ b/.urlview
@@ -29,5 +29,5 @@ REGEXP (((http|https|ftp|gopher)|mailto)[.:][^ >"\t]*|www\.[-a-z0-9.]+)[^ .,;\t>
 
 #COMMAND lynx %s
 #COMMAND netscape -remote 'openURL(%s)'
-COMMAND dmenuhandler
+#COMMAND dmenuhandler
 
diff --git a/.vim/after/ftplugin/c.vim b/.vim/after/ftplugin/c.vim
index 51df2bd..452bb05 100644
--- a/.vim/after/ftplugin/c.vim
+++ b/.vim/after/ftplugin/c.vim
@@ -5,7 +5,7 @@
 " When typing ';' marks a undo point, so when hit u, it won't undo the whole thing that you did in insert mode (nice when programming), and always save when press ;
 inoremap ; ;<c-g>u
 "inoremap ; :w<CR>
-inoremap {<CR> <CR>{<CR>}<Esc>O
+inoremap {<CR> <space>{<CR>}<Esc>O
 inoremap /*<space> /*  */<Esc>2<Left>i
 "iabbrev #i #include
 "iabbrev #d #define
diff --git a/.vim/after/ftplugin/markdown.vim b/.vim/after/ftplugin/markdown.vim
index 21231db..771b2ac 100644
--- a/.vim/after/ftplugin/markdown.vim
+++ b/.vim/after/ftplugin/markdown.vim
@@ -17,7 +17,7 @@ inoremap ,n <Enter><Enter>---<Enter><Enter>
 inoremap ,l <Enter>--------<Enter>
 
 " [C]ode
-inoremap ,c ```<CR>```<CR><CR><esc>2kO
+inoremap ,c ```<CR>```<CR><esc>kO
 
 " Header [1]
 inoremap ,1 #<Space>
diff --git a/.vimrc b/.vimrc
deleted file mode 100644
index 463c6b0..0000000
--- a/.vimrc
+++ /dev/null
@@ -1,240 +0,0 @@
-" My old vim configuration: http://ix.io/1f88   (It is here only by reference, it's a super bloat config!!)
-
-call plug#begin('~/.vim/plugged')
-" Plugins for notetaking only
-Plug 'vimwiki/vimwiki'
-Plug 'junegunn/goyo.vim', { 'on': 'Goyo' }
-call plug#end()
-" General settings {{{
-
-" Filetype support
-filetype plugin indent on
-syntax on
-
-runtime macros/matchit.vim
-colorscheme gruvbox                     " Use the gruvbox colorscheme: https://github.com/morhetz/gruvbox
-set background=dark                     " Use a dark background
-set scrolloff=5                         " Keep at least 3 lines above/below when scrolling
-set lazyredraw                          " Don't update the display while executing macros
-set tabstop=4                           " Tab indentation levels every four columns
-set shiftwidth=4                        " Indent/outdent by four columns (when pressing >>)
-set expandtab                           " Convert all tabs that are typed into spaces (it has a better compatibility with other computers)
-set shiftround                          " Always indent/outdent to nearest tabstop
-set smarttab                            " Use shiftwidths at left margin, tabstops everywhere else
-set laststatus=2                        " Always show the statusline
-set nonumber                            " Don't display line numbers
-set backspace=indent,eol,start          " Fix backspace
-set hlsearch                            " Highlight search
-set incsearch ignorecase                " Increase search
-set noswapfile                          " Don't use swap file
-set smartcase                           " Override the 'ignorecase' option if the search pattern contains upper case characters.
-set showcmd                             " Show commands at bottom
-set hidden                              " Switch buffers without the need of saving them
-set path=.,**                           " Set path to the current and children directories
-set wildmenu wildmode=full              " Display all matching files when we tab complete
-set undofile undodir=~/.vim/tmp/undo/   " Set undofiles (undo files even if you exited the file)
-set splitbelow splitright               " Split belor and/or right when opening new buffers
-set list listchars=eol:$,trail:∙ listchars+=tab:│\  fillchars+=vert:│,fold:\  
-set foldenable foldmethod=marker
-" Set up statusline
-set statusline=\ %f\ %y\ %m%=%l,%c\ \ \ \ \ \ \ \ \ \ \ \ %P\ |
- " }}}
-" Mappings {{{
-
-" Ergonomics
-inoremap <C-H> (
-inoremap <C-J> )
-inoremap <C-K> [
-inoremap <C-L> ]
-inoremap <C-D> *
-" http://items.sjbach.com/319/configuring-vim-right
-noremap ; :
-noremap : ;
-nnoremap ' `
-
-" Make 0 go to the first character rather than the beginning
-" " of the line. When we're programming, we're almost always
-" " interested in working with text rather than empty space. If
-" " you want the traditional beginning of line, use ^
-nnoremap 0 ^
-nnoremap ^ 0
-
-" Supercharge dot formula
-nnoremap c* *``cgn
-
-" Delete trailing spaces
-nnoremap <silent> <F5> :let _s=@/ <Bar> :%s/\s\+$//e <Bar> :let @/=_s <Bar> :nohl <Bar> :unlet _s <CR>
-
-" Juggling with buffers
-nnoremap ,b         :buffer *
-nnoremap ,B         :sbuffer *
-nnoremap <PageUp>   :bprevious<CR>
-nnoremap <PageDown> :bnext<CR>
-nnoremap <BS>       :buffer#<CR>
-
-" Juggling with matches
-nnoremap ,i :ilist /
-nnoremap [I [I:ijump<Space><Space><Space><C-r><C-w><S-Left><Left><Left>
-nnoremap ]I ]I:ijump<Space><Space><Space><C-r><C-w><S-Left><Left><Left>
-
-" Move to other buffers
-nnoremap <C-j> <C-w>j
-nnoremap <C-k> <C-w>k
-nnoremap <C-l> <C-w>l
-nnoremap <C-h> <C-w>h
-
-" Visual select inside a whole function
-xnoremap if /^\s*}<CR><Esc>V%
-
-" File navigation
-nnoremap ,f :find *
-nnoremap ,e :e %:h/
-nnoremap ,s :sfind *
-nnoremap ,v :vert sfind *
-nnoremap ,F :find <C-R>=fnameescape(expand('%:p:h')).'/**/*'<CR>
-nnoremap ,S :sfind <C-R>=fnameescape(expand('%:p:h')).'/**/*'<CR>
-nnoremap ,V :vert sfind <C-R>=fnameescape(expand('%:p:h')).'/**/*'<CR>
-nnoremap gb :ls<CR>:buffer<Space>
-
-" better completion menu
-inoremap <expr> <Tab>   pumvisible() ? "\<C-n>" : "\<Tab>"
-inoremap <expr> <S-Tab> pumvisible() ? "\<C-p>" : "\<S-Tab>"
-inoremap <expr> <cr>    pumvisible() ? "\<C-y>" : "\<cr>"
-
-" Smooth listing
-cnoremap <expr> <CR> <SID>CCR()
-function! s:CCR()
-    command! -bar Z silent set more|delcommand Z
-    if getcmdtype() == ":"
-        let cmdline = getcmdline()
-        if cmdline =~ '\v\C^(dli|il)' | return "\<CR>:" . cmdline[0] . "jump   " . split(cmdline, " ")[1] . "\<S-Left>\<Left>\<Left>"
-        elseif cmdline =~ '\v\C^(cli|lli)' | return "\<CR>:silent " . repeat(cmdline[0], 2) . "\<Space>"
-        elseif cmdline =~ '\C^changes' | set nomore | return "\<CR>:Z|norm! g;\<S-Left>"
-        elseif cmdline =~ '\C^ju' | set nomore | return "\<CR>:Z|norm! \<C-o>\<S-Left>"
-        elseif cmdline =~ '\v\C(#|nu|num|numb|numbe|number)$' | return "\<CR>:"
-        elseif cmdline =~ '\C^ol' | set nomore | return "\<CR>:Z|e #<"
-        elseif cmdline =~ '\v\C^(ls|files|buffers)' | return "\<CR>:b"
-        elseif cmdline =~ '\C^marks' | return "\<CR>:norm! `"
-        elseif cmdline =~ '\C^undol' | return "\<CR>:u "
-        else | return "\<CR>" | endif
-    else | return "\<CR>" | endif
-endfunction
-
-" Commands for adjusting indentation rules manually
-command! -nargs=1 Spaces execute "setlocal tabstop=" . <args> . " shiftwidth=" . <args> . " softtabstop=" . <args> . " expandtab" | setlocal ts? sw? sts? et?
-command! -nargs=1 Tabs   execute "setlocal tabstop=" . <args> . " shiftwidth=" . <args> . " softtabstop=" . <args> . " noexpandtab" | setlocal ts? sw? sts? et?
-
-" Share text on ix.io (visual select something, type :IX, and it will upload to ix.io)
-command! -range=% IX  <line1>,<line2>w !curl -F 'f:1=<-' ix.io | tr -d '\n' | xclip -i -selection clipboard
-
-" Clear all the registers available: https://stackoverflow.com/a/41003241
-command! ClearReg for i in range(34,122) | silent! call setreg(nr2char(i), []) | endfor
-
-" Fix the go to next line if wrap is enabled
-nnoremap <expr> j v:count ? 'j' : 'gj'
-nnoremap <expr> k v:count ? 'k' : 'gk'
-
-" }}}
-" AutoCMD's {{{
-if has('autocmd')
-    augroup Set_FileTypes
-        autocmd!
-        "autocmd BufRead,BufNewFile,BufWritePost *.md set filetype=markdown
-        autocmd FileType vimwiki map <leader>d <Plug>VimwikiToggleListItem
-        autocmd BufRead,BufNewFile,BufWritePost *.pl set filetype=prolog
-        autocmd FileType gitcommit setlocal spell
-        autocmd FileType qf wincmd J | setlocal wrap
-        autocmd FileType mail
-                    \ if expand('%:p') =~ '^/tmp/mutt/\(neo\)\?mutt-' |
-                    \     set ft=pandoc                               |
-                    \ else                                            |
-                    \     setlocal spell                              |
-                    \ endif
-    augroup END
-
-
-    " Return to last edit position when opening files (You want this!)
-    augroup Remember_cursor_position
-        autocmd!
-        autocmd BufReadPost * if line("'\"") > 1 && line("'\"") <= line("$") | exe "normal! g`\"" | endif
-    augroup END
-
-    augroup VimSettings
-        autocmd!
-        " automatic location/quickfix window
-        autocmd QuickFixCmdPost [^l]* cwindow
-        autocmd QuickFixCmdPost    l* lwindow
-        autocmd VimEnter            * cwindow
-        " various adjustments of the default colorscheme
-        highlight ModeMsg         ctermbg=1         ctermfg=White    cterm=bold
-        highlight Search          ctermfg=White     ctermbg=Red      cterm=bold
-        highlight IncSearch       ctermfg=White     ctermbg=Red      cterm=bold
-        highlight StatusLine      ctermfg=1        ctermbg=0
-        highlight StatusLineNC    ctermfg=8         ctermbg=1
-        highlight Visual          ctermbg=247       ctermfg=black    cterm=bold
-        " Tabline color settings
-        highlight TabLine      ctermfg=White  ctermbg=Black     cterm=NONE
-        highlight TabLineFill  ctermfg=White  ctermbg=Black     cterm=NONE
-        highlight TabLineSel   ctermfg=White  ctermbg=DarkBlue  cterm=NONE
-        " Spell color settings
-        highlight SpellBad     term=underline cterm=underline ctermfg=Red
-        highlight SpellCap     term=underline cterm=underline
-        highlight SpellRare    term=underline cterm=underline
-        highlight SpellLocal   term=underline cterm=underline
-
-        " Git-specific settings
-        autocmd FileType gitcommit nnoremap <buffer> { ?^@@<CR>|nnoremap <buffer> } /^@@<CR>|setlocal iskeyword+=-
-    augroup END
-
-    " Show spaces as red if there's nothing after it (stole Greg Hurrel)
-    augroup TrailWhiteSpaces
-        highlight ColorColumn ctermbg=1
-        autocmd BufWinEnter <buffer> match Error /\s\+$/
-        autocmd InsertEnter <buffer> match Error /\s\+\%#\@<!$/
-        autocmd InsertLeave <buffer> match Error /\s\+$/
-        autocmd BufWinLeave <buffer> call clearmatches()
-    augroup END
-endif
-" }}}
-" Grep {{{
-command! -nargs=+ -complete=file_in_path -bar Grep  silent! grep! <args> | redraw!
-command! -nargs=+ -complete=file_in_path -bar LGrep silent! lgrep! <args> | redraw!
-
-nnoremap <silent> ,G :Grep <C-r><C-w><CR>
-xnoremap <silent> ,G :<C-u>let cmd = "Grep " . visual#GetSelection() <bar>
-            \ call histadd("cmd", cmd) <bar>
-            \ execute cmd<CR>
-
-if executable("ag")
-    set grepprg=ag\ --vimgrep
-    set grepformat^=%f:%l:%c:%m
-endif
-" }}}
-" Netrw {{{
-let g:netrw_sort_by        = 'time'
-let g:netrw_sort_direction = 'reverse'
-let g:netrw_banner         = 0
-let g:netrw_liststyle      = 3
-let g:netrw_browse_split   = 3
-let g:netrw_fastbrowse     = 1
-let g:netrw_sort_by        = 'name'
-let g:netrw_sort_direction = 'normal'
-let g:netrw_winsize = -28
-
-function! ToggleExplore()
-    if &ft ==# "netrw"
-         Rexplore
-    else
-         Explore
-    endif
-endfunction
-map <F2> <Esc><Esc>:call ToggleExplore()<CR>
-" }}}
-" Plugins {{{
-" vimwiki with markdown support
-let g:vimwiki_ext2syntax = {'.md': 'markdown'}
-
-" }}}
-
-autocmd BufNewFile *.py :norm O#!/usr/bin/env python
-autocmd BufNewFile *.py :norm 2o
diff --git a/.weechat/irc.conf.template b/.weechat/irc.conf.template
deleted file mode 100644
index 2f5600c..0000000
--- a/.weechat/irc.conf.template
+++ /dev/null
@@ -1,202 +0,0 @@
-#
-# weechat -- irc.conf
-#
-# WARNING: It is NOT recommended to edit this file by hand,
-# especially if WeeChat is running.
-#
-# Use /set or similar command to change settings in WeeChat.
-#
-# For more info, see: https://weechat.org/doc/quickstart
-#
-
-[look]
-buffer_open_before_autojoin = on
-buffer_open_before_join = off
-buffer_switch_autojoin = on
-buffer_switch_join = on
-color_nicks_in_names = off
-color_nicks_in_nicklist = off
-color_nicks_in_server_messages = on
-color_pv_nick_like_channel = on
-ctcp_time_format = "%a, %d %b %Y %T %z"
-display_away = local
-display_ctcp_blocked = on
-display_ctcp_reply = on
-display_ctcp_unknown = on
-display_host_join = on
-display_host_join_local = on
-display_host_quit = on
-display_join_message = "329,332,333,366"
-display_old_topic = on
-display_pv_away_once = on
-display_pv_back = on
-highlight_channel = "$nick"
-highlight_pv = "$nick"
-highlight_server = "$nick"
-highlight_tags_restrict = "irc_privmsg,irc_notice"
-item_channel_modes_hide_args = "k"
-item_display_server = buffer_plugin
-item_nick_modes = on
-item_nick_prefix = on
-join_auto_add_chantype = off
-msgbuffer_fallback = current
-new_channel_position = none
-new_pv_position = none
-nick_completion_smart = speakers
-nick_mode = prefix
-nick_mode_empty = off
-nicks_hide_password = "nickserv"
-notice_as_pv = auto
-notice_welcome_redirect = on
-notice_welcome_tags = ""
-notify_tags_ison = "notify_message"
-notify_tags_whois = "notify_message"
-part_closes_buffer = off
-pv_buffer = independent
-pv_tags = "notify_private"
-raw_messages = 256
-server_buffer = merge_with_core
-smart_filter = on
-smart_filter_chghost = on
-smart_filter_delay = 5
-smart_filter_join = on
-smart_filter_join_unmask = 30
-smart_filter_mode = "+"
-smart_filter_nick = on
-smart_filter_quit = on
-temporary_servers = off
-topic_strip_colors = off
-
-[color]
-input_nick = lightcyan
-item_channel_modes = default
-item_lag_counting = default
-item_lag_finished = yellow
-item_nick_modes = default
-message_chghost = brown
-message_join = green
-message_quit = red
-mirc_remap = "1,-1:darkgray"
-nick_prefixes = "y:lightred;q:lightred;a:lightcyan;o:lightgreen;h:lightmagenta;v:yellow;*:lightblue"
-notice = green
-reason_quit = default
-topic_current = default
-topic_new = white
-topic_old = default
-
-[network]
-autoreconnect_delay_growing = 2
-autoreconnect_delay_max = 600
-ban_mask_default = "*!$ident@$host"
-channel_encode = off
-colors_receive = on
-colors_send = on
-lag_check = 60
-lag_max = 1800
-lag_min_show = 500
-lag_reconnect = 300
-lag_refresh_interval = 1
-notify_check_ison = 1
-notify_check_whois = 5
-sasl_fail_unavailable = on
-send_unknown_commands = off
-whois_double_nick = off
-
-[msgbuffer]
-
-[ctcp]
-clientinfo = ""
-finger = ""
-ping = ""
-source = ""
-time = ""
-userinfo = ""
-version = ""
-
-[ignore]
-
-[server_default]
-addresses = ""
-anti_flood_prio_high = 2
-anti_flood_prio_low = 2
-autoconnect = off
-autojoin = ""
-autoreconnect = on
-autoreconnect_delay = 10
-autorejoin = off
-autorejoin_delay = 30
-away_check = 0
-away_check_max_nicks = 25
-capabilities = ""
-command = ""
-command_delay = 0
-connection_timeout = 60
-ipv6 = on
-local_hostname = ""
-msg_kick = ""
-msg_part = ""
-msg_quit = ""
-nicks = "nick1,nick2,nick3,nick4"
-nicks_alternate = on
-notify = ""
-password = "<YourPassword>"
-proxy = ""
-realname = ""
-sasl_fail = continue
-sasl_key = ""
-sasl_mechanism = plain
-sasl_password = "<YourPassword>"
-sasl_timeout = 15
-sasl_username = "<YourDefaultNick>"
-split_msg_max_length = 512
-ssl = off
-ssl_cert = ""
-ssl_dhkey_size = 2048
-ssl_fingerprint = ""
-ssl_priorities = "NORMAL:-VERS-SSL3.0"
-ssl_verify = on
-usermode = ""
-username = "<YourDefaultNick>"
-
-[server]
-freenode.addresses = "freenodeok2gncmy.onion/7000"
-freenode.proxy = "tor"
-freenode.ipv6
-freenode.ssl = on
-freenode.ssl_cert = "%h/certs/freenode.pem"
-freenode.ssl_priorities = "NORMAL:-VERS-TLS-ALL:+VERS-TLS1.0:+VERS-SSL3.0:%COMPAT"
-freenode.ssl_dhkey_size
-freenode.ssl_fingerprint
-freenode.ssl_verify = off
-freenode.password
-freenode.capabilities
-freenode.sasl_mechanism = external
-freenode.sasl_username = "<YourFreenodeNick>"
-freenode.sasl_password = "<YourFreenodePassword>"
-freenode.sasl_key
-freenode.sasl_timeout
-freenode.sasl_fail
-freenode.autoconnect = on
-freenode.autoreconnect
-freenode.autoreconnect_delay
-freenode.nicks
-freenode.nicks_alternate
-freenode.username
-freenode.realname
-freenode.local_hostname
-freenode.usermode
-freenode.command
-freenode.command_delay
-freenode.autojoin
-freenode.autorejoin
-freenode.autorejoin_delay
-freenode.connection_timeout
-freenode.anti_flood_prio_high
-freenode.anti_flood_prio_low
-freenode.away_check
-freenode.away_check_max_nicks
-freenode.msg_kick
-freenode.msg_part
-freenode.msg_quit
-freenode.notify
-freenode.split_msg_max_length
diff --git a/.weechat/weechat.conf.template b/.weechat/weechat.conf.template
deleted file mode 100644
index 97b2366..0000000
--- a/.weechat/weechat.conf.template
+++ /dev/null
@@ -1,677 +0,0 @@
-#
-# weechat -- weechat.conf
-#
-# WARNING: It is NOT recommended to edit this file by hand,
-# especially if WeeChat is running.
-#
-# Use /set or similar command to change settings in WeeChat.
-#
-# For more info, see: https://weechat.org/doc/quickstart
-#
-
-[debug]
-
-[startup]
-command_after_plugins = "/buffer clear"
-command_before_plugins = ""
-display_logo = off
-display_version = off
-sys_rlimit = ""
-
-[look]
-align_end_of_lines = message
-align_multiline_words = on
-bar_more_down = " + "
-bar_more_left = "--"
-bar_more_right = "++"
-bar_more_up = " - "
-bare_display_exit_on_input = on
-bare_display_time_format = "%H:%M"
-buffer_auto_renumber = on
-buffer_notify_default = all
-buffer_position = end
-buffer_search_case_sensitive = off
-buffer_search_force_default = off
-buffer_search_regex = off
-buffer_search_where = message
-buffer_time_format = "  %H:%M"
-color_basic_force_bold = off
-color_inactive_buffer = off
-color_inactive_message = on
-color_inactive_prefix = on
-color_inactive_prefix_buffer = on
-color_inactive_time = off
-color_inactive_window = off
-color_nick_offline = off
-color_pairs_auto_reset = 5
-color_real_white = off
-command_chars = ""
-command_incomplete = off
-confirm_quit = off
-confirm_upgrade = off
-day_change = on
-day_change_message_1date = "           -- %a, %d %b %Y --"
-day_change_message_2dates = "-- %%a, %%d %%b %%Y (%a, %d %b %Y) --"
-eat_newline_glitch = off
-emphasized_attributes = ""
-highlight = ""
-highlight_regex = ""
-highlight_tags = ""
-hotlist_add_conditions = "${away} || ${buffer.num_displayed} == 0"
-hotlist_buffer_separator = ": "
-hotlist_count_max = 2
-hotlist_count_min_msg = 2
-hotlist_names_count = 3
-hotlist_names_length = 0
-hotlist_names_level = 12
-hotlist_names_merged_buffers = off
-hotlist_prefix = "H: "
-hotlist_remove = merged
-hotlist_short_names = on
-hotlist_sort = group_time_asc
-hotlist_suffix = ""
-hotlist_unique_numbers = on
-input_cursor_scroll = 20
-input_share = none
-input_share_overwrite = off
-input_undo_max = 32
-item_away_message = on
-item_buffer_filter = "*"
-item_buffer_zoom = "!"
-item_mouse_status = "M"
-item_time_format = "%H:%M"
-jump_current_to_previous_buffer = on
-jump_previous_buffer_when_closing = on
-jump_smart_back_to_buffer = on
-key_bind_safe = on
-key_grab_delay = 800
-mouse = off
-mouse_timer_delay = 100
-nick_color_force = ""
-nick_color_hash = djb2
-nick_color_stop_chars = "_|["
-nick_prefix = " "
-nick_suffix = " "
-paste_auto_add_newline = on
-paste_bracketed = off
-paste_bracketed_timer_delay = 10
-paste_max_lines = 1
-prefix_action = "*"
-prefix_align = right
-prefix_align_max = 0
-prefix_align_min = 0
-prefix_align_more = "+"
-prefix_align_more_after = on
-prefix_buffer_align = right
-prefix_buffer_align_max = 0
-prefix_buffer_align_more = "+"
-prefix_buffer_align_more_after = on
-prefix_error = " !!! "
-prefix_join = " ◥ "
-prefix_network = " - "
-prefix_quit = " ◣ "
-prefix_same_nick = "↳"
-prefix_suffix = " "
-quote_nick_prefix = "<"
-quote_nick_suffix = ">"
-quote_time_format = "%H:%M:%S"
-read_marker = line
-read_marker_always_show = off
-read_marker_string = "- "
-save_config_on_exit = on
-save_config_with_fsync = off
-save_layout_on_exit = all
-scroll_amount = 3
-scroll_bottom_after_switch = off
-scroll_page_percent = 100
-search_text_not_found_alert = on
-separator_horizontal = " "
-separator_vertical = ""
-tab_width = 2
-time_format = "%a, %d %b %Y %T"
-window_auto_zoom = off
-window_separator_horizontal = on
-window_separator_vertical = on
-window_title = "weechat"
-word_chars_highlight = "!\u00A0,-,_,|,alnum"
-word_chars_input = "!\u00A0,-,_,|,alnum"
-
-[palette]
-
-[color]
-bar_more = green
-chat = 13
-chat_bg = default
-chat_buffer = darkgray
-chat_channel = 15
-chat_day_change = cyan
-chat_delimiters = magenta
-chat_highlight = black
-chat_highlight_bg = red
-chat_host = green
-chat_inactive_buffer = darkgray
-chat_inactive_window = darkgray
-chat_nick = magenta
-chat_nick_colors = "01,02,03,04,05,06,15"
-chat_nick_offline = 8
-chat_nick_offline_highlight = default
-chat_nick_offline_highlight_bg = darkgray
-chat_nick_other = white
-chat_nick_prefix = green
-chat_nick_self = blue
-chat_nick_suffix = green
-chat_prefix_action = white
-chat_prefix_buffer = 2
-chat_prefix_buffer_inactive_buffer = darkgray
-chat_prefix_error = yellow
-chat_prefix_join = lightgreen
-chat_prefix_more = lightmagenta
-chat_prefix_network = magenta
-chat_prefix_quit = lightred
-chat_prefix_suffix = darkgray
-chat_read_marker = magenta
-chat_read_marker_bg = default
-chat_server = brown
-chat_tags = red
-chat_text_found = yellow
-chat_text_found_bg = lightmagenta
-chat_time = 241
-chat_time_delimiters = 241
-chat_value = cyan
-chat_value_null = blue
-emphasized = yellow
-emphasized_bg = magenta
-input_actions = lightgreen
-input_text_not_found = red
-item_away = yellow
-nicklist_away = cyan
-nicklist_group = green
-separator = black
-status_count_highlight = magenta
-status_count_msg = brown
-status_count_other = default
-status_count_private = green
-status_data_highlight = lightmagenta
-status_data_msg = yellow
-status_data_other = default
-status_data_private = lightgreen
-status_filter = green
-status_more = yellow
-status_mouse = green
-status_name = white
-status_name_ssl = lightgreen
-status_nicklist_count = default
-status_number = yellow
-status_time = default
-
-[completion]
-base_word_until_cursor = on
-command_inline = on
-default_template = "%(nicks)|%(irc_channels)"
-nick_add_space = on
-nick_case_sensitive = off
-nick_completer = ":"
-nick_first_only = off
-nick_ignore_chars = "[]`_-^"
-partial_completion_alert = on
-partial_completion_command = off
-partial_completion_command_arg = off
-partial_completion_count = on
-partial_completion_other = off
-partial_completion_templates = "config_options"
-
-[history]
-display_default = 5
-max_buffer_lines_minutes = 0
-max_buffer_lines_number = 100
-max_commands = 100
-max_visited_buffers = 50
-
-[proxy]
-tor.address = "127.0.0.1"
-tor.ipv6 = off
-tor.password = ""
-tor.port = 9050
-tor.type = socks5
-tor.username = ""
-
-[network]
-connection_timeout = 60
-gnutls_ca_file = "/etc/ssl/certs/ca-certificates.crt"
-gnutls_handshake_timeout = 30
-proxy_curl = ""
-
-[plugin]
-autoload = "*,!xfer"
-debug = off
-extension = ".so,.dll"
-path = "%h/plugins"
-save_config_on_unload = on
-
-[bar]
-buffers.color_bg = 0
-buffers.color_delim = 8
-buffers.color_fg = 8
-buffers.conditions = ""
-buffers.filling_left_right = vertical
-buffers.filling_top_bottom = columns_vertical
-buffers.hidden = on
-buffers.items = "buffers"
-buffers.position = top
-buffers.priority = 0
-buffers.separator = on
-buffers.size = 0
-buffers.size_max = 0
-buffers.type = root
-buflist.color_bg = 0
-buflist.color_delim = 235
-buflist.color_fg = default
-buflist.conditions = ""
-buflist.filling_left_right = vertical
-buflist.filling_top_bottom = columns_vertical
-buflist.hidden = off
-buflist.items = "buflist"
-buflist.position = top
-buflist.priority = 0
-buflist.separator = on
-buflist.size = 0
-buflist.size_max = 0
-buflist.type = root
-fset.color_bg = default
-fset.color_delim = cyan
-fset.color_fg = default
-fset.conditions = "${buffer.full_name} == fset.fset"
-fset.filling_left_right = vertical
-fset.filling_top_bottom = horizontal
-fset.hidden = off
-fset.items = "fset"
-fset.position = top
-fset.priority = 0
-fset.separator = on
-fset.size = 3
-fset.size_max = 3
-fset.type = window
-input.color_bg = 239
-input.color_delim = red
-input.color_fg = 13
-input.conditions = ""
-input.filling_left_right = horizontal
-input.filling_top_bottom = horizontal
-input.hidden = off
-input.items = " » +,input_text"
-input.position = bottom
-input.priority = 1000
-input.separator = on
-input.size = 1
-input.size_max = 0
-input.type = root
-isetbar.color_bg = default
-isetbar.color_delim = cyan
-isetbar.color_fg = default
-isetbar.conditions = ""
-isetbar.filling_left_right = vertical
-isetbar.filling_top_bottom = horizontal
-isetbar.hidden = on
-isetbar.items = "isetbar_help"
-isetbar.position = top
-isetbar.priority = 0
-isetbar.separator = on
-isetbar.size = 3
-isetbar.size_max = 3
-isetbar.type = window
-nicklist.color_bg = default
-nicklist.color_delim = black
-nicklist.color_fg = default
-nicklist.conditions = "nicklist"
-nicklist.filling_left_right = vertical
-nicklist.filling_top_bottom = columns_vertical
-nicklist.hidden = on
-nicklist.items = "buffer_nicklist"
-nicklist.position = right
-nicklist.priority = 200
-nicklist.separator = on
-nicklist.size = 0
-nicklist.size_max = 0
-nicklist.type = root
-status.color_bg = default
-status.color_delim = black
-status.color_fg = cyan
-status.conditions = ""
-status.filling_left_right = vertical
-status.filling_top_bottom = horizontal
-status.hidden = on
-status.items = "[time],[buffer_last_number],[buffer_plugin],buffer_number+:+buffer_name+(buffer_modes)+{buffer_nicklist_count}+buffer_zoom+buffer_filter,scroll,[lag],[hotlist],completion"
-status.position = bottom
-status.priority = 500
-status.separator = off
-status.size = 1
-status.size_max = 0
-status.type = window
-title.color_bg = default
-title.color_delim = darkgray
-title.color_fg = green
-title.conditions = ""
-title.filling_left_right = horizontal
-title.filling_top_bottom = horizontal
-title.hidden = on
-title.items = ""
-title.position = bottom
-title.priority = 0
-title.separator = on
-title.size = 0
-title.size_max = 0
-title.type = root
-
-[notify]
-
-[filter]
-irc_smart = on;*;irc_smart_filter;*
-joinquit = on;*;irc_join,irc_part,irc_quit;*
-
-[key]
-ctrl-? = "/input delete_previous_char"
-ctrl-A = "/input move_beginning_of_line"
-ctrl-B = "/input move_previous_char"
-ctrl-Cb = "/input insert \x02"
-ctrl-Cc = "/input insert \x03"
-ctrl-Ci = "/input insert \x1D"
-ctrl-Co = "/input insert \x0F"
-ctrl-Cr = "/input insert \x12"
-ctrl-Cu = "/input insert \x15"
-ctrl-D = "/input delete_next_char"
-ctrl-E = "/input move_end_of_line"
-ctrl-F = "/input move_next_char"
-ctrl-H = "/input delete_previous_char"
-ctrl-I = "/input complete_next"
-ctrl-J = "/input return"
-ctrl-K = "/input delete_end_of_line"
-ctrl-L = "/window refresh"
-ctrl-M = "/input return"
-ctrl-N = "/buffer +1"
-ctrl-P = "/buffer -1"
-ctrl-R = "/input search_text"
-ctrl-Sctrl-U = "/input set_unread"
-ctrl-T = "/input transpose_chars"
-ctrl-U = "/input delete_beginning_of_line"
-ctrl-W = "/input delete_previous_word"
-ctrl-X = "/input switch_active_buffer"
-ctrl-Y = "/input clipboard_paste"
-meta-meta-OP = "/bar scroll buflist * b"
-meta-meta-OQ = "/bar scroll buflist * e"
-meta-meta2-1~ = "/window scroll_top"
-meta-meta2-23~ = "/bar scroll nicklist * yb"
-meta-meta2-24~ = "/bar scroll nicklist * ye"
-meta-meta2-4~ = "/window scroll_bottom"
-meta-meta2-5~ = "/window scroll_up"
-meta-meta2-6~ = "/window scroll_down"
-meta-meta2-7~ = "/window scroll_top"
-meta-meta2-8~ = "/window scroll_bottom"
-meta-meta2-A = "/buffer -1"
-meta-meta2-B = "/buffer +1"
-meta-meta2-C = "/buffer +1"
-meta-meta2-D = "/buffer -1"
-meta-0 = "/buffer *10"
-meta-1 = "/buffer *1"
-meta-2 = "/buffer *2"
-meta-3 = "/buffer *3"
-meta-4 = "/buffer *4"
-meta-5 = "/buffer *5"
-meta-6 = "/buffer *6"
-meta-7 = "/buffer *7"
-meta-8 = "/buffer *8"
-meta-9 = "/buffer *9"
-meta-< = "/input jump_previously_visited_buffer"
-meta-= = "/filter toggle"
-meta-> = "/input jump_next_visited_buffer"
-meta-OA = "/input history_global_previous"
-meta-OB = "/input history_global_next"
-meta-OC = "/input move_next_word"
-meta-OD = "/input move_previous_word"
-meta-OF = "/input move_end_of_line"
-meta-OH = "/input move_beginning_of_line"
-meta-OP = "/bar scroll buflist * -100%"
-meta-OQ = "/bar scroll buflist * +100%"
-meta-Oa = "/input history_global_previous"
-meta-Ob = "/input history_global_next"
-meta-Oc = "/input move_next_word"
-meta-Od = "/input move_previous_word"
-meta2-15~ = "/buffer -1"
-meta2-17~ = "/buffer +1"
-meta2-18~ = "/window -1"
-meta2-19~ = "/window +1"
-meta2-1;3A = "/buffer -1"
-meta2-1;3B = "/buffer +1"
-meta2-1;3C = "/buffer +1"
-meta2-1;3D = "/buffer -1"
-meta2-1;5A = "/input history_global_previous"
-meta2-1;5B = "/input history_global_next"
-meta2-1~ = "/input move_beginning_of_line"
-meta2-20~ = "/bar scroll title * x-50%"
-meta2-21~ = "/bar scroll title * x+50%"
-meta2-23~ = "/bar scroll nicklist * y-100%"
-meta2-24~ = "/bar scroll nicklist * y+100%"
-meta2-3~ = "/input delete_next_char"
-meta2-4~ = "/input move_end_of_line"
-meta2-5;3~ = "/window scroll_up"
-meta2-5~ = "/window page_up"
-meta2-6;3~ = "/window scroll_down"
-meta2-6~ = "/window page_down"
-meta2-7~ = "/input move_beginning_of_line"
-meta2-8~ = "/input move_end_of_line"
-meta2-A = "/input history_previous"
-meta2-B = "/input history_next"
-meta2-C = "/input move_next_char"
-meta2-D = "/input move_previous_char"
-meta2-F = "/input move_end_of_line"
-meta2-G = "/window page_down"
-meta2-H = "/input move_beginning_of_line"
-meta2-I = "/window page_up"
-meta2-Z = "/input complete_previous"
-meta-_ = "/input redo"
-meta-a = "/input jump_smart"
-meta-b = "/input move_previous_word"
-meta-d = "/input delete_next_word"
-meta-f = "/input move_next_word"
-meta-h = "/input hotlist_clear"
-meta-jmeta-l = "/input jump_last_buffer"
-meta-jmeta-r = "/server raw"
-meta-jmeta-s = "/server jump"
-meta-j01 = "/buffer 1"
-meta-j02 = "/buffer 2"
-meta-j03 = "/buffer 3"
-meta-j04 = "/buffer 4"
-meta-j05 = "/buffer 5"
-meta-j06 = "/buffer 6"
-meta-j07 = "/buffer 7"
-meta-j08 = "/buffer 8"
-meta-j09 = "/buffer 9"
-meta-j10 = "/buffer 10"
-meta-j11 = "/buffer 11"
-meta-j12 = "/buffer 12"
-meta-j13 = "/buffer 13"
-meta-j14 = "/buffer 14"
-meta-j15 = "/buffer 15"
-meta-j16 = "/buffer 16"
-meta-j17 = "/buffer 17"
-meta-j18 = "/buffer 18"
-meta-j19 = "/buffer 19"
-meta-j20 = "/buffer 20"
-meta-j21 = "/buffer 21"
-meta-j22 = "/buffer 22"
-meta-j23 = "/buffer 23"
-meta-j24 = "/buffer 24"
-meta-j25 = "/buffer 25"
-meta-j26 = "/buffer 26"
-meta-j27 = "/buffer 27"
-meta-j28 = "/buffer 28"
-meta-j29 = "/buffer 29"
-meta-j30 = "/buffer 30"
-meta-j31 = "/buffer 31"
-meta-j32 = "/buffer 32"
-meta-j33 = "/buffer 33"
-meta-j34 = "/buffer 34"
-meta-j35 = "/buffer 35"
-meta-j36 = "/buffer 36"
-meta-j37 = "/buffer 37"
-meta-j38 = "/buffer 38"
-meta-j39 = "/buffer 39"
-meta-j40 = "/buffer 40"
-meta-j41 = "/buffer 41"
-meta-j42 = "/buffer 42"
-meta-j43 = "/buffer 43"
-meta-j44 = "/buffer 44"
-meta-j45 = "/buffer 45"
-meta-j46 = "/buffer 46"
-meta-j47 = "/buffer 47"
-meta-j48 = "/buffer 48"
-meta-j49 = "/buffer 49"
-meta-j50 = "/buffer 50"
-meta-j51 = "/buffer 51"
-meta-j52 = "/buffer 52"
-meta-j53 = "/buffer 53"
-meta-j54 = "/buffer 54"
-meta-j55 = "/buffer 55"
-meta-j56 = "/buffer 56"
-meta-j57 = "/buffer 57"
-meta-j58 = "/buffer 58"
-meta-j59 = "/buffer 59"
-meta-j60 = "/buffer 60"
-meta-j61 = "/buffer 61"
-meta-j62 = "/buffer 62"
-meta-j63 = "/buffer 63"
-meta-j64 = "/buffer 64"
-meta-j65 = "/buffer 65"
-meta-j66 = "/buffer 66"
-meta-j67 = "/buffer 67"
-meta-j68 = "/buffer 68"
-meta-j69 = "/buffer 69"
-meta-j70 = "/buffer 70"
-meta-j71 = "/buffer 71"
-meta-j72 = "/buffer 72"
-meta-j73 = "/buffer 73"
-meta-j74 = "/buffer 74"
-meta-j75 = "/buffer 75"
-meta-j76 = "/buffer 76"
-meta-j77 = "/buffer 77"
-meta-j78 = "/buffer 78"
-meta-j79 = "/buffer 79"
-meta-j80 = "/buffer 80"
-meta-j81 = "/buffer 81"
-meta-j82 = "/buffer 82"
-meta-j83 = "/buffer 83"
-meta-j84 = "/buffer 84"
-meta-j85 = "/buffer 85"
-meta-j86 = "/buffer 86"
-meta-j87 = "/buffer 87"
-meta-j88 = "/buffer 88"
-meta-j89 = "/buffer 89"
-meta-j90 = "/buffer 90"
-meta-j91 = "/buffer 91"
-meta-j92 = "/buffer 92"
-meta-j93 = "/buffer 93"
-meta-j94 = "/buffer 94"
-meta-j95 = "/buffer 95"
-meta-j96 = "/buffer 96"
-meta-j97 = "/buffer 97"
-meta-j98 = "/buffer 98"
-meta-j99 = "/buffer 99"
-meta-k = "/input grab_key_command"
-meta-n = "/window scroll_next_highlight"
-meta-p = "/window scroll_previous_highlight"
-meta-r = "/input delete_line"
-meta-t = "/bar toggle buflist"
-meta-u = "/input scroll_unread"
-meta-wmeta-meta2-A = "/window up"
-meta-wmeta-meta2-B = "/window down"
-meta-wmeta-meta2-C = "/window right"
-meta-wmeta-meta2-D = "/window left"
-meta-wmeta2-1;3A = "/window up"
-meta-wmeta2-1;3B = "/window down"
-meta-wmeta2-1;3C = "/window right"
-meta-wmeta2-1;3D = "/window left"
-meta-wmeta-b = "/window balance"
-meta-wmeta-s = "/window swap"
-meta-z = "/window zoom"
-ctrl-_ = "/input undo"
-
-[key_search]
-ctrl-J = "/input search_stop"
-ctrl-M = "/input search_stop"
-ctrl-R = "/input search_switch_case"
-meta2-A = "/input search_previous"
-meta2-B = "/input search_next"
-
-[key_cursor]
-ctrl-J = "/cursor stop"
-ctrl-M = "/cursor stop"
-meta-meta2-A = "/cursor move area_up"
-meta-meta2-B = "/cursor move area_down"
-meta-meta2-C = "/cursor move area_right"
-meta-meta2-D = "/cursor move area_left"
-meta2-1;3A = "/cursor move area_up"
-meta2-1;3B = "/cursor move area_down"
-meta2-1;3C = "/cursor move area_right"
-meta2-1;3D = "/cursor move area_left"
-meta2-A = "/cursor move up"
-meta2-B = "/cursor move down"
-meta2-C = "/cursor move right"
-meta2-D = "/cursor move left"
-@item(buffer_nicklist):K = "/window ${_window_number};/kickban ${nick}"
-@item(buffer_nicklist):b = "/window ${_window_number};/ban ${nick}"
-@item(buffer_nicklist):k = "/window ${_window_number};/kick ${nick}"
-@item(buffer_nicklist):q = "/window ${_window_number};/query ${nick};/cursor stop"
-@item(buffer_nicklist):w = "/window ${_window_number};/whois ${nick}"
-@chat:Q = "hsignal:chat_quote_time_prefix_message;/cursor stop"
-@chat:m = "hsignal:chat_quote_message;/cursor stop"
-@chat:q = "hsignal:chat_quote_prefix_message;/cursor stop"
-
-[key_mouse]
-@item(buffer_nicklist)>item(buddylist):button1-gesture-* = "hsignal:buddylist_mouse"
-@chat(*)>item(buddylist):button1-gesture-* = "hsignal:buddylist_mouse"
-@bar(buffers):ctrl-wheeldown = "hsignal:buffers_mouse"
-@bar(buffers):ctrl-wheelup = "hsignal:buffers_mouse"
-@bar(buflist):ctrl-wheeldown = "hsignal:buflist_mouse"
-@bar(buflist):ctrl-wheelup = "hsignal:buflist_mouse"
-@bar(input):button2 = "/input grab_mouse_area"
-@bar(nicklist):button1-gesture-down = "/bar scroll nicklist ${_window_number} +100%"
-@bar(nicklist):button1-gesture-down-long = "/bar scroll nicklist ${_window_number} e"
-@bar(nicklist):button1-gesture-up = "/bar scroll nicklist ${_window_number} -100%"
-@bar(nicklist):button1-gesture-up-long = "/bar scroll nicklist ${_window_number} b"
-@chat(fset.fset):button1 = "/window ${_window_number};/fset -go ${_chat_line_y}"
-@chat(fset.fset):button2* = "hsignal:fset_mouse"
-@chat(fset.fset):wheeldown = "/fset -down 5"
-@chat(fset.fset):wheelup = "/fset -up 5"
-@chat(perl.iset):button1 = "hsignal:iset_mouse"
-@chat(perl.iset):button2* = "hsignal:iset_mouse"
-@chat(perl.iset):wheeldown = "/repeat 5 /iset **down"
-@chat(perl.iset):wheelup = "/repeat 5 /iset **up"
-@chat(script.scripts):button1 = "/window ${_window_number};/script go ${_chat_line_y}"
-@chat(script.scripts):button2 = "/window ${_window_number};/script go ${_chat_line_y};/script installremove -q ${script_name_with_extension}"
-@chat(script.scripts):wheeldown = "/script down 5"
-@chat(script.scripts):wheelup = "/script up 5"
-@item(buddylist):button1* = "hsignal:buddylist_mouse"
-@item(buddylist):button1-gesture-* = "hsignal:buddylist_mouse"
-@item(buffer_nicklist):button1 = "/window ${_window_number};/query ${nick}"
-@item(buffer_nicklist):button1-gesture-left = "/window ${_window_number};/kick ${nick}"
-@item(buffer_nicklist):button1-gesture-left-long = ""/window ${_window_number};/kickban"
-@item(buffer_nicklist):button2 = "/window ${_window_number};/whois ${nick}"
-@item(buffer_nicklist):button2-gesture-left = "/window ${_window_number};/ban ${nick}"
-@item(buffers):button1* = "hsignal:buffers_mouse"
-@item(buffers):button2 = "hsignal:buffers_mouse"
-@item(buffers):button2* = "hsignal:buffers_mouse"
-@item(buflist):button1* = "hsignal:buflist_mouse"
-@item(buflist):button2* = "hsignal:buflist_mouse"
-@item(buflist2):button1* = "hsignal:buflist_mouse"
-@item(buflist2):button2* = "hsignal:buflist_mouse"
-@item(buflist3):button1* = "hsignal:buflist_mouse"
-@item(buflist3):button2* = "hsignal:buflist_mouse"
-@bar:wheeldown = "/bar scroll ${_bar_name} ${_window_number} +20%"
-@bar:wheelup = "/bar scroll ${_bar_name} ${_window_number} -20%"
-@chat:button1 = "/window ${_window_number}"
-@chat:button1-gesture-left = "/window ${_window_number};/buffer -1"
-@chat:button1-gesture-left-long = "/window ${_window_number};/buffer 1"
-@chat:button1-gesture-right = "/window ${_window_number};/buffer +1"
-@chat:button1-gesture-right-long = "/window ${_window_number};/input jump_last_buffer"
-@chat:wheeldown = "/window scroll_down -window ${_window_number}"
-@chat:wheelup = "/window scroll_up -window ${_window_number}"
-@*:button3 = "/cursor go ${_x},${_y}"
diff --git a/.xinitrc b/.xinitrc
deleted file mode 100644
index 3759025..0000000
--- a/.xinitrc
+++ /dev/null
@@ -1,24 +0,0 @@
-#!/bin/sh
-
-userresources=$HOME/.Xresources
-usermodmap=$HOME/.Xmodmap
-
-if [ -f $sysresources ]; then
-    xrdb -merge $userresources
-fi
-
-if [ -f "$usermodmap" ]; then
-    xmodmap "$usermodmap"
-fi
-
-xset +fp $HOME/.fonts/
-exec redshift &
-$HOME/bin/dwmstatus &
-setroot -f $HOME/Pictures/Wallpapers/31.jpg
-while true; do
-    # Log stderror to a file
-    dwm 2> /tmp/dwm.log
-    # No error logging
-    #dwm >/dev/null 2>&1
-done
-
diff --git a/.zshrc b/.zshrc
new file mode 100644
index 0000000..ef3b403
--- /dev/null
+++ b/.zshrc
@@ -0,0 +1,47 @@
+export SHELL=/bin/zsh
+export PAGER=less
+export EDITOR=nvim
+export BROWSER=firefox
+export BROWSERCLI=w3m
+export READER=zathura
+export IMAGEVIEWER=feh
+export VIDEOPLAYER=mpv
+export GOPATH=$HOME/.go
+export GOROOT=/usr/local/go
+export PATH=$PATH:$HOME/.bin:$HOME/.bin/ascii:$HOME/.local/bin:$GOPATH/bin:$GOROOT/bin:/snap/bin
+export ZSH=$HOME/.oh-my-zsh
+
+# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes
+ZSH_THEME='spaceship'
+plugins=(git zsh-autosuggestions zsh-syntax-highlighting)
+
+HISTTIMEFORMAT=" [%Y-%m-%d %H:%M:%S] "
+SPACESHIP_TIME_SHOW=true
+SPACESHIP_KUBECTL_SHOW=true
+SPACESHIP_KUBECONTEXT_SHOW=true
+SPACESHIP_KUBECTL_VERSION_SHOW=false
+SPACESHIP_TERRAFORM_SHOW=true
+SPACESHIP_PROMP_ORDER=(
+    time
+    dir
+    git
+    line_sep
+    battery
+    jobs
+    char
+    kubernetes
+    terraform
+)
+
+export UPDATE_ZSH_DAYS=13
+export FZF_DEFAULT_OPTS='--no-height --no-reverse'
+export FZF_CTRL_T_OPTS="--preview '(highlight -O ansi -l {} 2> /dev/null || cat {} || tree -C {}) 2> /dev/null | head -200'"
+export FZF_DEFAULT_COMMAND="find . -path '*/\.*' -type d -prune -o -type f -print -o -type l -print 2> /dev/null | sed s/^..// | fzf"
+export FZF_CTRL_R_OPTS="--preview 'echo {}' --preview-window down:3:hidden:wrap --bind '?:toggle-preview'"
+export FZF_DEFAULT_COMMAND='ag --hidden --ignore .git -g ""'
+
+source $ZSH/oh-my-zsh.sh
+source $HOME/.aliases
+source $HOME/.fubectl.source
+[ -f ~/.fzf.zsh ] && source ~/.fzf.zsh
+
diff --git a/README.md b/README.md
deleted file mode 100644
index 8d4e8f5..0000000
--- a/README.md
+++ /dev/null
@@ -1,55 +0,0 @@
-<p align="center">
-    <img src="https://github.com/Valeyard1/dotfiles/blob/master/dotfiles.png" align="center">
-</p>
-
-![Alt text](https://github.com/Valeyard1/dotfiles/blob/master/scrot.png "scrot") <br />
-
-
-## Setup
-
-### CLI
-
-- **newsboat**: RSS feed reader for text terminals.
-- **mutt**: Fast and secure text-based mail client.
-- **weechat**: IRC client.
-- **ranger**: A vim-like & lightweight file manager.
-- **mksh**: An alternative shell to bash, MirBSD Korn Shell.
-- **tmux**: A terminal multiplexer.
-- **vim**: Highly configurable text editor, I'm using with no plugins, only vanilla vim.
-- **transmission-remote-cli**: Curses interface for the daemon of the BitTorrent client Transmission.
-- **scrot**: Minimalist screen capture.
-- **youtube-dl**: Open source program to download videos from YouTube.
-- **surfraw**: Fast search engine from CLI.
-- **kpcli**: Command Line password manager for KeePass.
-- **cmus**: Music player.
-
-### GUI
-
-- **Pale Moon**: The only browser that's fast and doesn't consume so much memory.
-- **dunst**: Lightweight notification-daemon.
-- **zathura**: Minimalistic and highly customizable document viewer.
-- **sxiv**: Lightweight and powerful image viewer.
-- **mpv**: A free software command line video player highly customizable.
-
-## Info
-
-- Distro: `Void Linux`
-- Window Manager: `dwm`
-- Bar: `dwm custom bar`
-- Terminal Emulator: `st`
-- Editor: `vim`
-- Font: `Hack`
-
-##
-
-My dotfiles are managed with a bare repository. I used to store my dots with gnu stow, but it causes some things I don't want to, so I'm trying to give it a try. Here are some links explaining a bare repo:
-* [The best way to store your dotfiles: A bare Git repository](https://developer.atlassian.com/blog/2016/02/best-way-to-store-dotfiles-git-bare-repo/)
-* [Manage Dotfiles With a Bare Git Repository](https://harfangk.github.io/2016/09/18/manage-dotfiles-with-a-git-bare-repository.html)
-
-Posts about managing with GNU stow:
-* [Managing dotfiles with GNU stow](http://blog.xero.nu/managing_dotfiles_with_gnu_stow)
-* [Using GNU stow to manage your dotfiles](http://brandon.invergo.net/news/2012-05-26-using-gnu-stow-to-manage-your-dotfiles.html)
-* [Dotfile management with GNU stow](https://jonleopard.com/dotfile-management-with-gnu-stow/)
-* [Using GNU stow with your dotfiles](https://protesilaos.com/codelog/gnu-stow-dotfiles/)
-
-Interesting read: [Why share your dotfiles](https://zachholman.com/2010/08/dotfiles-are-meant-to-be-forked/)
diff --git a/dotfiles.png b/dotfiles.png
deleted file mode 100644
index 3866306..0000000
Binary files a/dotfiles.png and /dev/null differ
diff --git a/install.sh b/install.sh
new file mode 100755
index 0000000..c6c7429
--- /dev/null
+++ b/install.sh
@@ -0,0 +1,152 @@
+#!/bin/sh
+
+# requirements: curl, git, ansible, python
+
+info() {
+    # shellcheck disable=SC2059
+    printf "\r  [ \033[00;34m..\033[0m ] $1\n"
+}
+
+user() {
+    # shellcheck disable=SC2059
+    printf "\r  [ \033[0;33m??\033[0m ] $1\n"
+}
+
+success() {
+    # shellcheck disable=SC2059
+    printf "\r\033[2K  [ \033[00;32mOK\033[0m ] $1\n"
+}
+
+fail() {
+    # shellcheck disable=SC2059
+    printf "\r\033[2K  [\033[0;31mFAIL\033[0m] $1\n"
+    exit
+}
+
+init() {
+    printf "%s\\n" "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::"
+    printf "%s\\n" ":::::   about:: install autism command line stuff    :::::"
+    printf "%s\\n" ":::::    code:: https://bit.do/autism-sh             :::::"
+    printf "%s\\n" ":::::                ¯\_(ツ)_/¯                      :::::"
+    printf "%s\\n" "::::::::::::::::::::::::::::::::::::::::::::::::::::::::::"
+}
+
+help() {
+    printf "%s\\n\\n" "usage: $0 [options]"
+    printf "%s\\n" "  -a, --autism                 Which branch to clone"
+    printf "%s\\n" "  -z, --zsh                    If set, it will install zsh and make it the default shell"
+    printf "%s\\n" "  -d, --dbeaver                If set, it will install dbeaver"
+    printf "%s\\n" "  -D, --devops                 If set, it will install devops tools and clients"
+    printf "%s\\n\\n" "  -h, --help, help             Show this message"
+}
+
+check_dependences() {
+    if ! [ -x "$(command -v git)" ]; then
+        fail "[ git ] not found, make sure it's installed"
+    fi
+
+    if ! [ -x "$(command -v ansible)" ]; then
+        fail "[ ansible ] not found, make sure it's installed"
+    fi
+
+    if ! [ -x "$(command -v python3)" ]; then
+        fail "[ python ] not found, make sure it's installed"
+    fi
+}
+
+dotfiles() {
+    /usr/bin/git --git-dir="$HOME/.dotfiles.git/" --work-tree="$HOME" "$@"
+}
+clone_dotfiles() {
+    if [ -d "$HOME/.dotfiles.git" ]; then
+        fail "There is already a dotfiles installed! Backup it first."
+    fi
+    info "Cloning dotfiles..."
+    git clone --bare https://github.com/Valeyard1/dotfiles.git "$HOME/.dotfiles.git" >/dev/null 2>&1
+    if [ "$?" -ne 0 ]; then
+        fail "Erro ao clonar o repositório"
+    fi
+
+    echo ".dotfiles.git" >> .gitignore
+    mkdir -p .dotfiles-backup && dotfiles checkout "$1" 2>&1 | grep -E "\\s+\\." | awk '{print $1}' | xargs -I{} mv {} .dotfiles-backup/{};
+    dotfiles checkout "$1"
+    dotfiles config --local status.showUntrackedFiles no
+}
+
+init
+while [ $# -gt 0 ]; do
+    case $1 in
+        -a | --autism)
+            autism=$2
+            if [ "$autism" != "master" ] && [ "$autism" != "low" ]; then
+                fail "Provide a valid autism level"
+            fi
+            if [ "$autism" = "master" ]; then
+                success "Great Level :D"
+            fi
+            if [ "$autism" = "low" ]; then
+                success "It's not the ideal level but it happens :("
+            fi
+            shift
+            ;;
+        -d | --dbeaver)
+            dbeaver=true
+            ;;
+        -z | --zsh)
+            zsh=true
+            ;;
+        -D | --devops)
+            devops=true
+            ;;
+        -h | --help | help)
+            help
+            exit
+            ;;
+        *)
+            printf "%s\\n" "$0: invalid option -- '$1'"
+            printf "%s\\n" "Try '$0 --help' for more information."
+            ;;
+    esac
+    shift
+done
+
+# Set defaults if not set
+if [ -z "$autism" ]; then
+    autism=master
+fi
+if [ -z "$dbeaver" ]; then
+    dbeaver=false
+fi
+if [ -z "$zsh" ]; then
+    zsh=false
+fi
+if [ -z "$devops" ]; then
+    devops=false
+fi
+
+#
+# Set up SSH keys
+#
+#if ! [ -f "$HOME/.ssh/id_rsa" ]; then
+#    fail "Place your SSH key in ~/.ssh/id_rsa"
+#fi
+
+check_dependences
+
+clone_dotfiles $autism
+
+ansible-playbook --ask-become-pass -i "$HOME/src/ansible/hosts" "$HOME/src/ansible/main.yml" -e autism="$autism" -e zsh="$zsh" -e dbeaver="$dbeaver" -e devops="$devops"
+if [ "$?" -eq 0 ]; then
+    success "Finished! Log in again to make sure everything is working..."
+else
+    fail "Fail"
+fi
+
+# source .aliases after installing everything
+if [ "$autism" = "low" ]; then
+    . "$HOME/.aliases"
+elif [ "$autism" = "master" ]; then
+    . "$HOME/usr/.aliases"
+    xdg-dirs-update
+fi
+
diff --git a/requirements.txt b/requirements.txt
deleted file mode 100644
index d6eb1b8..0000000
--- a/requirements.txt
+++ /dev/null
@@ -1,54 +0,0 @@
-bc
-clang
-curl
-dejavu-fonts-ttf
-dunst
-fzf
-git
-hsetroot
-jq
-lemonbar
-less
-make
-mesa-ati-dri
-mksh
-mpv
-ncurses
-neomutt
-newsboat
-pandoc
-polybar
-ranger
-scrot
-surfraw
-sxiv
-tar
-tmux
-transmission-common transmission-daemon transmission-remote-cli
-unzip
-urlview
-vim-x11
-weechat
-wget
-xauth
-xclip
-xclip
-xf86-input-libinput
-xfontsel
-xinit
-xmodmap
-xprop
-xrdb
-xrdb
-xset
-xset
-xst
-xz
-youtube-dl
-zathura
-xauth
-xf86-input-libinput
-xinit
-xorg-server
-libXfont2
-wmctrl
diff --git a/scrot.png b/scrot.png
deleted file mode 100644
index cb08c19..0000000
Binary files a/scrot.png and /dev/null differ
diff --git a/src/ansible/README.md b/src/ansible/README.md
new file mode 100644
index 0000000..3e56ed0
--- /dev/null
+++ b/src/ansible/README.md
@@ -0,0 +1,2 @@
+- `roles/packages/install_*.yml`: install packages existent on distros
+- `roles/packages/{Fedora,ubuntu}`: install packages adding them to the repository manually
diff --git a/src/ansible/ansible.cfg b/src/ansible/ansible.cfg
new file mode 100644
index 0000000..02f65a4
--- /dev/null
+++ b/src/ansible/ansible.cfg
@@ -0,0 +1,6 @@
+[defaults]
+host_key_checking = False
+ansible_python_interpreter=/usr/bin/python3
+
+[ssh_connection]
+ssh_args = -o ForwardAgent=yes
diff --git a/src/ansible/hosts b/src/ansible/hosts
new file mode 100644
index 0000000..c1a345d
--- /dev/null
+++ b/src/ansible/hosts
@@ -0,0 +1 @@
+localhost ansible_connection=local ansible_python_interpreter=/usr/bin/python3
diff --git a/src/ansible/main.yml b/src/ansible/main.yml
new file mode 100644
index 0000000..6899e26
--- /dev/null
+++ b/src/ansible/main.yml
@@ -0,0 +1,6 @@
+---
+- hosts: localhost
+
+  roles:
+    - packages
+    - { role: link, when: autism == "master" }
diff --git a/src/ansible/roles/link/tasks/fix_paths.yml b/src/ansible/roles/link/tasks/fix_paths.yml
new file mode 100644
index 0000000..5eb6ca7
--- /dev/null
+++ b/src/ansible/roles/link/tasks/fix_paths.yml
@@ -0,0 +1,26 @@
+---
+- name: Make symbolic link of SHELL configuration files
+  file:
+    src: $HOME/etc/{{ item }}/{{ item }}rc
+    dest: $HOME/.{{ item }}rc
+    state: link
+    force: yes
+  with_items:
+    - zsh
+    - bash
+    - mksh
+
+- name: Make symbolic link of urlview
+  file:
+    src: $HOME/etc/urlview/urlview
+    dest: $HOME/.urlview
+    state: link
+    force: yes
+
+- name: Make symbolic link of gitconfig file
+  file:
+    src: $HOME/etc/git/config
+    dest: $HOME/.gitconfig
+    state: link
+    force: yes
+
diff --git a/src/ansible/roles/link/tasks/main.yml b/src/ansible/roles/link/tasks/main.yml
new file mode 100644
index 0000000..bb3aa62
--- /dev/null
+++ b/src/ansible/roles/link/tasks/main.yml
@@ -0,0 +1,3 @@
+---
+- name: Link files to $HOME
+  import_tasks: fix_paths.yml
diff --git a/src/ansible/roles/packages/tasks/Fedora/install_packages.yml b/src/ansible/roles/packages/tasks/Fedora/install_packages.yml
new file mode 100644
index 0000000..c0b5dd9
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/Fedora/install_packages.yml
@@ -0,0 +1,41 @@
+# Specif Fedora packages to install (yum)
+
+- name: Add Visual Studio Code to repo on Fedora
+  become: yes
+  yum_repository:
+    name: code
+    description: Visual Studio Code
+    file: vscode
+    baseurl: https://packages.microsoft.com/yumrepos/vscode
+    gpgkey: https://packages.microsoft.com/keys/microsoft.asc
+    gpgcheck: no
+
+- name: Install Visual Studio Code on Fedora
+  become: yes
+  yum:
+    name: code
+    state: present
+
+- name: Install DBeaver on Fedora
+  become: yes
+  yum:
+    name: https://dbeaver.io/files/dbeaver-ce-latest-stable.x86_64.rpm
+    state: present
+  when: dbeaver is defined and dbeaver == "true"
+
+- name: Add Google Cloud SDK repo
+  become: yes
+  yum_repository:
+    name: google-cloud-sdk
+    description: Google Cloud SDK
+    file: gcloud
+    baseurl: https://packages.cloud.google.com/yum/repos/cloud-sdk-el7-x86_64
+    gpgkey: https://packages.cloud.google.com/yum/doc/yum-key.gpg
+    gpgcheck: yes
+    repo_gpgcheck: yes
+
+- name: Install gcloud client
+  become: yes
+  yum:
+    name: google-cloud-sdk
+    state: present
\ No newline at end of file
diff --git a/src/ansible/roles/packages/tasks/Ubuntu/install_packages.yml b/src/ansible/roles/packages/tasks/Ubuntu/install_packages.yml
new file mode 100644
index 0000000..581ecf4
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/Ubuntu/install_packages.yml
@@ -0,0 +1,9 @@
+---
+- name: Install VSCode on Ubuntu
+  become: yes
+  shell: snap install --classic code
+
+- name: Install DBeaver on Ubuntu
+  become: yes
+  shell: snap install --edge dbeaver-ce
+  when: dbeaver == "true"
diff --git a/src/ansible/roles/packages/tasks/commons/install_development.yml b/src/ansible/roles/packages/tasks/commons/install_development.yml
new file mode 100644
index 0000000..97f2e78
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/commons/install_development.yml
@@ -0,0 +1,11 @@
+---
+- include_vars: " {{ item }}"
+  with_first_found:
+    - "../../vars/{{ ansible_distribution }}/packages_development.yml"
+
+- name: Install development related packages on {{ ansible_distribution }}
+  become: yes
+  package:
+    name: "{{ pkg }}"
+    state: present
+
diff --git a/src/ansible/roles/packages/tasks/commons/install_devops.yml b/src/ansible/roles/packages/tasks/commons/install_devops.yml
new file mode 100644
index 0000000..f0670ef
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/commons/install_devops.yml
@@ -0,0 +1,38 @@
+---
+- include_vars: " {{ item }}"
+  with_first_found:
+    - "../../vars/{{ ansible_distribution }}/packages_devops.yml"
+
+- name: Install Devops packages on {{ ansible_distribution }}
+  become: yes
+  package:
+    name: "{{ pkg }}"
+    state: present
+
+- name: Install Helm v3 client
+  become: yes
+  unarchive:
+    src: https://get.helm.sh/helm-v3.0.3-linux-amd64.tar.gz
+    dest: /usr/local/bin
+    extra_opts:
+    - --strip=1
+    - --wildcards
+    - '*/helm'
+    remote_src: True
+
+- name: Install k9s client
+  become: yes
+  unarchive:
+    src: https://github.com/derailed/k9s/releases/download/v0.13.6/k9s_0.13.6_Linux_x86_64.tar.gz
+    dest: /usr/local/bin
+    extra_opts:
+    - --wildcards
+    - 'k9s'
+    remote_src: True
+
+- name: Install Azure/AWS cli clients
+  pip:
+    name:
+      - azure-cli
+      - awscli
+    extra_args: --user
diff --git a/src/ansible/roles/packages/tasks/commons/install_misc.yml b/src/ansible/roles/packages/tasks/commons/install_misc.yml
new file mode 100644
index 0000000..1122a04
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/commons/install_misc.yml
@@ -0,0 +1,11 @@
+---
+- include_vars: " {{ item }}"
+  with_first_found:
+    - "../../vars/{{ ansible_distribution }}/packages_misc.yml"
+
+- name: Install all misc packages on {{ ansible_distribution }}
+  become: yes
+  package:
+    name: "{{ pkg }}"
+    state: present
+
diff --git a/src/ansible/roles/packages/tasks/commons/install_networking.yml b/src/ansible/roles/packages/tasks/commons/install_networking.yml
new file mode 100644
index 0000000..2e2eb49
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/commons/install_networking.yml
@@ -0,0 +1,11 @@
+---
+- include_vars: " {{ item }}"
+  with_first_found:
+    - "../../vars/{{ ansible_distribution }}/packages_networking.yml"
+
+- name: Install networking related packages on {{ ansible_distribution }}
+  become: yes
+  package:
+    name: "{{ pkg }}"
+    state: present
+
diff --git a/src/ansible/roles/packages/tasks/main.yml b/src/ansible/roles/packages/tasks/main.yml
new file mode 100644
index 0000000..a9fe5b7
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/main.yml
@@ -0,0 +1,25 @@
+---
+- name: Install networking packages
+  import_tasks: commons/install_networking.yml
+
+- name: Install all other packages
+  import_tasks: commons/install_misc.yml
+
+- name: Install VSCode, Dbeaver, Telegram and gcloud
+  import_tasks: Fedora/install_packages.yml
+  when: ansible_distribution == "Fedora"
+
+- name: Install programming packages
+  import_tasks: commons/install_development.yml
+
+- name: Install VSCode & DBeaver
+  import_tasks: Ubuntu/install_packages.yml
+  when: ansible_distribution == "Ubuntu"
+
+- name: Install zsh
+  import_tasks: zsh/install.yml
+  when: zsh is defined and zsh == "true"
+
+- name: Install devops packages
+  import_tasks: commons/install_devops.yml
+  when: devops is defined and devops == "true"
diff --git a/src/ansible/roles/packages/tasks/zsh/install.yml b/src/ansible/roles/packages/tasks/zsh/install.yml
new file mode 100644
index 0000000..a265959
--- /dev/null
+++ b/src/ansible/roles/packages/tasks/zsh/install.yml
@@ -0,0 +1,13 @@
+---
+
+- name: Clone oh-my-zsh
+  git:
+    dest: ~/.oh-my-zsh # required. The path of where the repository should be checked out. This parameter is required, unless C(clone) is set to C(no).
+    repo: https://github.com/robbyrussell/oh-my-zsh.git # required. git, SSH, or HTTP(S) protocol address of the git repository.
+    depth: 1
+
+- name: Set the default shell to zsh
+  become: yes
+  user:
+    name: "{{ ansible_user_id }}"
+    shell: /bin/zsh
diff --git a/src/ansible/roles/packages/vars/Fedora/packages_development.yml b/src/ansible/roles/packages/vars/Fedora/packages_development.yml
new file mode 100644
index 0000000..9c1d397
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Fedora/packages_development.yml
@@ -0,0 +1,6 @@
+pkg:
+  - vim-X11
+  - golang
+  - python3
+  - python3-pip
+  - python3-devel
\ No newline at end of file
diff --git a/src/ansible/roles/packages/vars/Fedora/packages_devops.yml b/src/ansible/roles/packages/vars/Fedora/packages_devops.yml
new file mode 100644
index 0000000..3c18846
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Fedora/packages_devops.yml
@@ -0,0 +1,7 @@
+# related devops packages
+pkg:
+  - docker
+  - docker-compose
+  - kompose
+  - kubernetes-client
+  - openvpn
\ No newline at end of file
diff --git a/src/ansible/roles/packages/vars/Fedora/packages_misc.yml b/src/ansible/roles/packages/vars/Fedora/packages_misc.yml
new file mode 100644
index 0000000..f19f5b4
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Fedora/packages_misc.yml
@@ -0,0 +1,14 @@
+pkg:
+  - make
+  - mksh
+  - pandoc
+  - tmux
+  - transmission
+  - urlview
+  - weechat
+  - xclip
+  - youtube-dl
+  - ImageMagick
+  - redshift
+  - keepassxc
+  
diff --git a/src/ansible/roles/packages/vars/Fedora/packages_networking.yml b/src/ansible/roles/packages/vars/Fedora/packages_networking.yml
new file mode 100644
index 0000000..2379522
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Fedora/packages_networking.yml
@@ -0,0 +1,11 @@
+pkg:
+  - arp-scan
+  - nmap
+  - rsync
+  - nmap
+  - strace
+  - traceroute
+  - bind-utils
+  - telnet
+  - nc
+  - iputils
\ No newline at end of file
diff --git a/src/ansible/roles/packages/vars/Ubuntu/packages_development.yml b/src/ansible/roles/packages/vars/Ubuntu/packages_development.yml
new file mode 100644
index 0000000..40ce944
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Ubuntu/packages_development.yml
@@ -0,0 +1,7 @@
+pkg:
+  - vim
+  - neovim
+  - golang
+  - python3
+  - python3-pip
+  - python3-dev
diff --git a/src/ansible/roles/packages/vars/Ubuntu/packages_devops.yml b/src/ansible/roles/packages/vars/Ubuntu/packages_devops.yml
new file mode 100644
index 0000000..5536bda
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Ubuntu/packages_devops.yml
@@ -0,0 +1,6 @@
+# related devops packages
+pkg:
+  - openvpn
+  - docker
+  - docker.io
+  - docker-compose
\ No newline at end of file
diff --git a/src/ansible/roles/packages/vars/Ubuntu/packages_misc.yml b/src/ansible/roles/packages/vars/Ubuntu/packages_misc.yml
new file mode 100644
index 0000000..5a936df
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Ubuntu/packages_misc.yml
@@ -0,0 +1,17 @@
+pkg:
+  - snap
+  - make
+  - pandoc
+  - tmux
+  - urlview
+  - weechat
+  - xclip
+  - youtube-dl
+  - imagemagick
+  - redshift
+  - dbus
+  - ffmpeg
+  - telegram-desktop
+  - keepassxc
+  - zsh
+  - snapd
\ No newline at end of file
diff --git a/src/ansible/roles/packages/vars/Ubuntu/packages_networking.yml b/src/ansible/roles/packages/vars/Ubuntu/packages_networking.yml
new file mode 100644
index 0000000..4d36d53
--- /dev/null
+++ b/src/ansible/roles/packages/vars/Ubuntu/packages_networking.yml
@@ -0,0 +1,9 @@
+pkg:
+  - arp-scan
+  - wget
+  - curl
+  - nmap
+  - rsync
+  - telnet
+  - nmap
+  - strace
diff --git a/src/ansible/roles/packages/vars/void/packages_development.yml b/src/ansible/roles/packages/vars/void/packages_development.yml
new file mode 100644
index 0000000..f179e7d
--- /dev/null
+++ b/src/ansible/roles/packages/vars/void/packages_development.yml
@@ -0,0 +1,8 @@
+pkg:
+  - code-oss
+  - sublime-text3
+  - vim-x11
+  - golang
+  - python3
+  - docker
+  - docker-compose
diff --git a/src/ansible/roles/packages/vars/void/packages_misc.yml b/src/ansible/roles/packages/vars/void/packages_misc.yml
new file mode 100644
index 0000000..a1d59fa
--- /dev/null
+++ b/src/ansible/roles/packages/vars/void/packages_misc.yml
@@ -0,0 +1,51 @@
+pkg:
+  - bc
+  - dejavu-fonts-ttf
+  - dunst
+  - git
+  - less
+  - make
+  - mesa-ati-dri
+  - mksh
+  - mpv
+  - neomutt
+  - pandoc
+  - ranger
+  - sxiv
+  - tar
+  - tmux
+  - transmission
+  - transmission-remote-cli
+  - unzip
+  - urlview
+  - weechat
+  - weechat-perl
+  - weechat-python
+  - xauth
+  - xclip
+  - xf86-input-libinput
+  - xfontsel
+  - xmodmap
+  - xprop
+  - xrdb
+  - xset
+  - xst
+  - youtube-dl
+  - zathura
+  - xinit
+  - xorg-server
+  - libXfont2
+  - ImageMagick
+  - redshift
+  - sxhkd
+  - dbus
+  - bspwm
+  - alsa-utils
+  - lemonbar
+  - xdo
+  - i3lock
+  - xsetroot
+  - maim
+  - kpcli
+  - ffmpeg
+  - zathura-pdf-mupdf
diff --git a/src/ansible/roles/packages/vars/void/packages_networking.yml b/src/ansible/roles/packages/vars/void/packages_networking.yml
new file mode 100644
index 0000000..4d36d53
--- /dev/null
+++ b/src/ansible/roles/packages/vars/void/packages_networking.yml
@@ -0,0 +1,9 @@
+pkg:
+  - arp-scan
+  - wget
+  - curl
+  - nmap
+  - rsync
+  - telnet
+  - nmap
+  - strace
diff --git a/suckless/dmenu-4.8/Makefile b/suckless/dmenu-4.8/Makefile
deleted file mode 100644
index c127f6a..0000000
--- a/suckless/dmenu-4.8/Makefile
+++ /dev/null
@@ -1,66 +0,0 @@
-# dmenu - dynamic menu
-# See LICENSE file for copyright and license details.
-
-include config.mk
-
-SRC = dmenu.c draw.c stest.c
-OBJ = ${SRC:.c=.o}
-
-all: options dmenu stest
-
-options:
-	@echo dmenu build options:
-	@echo "CFLAGS   = ${CFLAGS}"
-	@echo "LDFLAGS  = ${LDFLAGS}"
-	@echo "CC       = ${CC}"
-
-.c.o:
-	@echo CC -c $<
-	@${CC} -c $< ${CFLAGS}
-
-${OBJ}: config.mk draw.h
-
-dmenu: dmenu.o draw.o
-	@echo CC -o $@
-	@${CC} -o $@ dmenu.o draw.o ${LDFLAGS}
-
-stest: stest.o
-	@echo CC -o $@
-	@${CC} -o $@ stest.o ${LDFLAGS}
-
-clean:
-	@echo cleaning
-	@rm -f dmenu stest ${OBJ} dmenu-${VERSION}.tar.gz
-
-dist: clean
-	@echo creating dist tarball
-	@mkdir -p dmenu-${VERSION}
-	@cp LICENSE Makefile README config.mk dmenu.1 draw.h dmenu_run stest.1 ${SRC} dmenu-${VERSION}
-	@tar -cf dmenu-${VERSION}.tar dmenu-${VERSION}
-	@gzip dmenu-${VERSION}.tar
-	@rm -rf dmenu-${VERSION}
-
-install: all
-	@echo installing executables to ${DESTDIR}${PREFIX}/bin
-	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dmenu dmenu_run stest ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dmenu_run
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/stest
-	@echo installing manual pages to ${DESTDIR}${MANPREFIX}/man1
-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed "s/VERSION/${VERSION}/g" < dmenu.1 > ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-	@sed "s/VERSION/${VERSION}/g" < stest.1 > ${DESTDIR}${MANPREFIX}/man1/stest.1
-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/stest.1
-
-uninstall:
-	@echo removing executables from ${DESTDIR}${PREFIX}/bin
-	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu
-	@rm -f ${DESTDIR}${PREFIX}/bin/dmenu_run
-	@rm -f ${DESTDIR}${PREFIX}/bin/stest
-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-	@rm -f ${DESTDIR}${MANPREFIX}/man1/dmenu.1
-	@rm -f ${DESTDIR}${MANPREFIX}/man1/stest.1
-
-.PHONY: all options clean dist install uninstall
diff --git a/suckless/dmenu-4.8/config.mk b/suckless/dmenu-4.8/config.mk
deleted file mode 100644
index 9264d2a..0000000
--- a/suckless/dmenu-4.8/config.mk
+++ /dev/null
@@ -1,30 +0,0 @@
-# dmenu2 version
-VERSION = 0.1
-
-# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
-
-X11INC = /usr/X11R6/include
-X11LIB = /usr/X11R6/lib
-
-# Xinerama, comment if you don't want it
-XINERAMALIBS  = -lXinerama
-XINERAMAFLAGS = -DXINERAMA
-
-# Xft, comment if you don't want it
-XFTINC = -I/usr/include/freetype2
-XFTLIBS  = -lXft -lXrender -lfreetype -lz -lfontconfig
-
-# includes and libs
-INCS = -I${X11INC} ${XFTINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${XFTLIBS}
-
-# flags
-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-#CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Os ${INCS} ${CPPFLAGS}
-LDFLAGS  = -s ${LIBS}
-
-# compiler and linker
-CC = cc
diff --git a/suckless/dmenu-4.8/dmenu b/suckless/dmenu-4.8/dmenu
deleted file mode 100755
index e901bd0..0000000
Binary files a/suckless/dmenu-4.8/dmenu and /dev/null differ
diff --git a/suckless/dmenu-4.8/dmenu.1 b/suckless/dmenu-4.8/dmenu.1
deleted file mode 100644
index f60fb32..0000000
--- a/suckless/dmenu-4.8/dmenu.1
+++ /dev/null
@@ -1,242 +0,0 @@
-.TH DMENU 1 dmenu\-VERSION
-.SH NAME
-dmenu \- dynamic menu
-.SH SYNOPSIS
-.B dmenu
-.RB [ \-b ]
-.RB [ \-f ]
-.RB [ \-r ]
-.RB [ \-i ]
-.RB [ \-z ]
-.RB [ \-t ]
-.RB [ \-mask ]
-.RB [ \-noinput ]
-.RB [ \-s
-.IR screen ]
-.RB [ \-name
-.IR name ]
-.RB [ \-class
-.IR class ]
-.RB [ \-o
-.IR opacity ]
-.RB [ \-dim
-.IR opacity ]
-.RB [ \-dc 
-.IR color ]
-.RB [ \-l
-.IR lines ]
-.RB [ \-h
-.IR height ]
-.RB [ \-w
-.IR width ]
-.RB [ \-p
-.IR prompt ]
-.RB [ \-fn
-.IR font ]
-.RB [ \-nb
-.IR color ]
-.RB [ \-nf
-.IR color ]
-.RB [ \-sb
-.IR color ]
-.RB [ \-sf
-.IR color ]
-.RB [ \-v ]
-.P
-.BR dmenu_run " ..."
-.SH DESCRIPTION
-.B dmenu
-is a dynamic menu for X, which reads a list of newline\-separated items from
-stdin.  When the user selects an item and presses Return, their choice is printed
-to stdout and dmenu terminates.  Entering text will narrow the items to those
-matching the tokens in the input.
-.P
-.B dmenu_run
-is a script used by
-.IR dwm (1)
-which lists programs in the user's $PATH and runs the result in their $SHELL.
-.SH OPTIONS
-.TP
-.B \-b
-dmenu appears at the bottom of the screen.
-.TP
-.B \-q
-dmenu will not show any items if the search string is empty.
-.TP
-.B \-f
-dmenu grabs the keyboard before reading stdin.  This is faster, but will lock up
-X until stdin reaches end\-of\-file.
-.TP
-.B \-r 
-activates filter mode. All matching items currently shown in the list will be
-selected, starting with the item that is highlighted and wrapping around to the
-beginning of the list. 
-.TP 
-.B \-i
-dmenu matches menu items case insensitively.
-.TP
-.B \-z
-dmenu uses fuzzy matching. It matches items that have all characters entered, in sequence they are
-entered, but there may be any number of characters between matched characters.
-For example it takes "txt" makes it to "*t*x*t" glob pattern and checks if it
-matches.
-.TP
-.B \-t
-dmenu uses space\-separated tokens to match menu items. Using this overrides -z option.
-.TP
-.B \-mask
-dmenu masks input with asterisk characters (*).
-.TP
-.B \-noinput
-dmenu ignores input from stdin (equivalent to: echo | dmenu).
-.TP
-.BI \-s " screen"
-dmenu apears on the specified screen number. Number given corespondes to screen number in X configuration.
-.TP
-.BI \-name " name"
-defines window name for dmenu. Defaults to "dmenu".
-.TP
-.BI \-class " class"
-defines window class for dmenu. Defaults to "Dmenu".
-.TP
-.BI \-o " opacity"
-defines window opacity for dmenu. Defaults to 1.0.
-.TP
-.BI \-dim " opacity"
-enables screen dimming when dmenu appers. Takes dim opacity as argument.
-.TP 
-.BI \-dc " color"
-defines color of screen dimming. Active only when -dim in effect. Defautls to black (#000000)
-.TP
-.BI \-l " lines"
-dmenu lists items vertically, with the given number of lines.
-.TP
-.BI \-h " height"
-defines the height of the bar in pixels.
-.TP
-.BI \-p " prompt"
-defines the prompt to be displayed to the left of the input field.
-.TP
-.BI \-fn " font"
-defines the font or font set used. eg. "fixed" or "Monospace-12:normal" (an xft font)
-.TP
-.BI \-x " xoffset"
-defines the offset from the left border of the screen.
-.TP
-.BI \-y " yoffset"
-defines the offset from the top border of the screen.
-.TP
-.BI \-w " width"
-defines the desired menu window width.
-.TP
-.BI \-nb " color"
-defines the normal background color.
-.IR #RGB ,
-.IR #RRGGBB ,
-and X color names are supported.
-.TP
-.BI \-nf " color"
-defines the normal foreground color.
-.TP
-.BI \-sb " color"
-defines the selected background color.
-.TP
-.BI \-sf " color"
-defines the selected foreground color.
-.TP
-.B \-v
-prints version information to stdout, then exits.
-.SH USAGE
-dmenu is completely controlled by the keyboard.  Items are selected using the
-arrow keys, page up, page down, home, and end.
-.TP
-.B Tab
-Copy the selected item to the input field.
-.TP
-.B Return
-Confirm selection.  Prints the selected item to stdout and exits, returning
-success.
-.TP
-.B Shift\-Return
-Confirm input.  Prints the input text to stdout and exits, returning success.
-.TP
-.B Escape
-Exit without selecting an item, returning failure.
-.TP
-C\-a
-Home
-.TP
-C\-b
-Left
-.TP
-C\-c
-Escape
-.TP
-C\-d
-Delete
-.TP
-C\-e
-End
-.TP
-C\-f
-Right
-.TP
-C\-g
-Escape
-.TP
-C\-h
-Backspace
-.TP
-C\-i
-Tab
-.TP
-C\-j
-Return
-.TP
-C\-J
-Shift-Return
-.TP
-C\-k
-Delete line right
-.TP
-C\-m
-Return
-.TP
-C\-n
-Down
-.TP
-C\-p
-Up
-.TP
-C\-u
-Delete line left
-.TP
-C\-w
-Delete word left
-.TP
-C\-y
-Paste from primary X selection
-.TP
-C\-Y
-Paste from X clipboard
-.TP
-M\-g
-Home
-.TP
-M\-G
-End
-.TP
-M\-h
-Up
-.TP
-M\-j
-Page down
-.TP
-M\-k
-Page up
-.TP
-M\-l
-Down
-.SH SEE ALSO
-.IR dwm (1),
-.IR stest (1)
diff --git a/suckless/dmenu-4.8/dmenu.c b/suckless/dmenu-4.8/dmenu.c
deleted file mode 100644
index 9c1a41d..0000000
--- a/suckless/dmenu-4.8/dmenu.c
+++ /dev/null
@@ -1,939 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <ctype.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <strings.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xatom.h>
-#include <X11/Xutil.h>
-#include <X11/Xresource.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif
-#include "draw.h"
-
-#define INTERSECT(x,y,w,h,r)  (MAX(0, MIN((x)+(w),(r).x_org+(r).width)  - MAX((x),(r).x_org)) \
-                             * MAX(0, MIN((y)+(h),(r).y_org+(r).height) - MAX((y),(r).y_org)))
-#define MIN(a,b)              ((a) < (b) ? (a) : (b))
-#define MAX(a,b)              ((a) > (b) ? (a) : (b))
-#define DEFFONT "fixed" /* xft example: "Monospace-11" */
-
-typedef struct Item Item;
-struct Item {
-	char *text;
-	Item *left, *right;
-};
-
-static void appenditem(Item *item, Item **list, Item **last);
-static void calcoffsets(void);
-static void cleanup(void);
-static char *cistrstr(const char *s, const char *sub);
-static void drawmenu(void);
-static void grabkeyboard(void);
-static void insert(const char *str, ssize_t n);
-static void keypress(XKeyEvent *ev);
-static void matchstr(void);
-static void matchtok(void);
-static void matchfuzzy(void);
-static char *strchri(const char *s, int c);
-static size_t nextrune(int inc);
-static size_t utf8length();
-static void paste(void);
-static void readstdin(void);
-static void run(void);
-static void setup(void);
-static void usage(void);
-static void read_resourses(void);
-static char text[BUFSIZ] = "";
-static char originaltext[BUFSIZ] = "";
-static int bh, mw, mh;
-static int inputw, promptw;
-static size_t cursor = 0;
-static const char *font = NULL;
-static const char *prompt = NULL;
-static const char *normbgcolor = NULL;
-static const char *normfgcolor = NULL;
-static const char *selbgcolor  = NULL;
-static const char *selfgcolor  = NULL;
-static const char *dimcolor = NULL; 
-static char *name = "dmenu";
-static char *class = "Dmenu";
-static char *dimname = "dimenu";
-static unsigned int lines = 0, line_height = 0;
-static int xoffset = 0;
-static int yoffset = 0;
-static int width = 0;
-#ifdef XINERAMA
-static int snum = -1;
-#endif
-static ColorSet *normcol;
-static ColorSet *selcol;
-static ColorSet *dimcol;
-static Atom clip, utf8;
-static Bool topbar = True;
-static Bool running = True;
-static Bool filter = False;
-static Bool maskin = False;
-static Bool noinput = False;
-static int ret = 0;
-static Bool quiet = False;
-static DC *dc;
-static Item *items = NULL;
-static Item *matches, *matchend;
-static Item *prev, *curr, *next, *sel;
-static Window win, dim;
-static XIC xic;
-static double opacity = 1.0, dimopacity = 0.0;
-
-#define OPAQUE 0xffffffff
-#define OPACITY "_NET_WM_WINDOW_OPACITY"
-
-static int (*fstrncmp)(const char *, const char *, size_t) = strncmp;
-static char *(*fstrstr)(const char *, const char *) = strstr;
-static void (*match)(void) = matchstr;
-static char *(*fstrchr)(const char *, const int) = strchr;
-
-int
-main(int argc, char *argv[]) {
-	Bool fast = False;
-	int i;
-
-	for(i = 1; i < argc; i++)
-		/* these options take no arguments */
-		if(!strcmp(argv[i], "-v")) {      /* prints version information */
-			puts("dmenu-"VERSION", © 2006-2012 dmenu engineers, see LICENSE for details");
-			exit(EXIT_SUCCESS);
-		}
-		else if(!strcmp(argv[i], "-b"))   /* appears at the bottom of the screen */
-			topbar = False;
- 		else if(!strcmp(argv[i], "-q"))
- 			quiet = True;
-		else if(!strcmp(argv[i], "-f"))   /* grabs keyboard before reading stdin */
-			fast = True;
-		else if(!strcmp(argv[i], "-z"))   /* enable fuzzy matching */
-			match = matchfuzzy;
- 		else if(!strcmp(argv[i], "-r"))
- 			filter = True;
-		else if(!strcmp(argv[i], "-i")) { /* case-insensitive item matching */
-			fstrncmp = strncasecmp;
-			fstrstr = cistrstr;
-			fstrchr = strchri;
-		}
-      else if(!strcmp(argv[i], "-mask")) /* password-style input */
-         maskin = True;
-      else if(!strcmp(argv[i], "-noinput"))
-         noinput = True;
-
-		else if(!strcmp(argv[i], "-t"))
-			match = matchtok;
-		else if(i+1 == argc)
-			usage();
-		/* these options take one argument */
- 		else if(!strcmp(argv[i], "-x"))
- 			xoffset = atoi(argv[++i]);
- 		else if(!strcmp(argv[i], "-y"))
- 			yoffset = atoi(argv[++i]);
- 		else if(!strcmp(argv[i], "-w"))
- 			width = atoi(argv[++i]);
-		else if(!strcmp(argv[i], "-l"))   /* number of lines in vertical list */
-			lines = atoi(argv[++i]);
-		else if(!strcmp(argv[i], "-h"))   /* minimum height of single line */
-			line_height = atoi(argv[++i]);
-		#ifdef XINERAMA
-		else if(!strcmp(argv[i], "-s"))   /* screen number for dmenu to appear in */
-			snum = atoi(argv[++i]);
-		#endif
-		else if (!strcmp(argv[i], "-name")) /* dmenu window name */
-			name = argv[++i];
-		else if (!strcmp(argv[i], "-class")) /* dmenu window class */
-			class = argv[++i];
-		else if (!strcmp(argv[i], "-o"))  /* opacity */
-			opacity = atof(argv[++i]);
-		else if (!strcmp(argv[i], "-dim"))  /* dim opacity */
-			dimopacity = atof(argv[++i]);	
-		else if (!strcmp(argv[i], "-dc")) /* dim color */
-			dimcolor = argv[++i];
-		else if(!strcmp(argv[i], "-p"))   /* adds prompt to left of input field */
-			prompt = argv[++i];
-		else if(!strcmp(argv[i], "-fn"))  /* font or font set */
-			font = argv[++i];
-		else if(!strcmp(argv[i], "-nb"))  /* normal background color */
-			normbgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-nf"))  /* normal foreground color */
-			normfgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-sb"))  /* selected background color */
-			selbgcolor = argv[++i];
-		else if(!strcmp(argv[i], "-sf"))  /* selected foreground color */
-			selfgcolor = argv[++i];
-		else
-			usage();
-
-	dc = initdc();
- 	read_resourses();
-	initfont(dc, font ? font : DEFFONT);
-	normcol = initcolor(dc, normfgcolor, normbgcolor);
-	selcol = initcolor(dc, selfgcolor, selbgcolor);
-	dimcol = initcolor(dc, dimcolor, dimcolor);
-
-   if(noinput) {
-      grabkeyboard();
-   }
-   else if(fast) {
-      grabkeyboard();
-      readstdin();
-   }
-   else {
-      readstdin();
-      grabkeyboard();
-   }
-	setup();
-	run();
-
-	cleanup();
-	return ret;
-}
-
-/* Set font and colors from X resources database if they are not set
- * from command line */
-void
-read_resourses(void) {
-	XrmDatabase xdb;
-	char* xrm;
-	char* datatype[20];
-	XrmValue xvalue;
-
-	XrmInitialize();
-	xrm = XResourceManagerString(dc->dpy);
-	if( xrm != NULL ) {
-		xdb = XrmGetStringDatabase(xrm);
-		if( font == NULL && XrmGetResource(xdb, "dmenu.font", "*", datatype, &xvalue) == True )
-			font = strdup(xvalue.addr);
-		if( normfgcolor == NULL && XrmGetResource(xdb, "dmenu.foreground", "*", datatype, &xvalue) == True )
-			normfgcolor = strdup(xvalue.addr);
-		if( normbgcolor == NULL && XrmGetResource(xdb, "dmenu.background", "*", datatype, &xvalue) == True )
-			normbgcolor = strdup(xvalue.addr);
-		if( selfgcolor == NULL && XrmGetResource(xdb, "dmenu.selforeground", "*", datatype, &xvalue) == True )
-			selfgcolor = strdup(xvalue.addr);
-		if( selbgcolor == NULL && XrmGetResource(xdb, "dmenu.selbackground", "*", datatype, &xvalue) == True )
-			selbgcolor = strdup(xvalue.addr);
-		if( dimcolor == NULL && XrmGetResource(xdb, "dmenu.dimcolor", "*", datatype, &xvalue) == True )
-			dimcolor = strdup(xvalue.addr);
-		if( XrmGetResource(xdb, "dmenu.opacity", "*", datatype, &xvalue) == True )
-			opacity = atof(strdup(xvalue.addr));
-		XrmDestroyDatabase(xdb);
-	}
-	/* Set default colors if they are not set */
-	if( normbgcolor == NULL )
-		normbgcolor = "#2f2d38";
-	if( normfgcolor == NULL )
-		normfgcolor = "#ffffff";
-	if( selbgcolor == NULL )
-		selbgcolor  = "#8b97b1";
-	if( selfgcolor == NULL )
-		selfgcolor  = "#ffffff";
-	if( dimcolor == NULL )
-		dimcolor = "#000000";
-	if( !opacity )
-		opacity = 1.0;
-}
-
-void
-appenditem(Item *item, Item **list, Item **last) {
-	if(*last)
-		(*last)->right = item;
-	else
-		*list = item;
-
-	item->left = *last;
-	item->right = NULL;
-	*last = item;
-}
-
-void
-calcoffsets(void) {
-	int i, n;
-
-	if(lines > 0)
-		n = lines * bh;
-	else
-		n = mw - (promptw + inputw + textw(dc, "<") + textw(dc, ">"));
-	/* calculate which items will begin the next page and previous page */
-	for(i = 0, next = curr; next; next = next->right)
-		if((i += (lines > 0) ? bh : MIN(textw(dc, next->text), n)) > n)
-			break;
-	for(i = 0, prev = curr; prev && prev->left; prev = prev->left)
-		if((i += (lines > 0) ? bh : MIN(textw(dc, prev->left->text), n)) > n)
-			break;
-}
-
-char *
-cistrstr(const char *s, const char *sub) {
-	size_t len;
-
-	for(len = strlen(sub); *s; s++)
-		if(!strncasecmp(s, sub, len))
-			return (char *)s;
-	return NULL;
-}
-
-void
-cleanup(void) {
-    freecol(dc, normcol);
-    freecol(dc, selcol);
-		freecol(dc, dimcol);
-    XDestroyWindow(dc->dpy, win);
-		if(dimopacity > 0)
-			XDestroyWindow(dc->dpy, dim);
-    XUngrabKeyboard(dc->dpy, CurrentTime);
-    freedc(dc);
-}
-
-const char *
-createmaskinput(char *maskinput, int length)
-{
-   if (length <= 0) {
-      *maskinput = '\0';
-   } else {
-      memset(maskinput, '*', length);
-      maskinput[length] = '\0';
-   }
-
-   return (maskinput);
-}
-
-void
-drawmenu(void) {
-	int curpos;
-   char maskinput[sizeof text];
-   int length = maskin ? utf8length() : cursor;
-	Item *item;
-
-	dc->x = 0;
-	dc->y = 0;
-	dc->h = bh;
-	drawrect(dc, 0, 0, mw, mh, True, normcol->BG);
-
-	if(prompt && *prompt) {
-		dc->w = promptw;
-		drawtext(dc, prompt, selcol);
-		dc->x = dc->w;
-	}
-
-
-	/* draw input field */
-	dc->w = (lines > 0 || !matches) ? mw - dc->x : inputw;
-	drawtext(dc, maskin ? createmaskinput(maskinput, length) : text, normcol);
-	if((curpos = textnw(dc, maskin ? maskinput : text, length) + dc->font.height/2) < dc->w)
-		drawrect(dc, curpos, (dc->h - dc->font.height)/2 + 1, 1, dc->font.height -1, True, normcol->FG);
-
-    if(!quiet || strlen(text) > 0) {    
-        if(lines > 0) {
-            /* draw vertical list */
-            dc->w = mw - dc->x;
-            for(item = curr; item != next; item = item->right) {
-                dc->y += dc->h;
-                drawtext(dc, item->text, (item == sel) ? selcol : normcol);
-            }
-        }
-        else if(matches) {
-            /* draw horizontal list */
-            dc->x += inputw;
-            dc->w = textw(dc, "<");
-            if(curr->left)
-                drawtext(dc, "<", normcol);
-            for(item = curr; item != next; item = item->right) {
-                dc->x += dc->w;
-                dc->w = MIN(textw(dc, item->text), mw - dc->x - textw(dc, ">"));
-                drawtext(dc, item->text, (item == sel) ? selcol : normcol);
-            }
-            dc->w = textw(dc, ">");
-            dc->x = mw - dc->w;
-            if(next)
-                drawtext(dc, ">", normcol);
-        }
-    }
-	mapdc(dc, win, mw, mh);
-}
-
-void
-grabkeyboard(void) {
-	int i;
-
-	/* try to grab keyboard, we may have to wait for another process to ungrab */
-	for(i = 0; i < 1000; i++) {
-		if(XGrabKeyboard(dc->dpy, DefaultRootWindow(dc->dpy), True,
-		                 GrabModeAsync, GrabModeAsync, CurrentTime) == GrabSuccess)
-			return;
-		usleep(1000);
-	}
-	eprintf("cannot grab keyboard\n");
-}
-
-void
-insert(const char *str, ssize_t n) {
-	if(strlen(text) + n > sizeof text - 1)
-		return;
-	/* move existing text out of the way, insert new text, and update cursor */
-	memmove(&text[cursor + n], &text[cursor], sizeof text - cursor - MAX(n, 0));
-	if(n > 0)
-		memcpy(&text[cursor], str, n);
-	cursor += n;
-	match();
-}
-
-void
-keypress(XKeyEvent *ev) {
-	char buf[32];
-	int len;
-	KeySym ksym = NoSymbol;
-	Status status;
-
-	len = XmbLookupString(xic, ev, buf, sizeof buf, &ksym, &status);
-	if(status == XBufferOverflow)
-		return;
-	if(ev->state & ControlMask)
-		switch(ksym) {
-		case XK_a: ksym = XK_Home;      break;
-		case XK_b: ksym = XK_Left;      break;
-		case XK_c: ksym = XK_Escape;    break;
-		case XK_d: ksym = XK_Delete;    break;
-		case XK_e: ksym = XK_End;       break;
-		case XK_f: ksym = XK_Right;     break;
-		case XK_g: ksym = XK_Escape;    break;
-		case XK_h: ksym = XK_BackSpace; break;
-		case XK_i: ksym = XK_Tab;       break;
-		case XK_j: /* fallthrough */
-		case XK_J: ksym = XK_Return;    break;
-		case XK_m: /* fallthrough */
-		case XK_M: ksym = XK_Return;    break;
-		case XK_n: ksym = XK_Down;      break;
-		case XK_p: ksym = XK_Up;        break;
-
-		case XK_k: /* delete right */
-			text[cursor] = '\0';
-			match();
-			break;
-		case XK_u: /* delete left */
-			insert(NULL, 0 - cursor);
-			break;
-		case XK_w: /* delete word */
-			while(cursor > 0 && text[nextrune(-1)] == ' ')
-				insert(NULL, nextrune(-1) - cursor);
-			while(cursor > 0 && text[nextrune(-1)] != ' ' && text[nextrune(-1)] != '/')
-				insert(NULL, nextrune(-1) - cursor);
-			break;
-		case XK_y: /* fallthrough */
-		case XK_Y: /* paste selection */
-			XConvertSelection(dc->dpy, (ev->state & ShiftMask) ? clip : XA_PRIMARY,
-			                  utf8, utf8, win, CurrentTime);
-			return;
-		default:
-			return;
-		}
-	else if(ev->state & Mod1Mask)
-		switch(ksym) {
-		case XK_g: ksym = XK_Home;  break;
-		case XK_G: ksym = XK_End;   break;
-		case XK_h: ksym = XK_Up;    break;
-		case XK_j: ksym = XK_Next;  break;
-		case XK_k: ksym = XK_Prior; break;
-		case XK_l: ksym = XK_Down;  break;
-		default:
-			return;
-		}
-	switch(ksym) {
-	default:
-		if(!iscntrl(*buf))
-         insert(buf, len);
-		break;
-	case XK_Delete:
-		if(text[cursor] == '\0')
-			return;
-		cursor = nextrune(+1);
-		/* fallthrough */
-	case XK_BackSpace:
-		if(cursor == 0)
-			return;
-		insert(NULL, nextrune(-1) - cursor);
-		break;
-	case XK_End:
-		if(text[cursor] != '\0') {
-			cursor = strlen(text);
-			break;
-		}
-		if(next) {
-			/* jump to end of list and position items in reverse */
-			curr = matchend;
-			calcoffsets();
-			curr = prev;
-			calcoffsets();
-			while(next && (curr = curr->right))
-				calcoffsets();
-		}
-		sel = matchend;
-		break;
-	case XK_Escape:
-        ret = EXIT_FAILURE;
-        running = False;
-	case XK_Home:
-		if(sel == matches) {
-			cursor = 0;
-			break;
-		}
-		sel = curr = matches;
-		calcoffsets();
-		break;
-	case XK_Left:
-		if(cursor > 0 && (!sel || !sel->left || lines > 0)) {
-			cursor = nextrune(-1);
-			break;
-		}
-		if(lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Up:
-		if(sel && sel->left && (sel = sel->left)->right == curr) {
-			curr = prev;
-			calcoffsets();
-		}
-		break;
-	case XK_Next:
-		if(!next)
-			return;
-		sel = curr = next;
-		calcoffsets();
-		break;
-	case XK_Prior:
-		if(!prev)
-			return;
-		sel = curr = prev;
-		calcoffsets();
-		break;
-	case XK_Return:
-	case XK_KP_Enter:
- 		if((ev->state & ShiftMask) || !sel)
- 			puts(text);
- 		else if(!filter)
- 			puts(sel->text);
- 		else {
- 			for(Item *item = sel; item; item = item->right)
- 				puts(item->text);
- 			for(Item *item = matches; item != sel; item = item->right)
- 				puts(item->text);
- 		}
-		ret = EXIT_SUCCESS;
-		running = False;
-	case XK_Right:
-		if(text[cursor] != '\0') {
-			cursor = nextrune(+1);
-			break;
-		}
-		if(lines > 0)
-			return;
-		/* fallthrough */
-	case XK_Down:
-		if(sel && sel->right && (sel = sel->right) == next) {
-			curr = next;
-			calcoffsets();
-		}
-		break;
-	case XK_Tab:
-		if(!sel)
-			return;
-		if(strcmp(text, sel->text)) {
-			strncpy(originaltext, text, sizeof originaltext);
-			strncpy(text, sel->text, sizeof text);
-			cursor = strlen(text);
-		} else {
-			if(sel && sel->right) {
-				sel = sel->right;
-				strncpy(text, sel->text, sizeof text);
-				cursor = strlen(text);
-			}
-			else {
-				strncpy(text, originaltext, sizeof text);
-				cursor = strlen(text);
-				match();
-			}
-		}
-		break;
-	case XK_ISO_Left_Tab:
-		if(!sel)
-			return;
-		if(strcmp(text, sel->text)) {
-			sel = matchend;
-			strncpy(originaltext, text, sizeof originaltext);
-			strncpy(text, sel->text, sizeof text);
-			cursor = strlen(text);
-		} else {
-			if(sel && sel->left) {
-				sel = sel->left;
-				strncpy(text, sel->text, sizeof text);
-				cursor = strlen(text);
-			}
-			else {
-				strncpy(text, originaltext, sizeof text);
-				cursor = strlen(text);
-				match();
-			}
-		} 
-		break;
-	}
-	drawmenu();
-}
-
-char *
-strchri(const char *s, int c) {
-	char *u, *l;
-	if(!isalpha(c)) return strchr(s, c);
-	if(isupper(c)) {
-		u = strchr(s, c);
-		l = strchr(s, tolower(c));
-	}
-	else {
-		l = strchr(s, c);
-		u = strchr(s, toupper(c));
-	}
-}
-
-
-
-void
-matchstr(void) {
-	static char **tokv = NULL;
-	static int tokn = 0;
-
-	char buf[sizeof text], *s;
-	int i, tokc = 0;
-	size_t len;
-	Item *item, *lprefix, *lsubstr, *prefixend, *substrend;
-
-	strcpy(buf, text);
-	/* separate input text into tokens to be matched individually */
-	for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
-		if(++tokc > tokn && !(tokv = realloc(tokv, ++tokn * sizeof *tokv)))
-			eprintf("cannot realloc %u bytes\n", tokn * sizeof *tokv);
-	len = tokc ? strlen(tokv[0]) : 0;
-
-	matches = lprefix = lsubstr = matchend = prefixend = substrend = NULL;
-	for(item = items; item && item->text; item++) {
-		for(i = 0; i < tokc; i++)
-			if(!fstrstr(item->text, tokv[i]))
-				break;
-		if(i != tokc) /* not all tokens match */
-			continue;
-		/* exact matches go first, then prefixes, then substrings */
-		if(!tokc || !fstrncmp(tokv[0], item->text, len+1))
-			appenditem(item, &matches, &matchend);
-		else if(!fstrncmp(tokv[0], item->text, len))
-			appenditem(item, &lprefix, &prefixend);
-		else
-			appenditem(item, &lsubstr, &substrend);
-	}
-	if(lprefix) {
-		if(matches) {
-			matchend->right = lprefix;
-			lprefix->left = matchend;
-		}
-		else
-			matches = lprefix;
-		matchend = prefixend;
-	}
-	if(lsubstr) {
-		if(matches) {
-			matchend->right = lsubstr;
-			lsubstr->left = matchend;
-		}
-		else
-			matches = lsubstr;
-		matchend = substrend;
-	}
-	curr = sel = matches;
-	calcoffsets();
-}
-
-void
-matchtok(void) {
-	char buf[sizeof text];
-	char **tokv, *s;
-	int tokc, i;
-	Item *item, *end;
-
-	tokc = 0;
-	tokv = NULL;
-	strcpy(buf, text);
-	for(s = strtok(buf, " "); s; tokv[tokc-1] = s, s = strtok(NULL, " "))
-		if(!(tokv = realloc(tokv, ++tokc * sizeof *tokv)))
-			eprintf("cannot realloc %u bytes\n", tokc * sizeof *tokv);
-
-	matches = end = NULL;
-	for(item = items; item->text; item++) {
-		for(i = 0; i < tokc; i++)
-			if(!fstrstr(item->text, tokv[i]))
-				break;
-		if(i == tokc)
-			appenditem(item, &matches, &end);
-	}
-	free(tokv);
-	curr = prev = next = sel = matches;
-	calcoffsets();
-}
-
-void
-matchfuzzy(void) {
-	int i;
-	size_t len;
-	Item *item;
-	char *pos;
-	
-	len = strlen(text);
-	matches = matchend = NULL;
-	for(item = items; item && item->text; item++) {
-		i = 0;
-		for(pos = fstrchr(item->text, text[i]); pos && text[i]; i++, pos = fstrchr(pos+1, text[i]));
-		if(i == len) appenditem(item, &matches, &matchend);
-	}
-
-	curr = sel = matches;
-	calcoffsets();
-}
-
-size_t
-nextrune(int inc) {
-	ssize_t n;
-
-	/* return location of next utf8 rune in the given direction (+1 or -1) */
-	for(n = cursor + inc; n + inc >= 0 && (text[n] & 0xc0) == 0x80; n += inc);
-	return n;
-}
-
-/* UTF-8 length for password */
-size_t
-utf8length()
-{
-   ssize_t n = cursor - 1, length = 0;
-
-   while (n >= 0) {
-      for (; n - 1 >= 0 && (text[n] & 0xc0) == 0x80; n--)
-         ;
-      n--;
-      length++;
-   }
-
-   return (length);
-}
-
-void
-paste(void) {
-	char *p, *q;
-	int di;
-	unsigned long dl;
-	Atom da;
-
-	/* we have been given the current selection, now insert it into input */
-	XGetWindowProperty(dc->dpy, win, utf8, 0, (sizeof text / 4) + 1, False,
-	                   utf8, &da, &di, &dl, &dl, (unsigned char **)&p);
-	insert(p, (q = strchr(p, '\n')) ? q-p : (ssize_t)strlen(p));
-	XFree(p);
-	drawmenu();
-}
-
-void
-readstdin(void) {
-	char buf[sizeof text], *p, *maxstr = NULL;
-	size_t i, max = 0, size = 0;
-
-	/* read each line from stdin and add it to the item list */
-	for(i = 0; fgets(buf, sizeof buf, stdin); i++) {
-		if(i+1 >= size / sizeof *items)
-			if(!(items = realloc(items, (size += BUFSIZ))))
-				eprintf("cannot realloc %u bytes:", size);
-		if((p = strchr(buf, '\n')))
-			*p = '\0';
-		if(!(items[i].text = strdup(buf)))
-			eprintf("cannot strdup %u bytes:", strlen(buf)+1);
-		if(strlen(items[i].text) > max)
-			max = strlen(maxstr = items[i].text);
-	}
-	if(items)
-		items[i].text = NULL;
-	inputw = maxstr ? textw(dc, maxstr) : 0;
-	lines = MIN(lines, i);
-}
-
-void
-run(void) {
-	XEvent ev;
-
-	while(running && !XNextEvent(dc->dpy, &ev)) {
-		if(XFilterEvent(&ev, win))
-			continue;
-		switch(ev.type) {
-		case Expose:
-			if(ev.xexpose.count == 0)
-				mapdc(dc, win, mw, mh);
-			break;
-		case KeyPress:
-			keypress(&ev.xkey);
-			break;
-		case SelectionNotify:
-			if(ev.xselection.property == utf8)
-				paste();
-			break;
-		case VisibilityNotify:
-			if(ev.xvisibility.state != VisibilityUnobscured)
-				XRaiseWindow(dc->dpy, win);
-			break;
-		}
-	}
-}
-
-void
-setup(void) {
-	int x, y, screen = DefaultScreen(dc->dpy);
-	Screen *defScreen = DefaultScreenOfDisplay(dc->dpy);
-	int dimx, dimy, dimw, dimh;
-	Window root = RootWindow(dc->dpy, screen);
-	XSetWindowAttributes swa;
-	XIM xim;
-
-#ifdef XINERAMA
-	int n;
-	XineramaScreenInfo *info;
-#endif
-
-	clip = XInternAtom(dc->dpy, "CLIPBOARD",   False);
-	utf8 = XInternAtom(dc->dpy, "UTF8_STRING", False);
-
-	/* calculate menu geometry */
-	bh = (line_height > dc->font.height + 2) ? line_height : dc->font.height + 2;
-	lines = MAX(lines, 0);
-	mh = (lines + 1) * bh;
-#ifdef XINERAMA
-	if((info = XineramaQueryScreens(dc->dpy, &n))) {
-		int a, j, di, i = 0, area = 0;
-		unsigned int du;
-		Window w, pw, dw, *dws;
-		XWindowAttributes wa;
-
-		if(snum > -1 && snum < n) {
-			x = info[snum].x_org;
-			y = info[snum].y_org + (topbar ? yoffset : info[i].height - mh - yoffset);
-			mw = info[snum].width;
-			
-			dimx = info[snum].x_org;
-			dimy = info[snum].y_org;
-			dimw = info[snum].width;
-			dimh = info[snum].height;
-		}
-		else {
-			XGetInputFocus(dc->dpy, &w, &di);
-			if(w != root && w != PointerRoot && w != None) {
-				/* find top-level window containing current input focus */
-				do {
-					if(XQueryTree(dc->dpy, (pw = w), &dw, &w, &dws, &du) && dws)
-						XFree(dws);
-				} while(w != root && w != pw);
-				/* find xinerama screen with which the window intersects most */
-				if(XGetWindowAttributes(dc->dpy, pw, &wa))
-					for(j = 0; j < n; j++)
-						if((a = INTERSECT(wa.x, wa.y, wa.width, wa.height, info[j])) > area) {
-							area = a;
-							i = j;
-						}
-			}
-			/* no focused window is on screen, so use pointer location instead */
-			if(!area && XQueryPointer(dc->dpy, root, &dw, &dw, &x, &y, &di, &di, &du))
-				for(i = 0; i < n; i++)
-					if(INTERSECT(x, y, 1, 1, info[i]))
-						break;
-
-			x = info[i].x_org;
-			y = info[i].y_org + (topbar ? yoffset : info[i].height - mh - yoffset);
-			mw = info[i].width;
-
-			dimx = info[i].x_org;
-			dimy = info[i].y_org;
-			dimw = info[i].width;
-			dimh = info[i].height;
-		}
-		XFree(info);
-	}
-	else
-#endif
-	{
-		x = 0;
-		y = topbar ? 0 : DisplayHeight(dc->dpy, screen) - mh - yoffset;
-		mw = DisplayWidth(dc->dpy, screen);
-		
-		dimx = 0;
-		dimy = 0;
-		dimw = WidthOfScreen(defScreen); 
-		dimh = HeightOfScreen(defScreen);
-	}
-
-	x += xoffset;
-	mw = width ? width : mw;
-	promptw = (prompt && *prompt) ? textw(dc, prompt) : 0;
-	inputw = MIN(inputw, mw/3);
-	match();
-	
-	swa.override_redirect = True;
-	
-	/* create dim window */
-	if(dimopacity > 0) {
-		swa.background_pixel = dimcol->BG;
-		swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-		dim = XCreateWindow(dc->dpy, root, dimx, dimy, dimw, dimh, 0,
-	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
-	                    DefaultVisual(dc->dpy, screen),
-	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
-		XClassHint dimhint = { .res_name = dimname, .res_class = class };
-  	XSetClassHint(dc->dpy, dim, &dimhint);
-  
-		dimopacity = MIN(MAX(dimopacity, 0), 1);
-  	unsigned int dimopacity_set = (unsigned int)(dimopacity * OPAQUE);
-  	XChangeProperty(dc->dpy, dim, XInternAtom(dc->dpy, OPACITY, False),
-											XA_CARDINAL, 32, PropModeReplace,
-											(unsigned char *) &dimopacity_set, 1L);
-	
-		XMapRaised(dc->dpy, dim);
-	}
-	
-	/* create menu window */
-	swa.background_pixel = normcol->BG;
-	swa.event_mask = ExposureMask | KeyPressMask | VisibilityChangeMask;
-	win = XCreateWindow(dc->dpy, root, x, y, mw, mh, 0,
-	                    DefaultDepth(dc->dpy, screen), CopyFromParent,
-	                    DefaultVisual(dc->dpy, screen),
-	                    CWOverrideRedirect | CWBackPixel | CWEventMask, &swa);
-  XClassHint hint = { .res_name = name, .res_class = class };
-  XSetClassHint(dc->dpy, win, &hint);
-
-  opacity = MIN(MAX(opacity, 0), 1);
-  unsigned int opacity_set = (unsigned int)(opacity * OPAQUE);
-  XChangeProperty(dc->dpy, win, XInternAtom(dc->dpy, OPACITY, False),
-											XA_CARDINAL, 32, PropModeReplace,
-											(unsigned char *) &opacity_set, 1L);
-	
-	/* open input methods */
-	xim = XOpenIM(dc->dpy, NULL, NULL, NULL);
-	xic = XCreateIC(xim, XNInputStyle, XIMPreeditNothing | XIMStatusNothing,
-	                XNClientWindow, win, XNFocusWindow, win, NULL);
-
-	XMapRaised(dc->dpy, win);
-	resizedc(dc, mw, mh);
-	drawmenu();
-}
-
-void
-usage(void) {
-	fputs("usage: dmenu [-b] [-q] [-f] [-r] [-i] [-z] [-t] [-mask] [-noinput]\n"
-				"             [-s screen] [-name name] [-class class] [ -o opacity]\n"
-				"             [-dim opcity] [-dc color] [-l lines] [-p prompt] [-fn font]\n"
-	      "             [-x xoffset] [-y yoffset] [-h height] [-w width]\n"
-	      "             [-nb color] [-nf color] [-sb color] [-sf color] [-v]\n", stderr);
-	exit(EXIT_FAILURE);
-}
diff --git a/suckless/dmenu-4.8/dmenu.o b/suckless/dmenu-4.8/dmenu.o
deleted file mode 100644
index e37efab..0000000
Binary files a/suckless/dmenu-4.8/dmenu.o and /dev/null differ
diff --git a/suckless/dmenu-4.8/dmenu_run b/suckless/dmenu-4.8/dmenu_run
deleted file mode 100644
index 052e51b..0000000
--- a/suckless/dmenu-4.8/dmenu_run
+++ /dev/null
@@ -1,15 +0,0 @@
-#!/bin/sh
-cachedir=${XDG_CACHE_HOME:-"$HOME/.cache"}
-if [ -d "$cachedir" ]; then
-	cache=$cachedir/dmenu_run
-else
-	cache=$HOME/.dmenu_cache # if no xdg dir, fall back to dotfile in ~
-fi
-(
-	IFS=:
-	if stest -dqr -n "$cache" $PATH; then
-		stest -flx $PATH | sort -u | tee "$cache" | dmenu "$@"
-	else
-		dmenu "$@" < "$cache"
-	fi
-) | ${SHELL:-"/bin/sh"} &
diff --git a/suckless/dmenu-4.8/draw.c b/suckless/dmenu-4.8/draw.c
deleted file mode 100644
index cc99047..0000000
--- a/suckless/dmenu-4.8/draw.c
+++ /dev/null
@@ -1,213 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <locale.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include "draw.h"
-
-#define MAX(a, b)  ((a) > (b) ? (a) : (b))
-#define MIN(a, b)  ((a) < (b) ? (a) : (b))
-
-void
-drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color) {
-	XSetForeground(dc->dpy, dc->gc, color);
-	if(fill)
-		XFillRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w, h);
-	else
-		XDrawRectangle(dc->dpy, dc->canvas, dc->gc, dc->x + x, dc->y + y, w-1, h-1);
-}
-
-void
-drawtext(DC *dc, const char *text, ColorSet *col) {
-	char buf[BUFSIZ];
-	size_t mn, n = strlen(text);
-
-	/* shorten text if necessary */
-	for(mn = MIN(n, sizeof buf); textnw(dc, text, mn) + dc->font.height/2 > dc->w; mn--)
-		if(mn == 0)
-			return;
-	memcpy(buf, text, mn);
-	if(mn < n)
-		for(n = MAX(mn-3, 0); n < mn; buf[n++] = '.');
-
-	drawrect(dc, 0, 0, dc->w, dc->h, True, col->BG);
-	drawtextn(dc, buf, mn, col);
-}
-
-void
-drawtextn(DC *dc, const char *text, size_t n, ColorSet *col) {
-	int x = dc->x + dc->font.height/2;
-	int y = dc->y + dc->font.ascent + (dc->h - dc->font.height)/2;
-
-	XSetForeground(dc->dpy, dc->gc, col->FG);
-	if(dc->font.xft_font) {
-		if (!dc->xftdraw)
-			eprintf("error, xft drawable does not exist");
-		XftDrawStringUtf8(dc->xftdraw, &col->FG_xft,
-			dc->font.xft_font, x, y, (unsigned char*)text, n);
-	} else if(dc->font.set) {
-		XmbDrawString(dc->dpy, dc->canvas, dc->font.set, dc->gc, x, y, text, n);
-	} else {
-		XSetFont(dc->dpy, dc->gc, dc->font.xfont->fid);
-		XDrawString(dc->dpy, dc->canvas, dc->gc, x, y, text, n);
-	}
-}
-
-void
-eprintf(const char *fmt, ...) {
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	if(fmt[0] != '\0' && fmt[strlen(fmt)-1] == ':') {
-		fputc(' ', stderr);
-		perror(NULL);
-	}
-	exit(EXIT_FAILURE);
-}
-
-void
-freecol(DC *dc, ColorSet *col) {
-    if(col) {
-        if(&col->FG_xft)
-            XftColorFree(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
-                DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), &col->FG_xft);
-        free(col); 
-    }
-}
-
-void
-freedc(DC *dc) {
-    if(dc->font.xft_font) {
-        XftFontClose(dc->dpy, dc->font.xft_font);
-        XftDrawDestroy(dc->xftdraw);
-    }
-	if(dc->font.set)
-		XFreeFontSet(dc->dpy, dc->font.set);
-    if(dc->font.xfont)
-		XFreeFont(dc->dpy, dc->font.xfont);
-    if(dc->canvas)
-		XFreePixmap(dc->dpy, dc->canvas);
-	if(dc->gc)
-        XFreeGC(dc->dpy, dc->gc);
-	if(dc->dpy)
-        XCloseDisplay(dc->dpy);
-	if(dc)
-        free(dc);
-}
-
-unsigned long
-getcolor(DC *dc, const char *colstr) {
-	Colormap cmap = DefaultColormap(dc->dpy, DefaultScreen(dc->dpy));
-	XColor color;
-
-	if(!XAllocNamedColor(dc->dpy, cmap, colstr, &color, &color))
-		eprintf("cannot allocate color '%s'\n", colstr);
-	return color.pixel;
-}
-
-ColorSet *
-initcolor(DC *dc, const char * foreground, const char * background) {
-	ColorSet * col = (ColorSet *)malloc(sizeof(ColorSet));
-	if(!col)
-		eprintf("error, cannot allocate memory for color set");
-	col->BG = getcolor(dc, background);
-	col->FG = getcolor(dc, foreground);
-	if(dc->font.xft_font)
-		if(!XftColorAllocName(dc->dpy, DefaultVisual(dc->dpy, DefaultScreen(dc->dpy)),
-			DefaultColormap(dc->dpy, DefaultScreen(dc->dpy)), foreground, &col->FG_xft))
-			eprintf("error, cannot allocate xft font color '%s'\n", foreground);
-	return col;
-}
-
-DC *
-initdc(void) {
-	DC *dc;
-
-	if(!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fputs("no locale support\n", stderr);
-	if(!(dc = calloc(1, sizeof *dc)))
-		eprintf("cannot malloc %u bytes:", sizeof *dc);
-	if(!(dc->dpy = XOpenDisplay(NULL)))
-		eprintf("cannot open display\n");
-
-	dc->gc = XCreateGC(dc->dpy, DefaultRootWindow(dc->dpy), 0, NULL);
-	XSetLineAttributes(dc->dpy, dc->gc, 1, LineSolid, CapButt, JoinMiter);
-	return dc;
-}
-
-void
-initfont(DC *dc, const char *fontstr) {
-	char *def, **missing, **names;
-	int i, n;
-	XFontStruct **xfonts;
-
-	missing = NULL;
-	if((dc->font.xfont = XLoadQueryFont(dc->dpy, fontstr))) {
-		dc->font.ascent = dc->font.xfont->ascent;
-		dc->font.descent = dc->font.xfont->descent;
-		dc->font.width   = dc->font.xfont->max_bounds.width;
-	} else if((dc->font.set = XCreateFontSet(dc->dpy, fontstr, &missing, &n, &def))) {
-		n = XFontsOfFontSet(dc->font.set, &xfonts, &names);
-		for(i = 0; i < n; i++) {
-			dc->font.ascent  = MAX(dc->font.ascent,  xfonts[i]->ascent);
-			dc->font.descent = MAX(dc->font.descent, xfonts[i]->descent);
-			dc->font.width   = MAX(dc->font.width,   xfonts[i]->max_bounds.width);
-		}
-	} else if((dc->font.xft_font = XftFontOpenName(dc->dpy, DefaultScreen(dc->dpy), fontstr))) {
-		dc->font.ascent = dc->font.xft_font->ascent;
-		dc->font.descent = dc->font.xft_font->descent;
-		dc->font.width = dc->font.xft_font->max_advance_width;
-	} else {
-		eprintf("cannot load font '%s'\n", fontstr);
-	}
-	if(missing)
-		XFreeStringList(missing);
-	dc->font.height = dc->font.ascent + dc->font.descent;
-	return;
-}
-
-void
-mapdc(DC *dc, Window win, unsigned int w, unsigned int h) {
-	XCopyArea(dc->dpy, dc->canvas, win, dc->gc, 0, 0, w, h, 0, 0);
-}
-
-void
-resizedc(DC *dc, unsigned int w, unsigned int h) {
-	int screen = DefaultScreen(dc->dpy);
-	if(dc->canvas)
-		XFreePixmap(dc->dpy, dc->canvas);
-
-	dc->w = w;
-	dc->h = h;
-	dc->canvas = XCreatePixmap(dc->dpy, DefaultRootWindow(dc->dpy), w, h,
-	                           DefaultDepth(dc->dpy, screen));
-	if(dc->font.xft_font && !(dc->xftdraw)) {
-		dc->xftdraw = XftDrawCreate(dc->dpy, dc->canvas, DefaultVisual(dc->dpy,screen), DefaultColormap(dc->dpy,screen));
-		if(!(dc->xftdraw))
-			eprintf("error, cannot create xft drawable\n");
-	}
-}
-
-int
-textnw(DC *dc, const char *text, size_t len) {
-	if(dc->font.xft_font) {
-		XGlyphInfo gi;
-		XftTextExtentsUtf8(dc->dpy, dc->font.xft_font, (const FcChar8*)text, len, &gi);
-		return gi.width;
-	} else if(dc->font.set) {
-		XRectangle r;
-		XmbTextExtents(dc->font.set, text, len, NULL, &r);
-		return r.width;
-	}
-	return XTextWidth(dc->font.xfont, text, len);
-}
-
-int
-textw(DC *dc, const char *text) {
-	return textnw(dc, text, strlen(text)) + dc->font.height;
-}
diff --git a/suckless/dmenu-4.8/draw.h b/suckless/dmenu-4.8/draw.h
deleted file mode 100644
index 1b4f21a..0000000
--- a/suckless/dmenu-4.8/draw.h
+++ /dev/null
@@ -1,42 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#include <X11/Xft/Xft.h>
-
-typedef struct {
-	int x, y, w, h;
-	Bool invert;
-	Display *dpy;
-	GC gc;
-	Pixmap canvas;
-	XftDraw *xftdraw;
-	struct {
-		int ascent;
-		int descent;
-		int height;
-		int width;
-		XFontSet set;
-		XFontStruct *xfont;
-		XftFont *xft_font;
-	} font;
-} DC;  /* draw context */
-
-typedef struct {
-	unsigned long FG;
-	XftColor FG_xft;
-	unsigned long BG;
-} ColorSet;
-
-void drawrect(DC *dc, int x, int y, unsigned int w, unsigned int h, Bool fill, unsigned long color);
-void drawtext(DC *dc, const char *text, ColorSet *col);
-void drawtextn(DC *dc, const char *text, size_t n, ColorSet *col);
-void freecol(DC *dc, ColorSet *col);
-void eprintf(const char *fmt, ...);
-void freedc(DC *dc);
-unsigned long getcolor(DC *dc, const char *colstr);
-ColorSet *initcolor(DC *dc, const char *foreground, const char *background);
-DC *initdc(void);
-void initfont(DC *dc, const char *fontstr);
-void mapdc(DC *dc, Window win, unsigned int w, unsigned int h);
-void resizedc(DC *dc, unsigned int w, unsigned int h);
-int textnw(DC *dc, const char *text, size_t len);
-int textw(DC *dc, const char *text);
diff --git a/suckless/dmenu-4.8/draw.o b/suckless/dmenu-4.8/draw.o
deleted file mode 100644
index 58afc81..0000000
Binary files a/suckless/dmenu-4.8/draw.o and /dev/null differ
diff --git a/suckless/dmenu-4.8/stest b/suckless/dmenu-4.8/stest
deleted file mode 100755
index 7d81b34..0000000
Binary files a/suckless/dmenu-4.8/stest and /dev/null differ
diff --git a/suckless/dmenu-4.8/stest.1 b/suckless/dmenu-4.8/stest.1
deleted file mode 100644
index bb48f45..0000000
--- a/suckless/dmenu-4.8/stest.1
+++ /dev/null
@@ -1,87 +0,0 @@
-.TH STEST 1 dmenu\-VERSION
-.SH NAME
-stest \- filter a list of files by properties
-.SH SYNOPSIS
-.B stest
-.RB [ -abcdefghlpqrsuwx ]
-.RB [ -n
-.IR file ]
-.RB [ -o
-.IR file ]
-.RI [ file ...]
-.SH DESCRIPTION
-.B stest
-takes a list of files and filters by the files' properties, analogous to
-.IR test (1).
-Files which pass all tests are printed to stdout. If no files are given, stest
-reads files from stdin.
-.SH OPTIONS
-.TP
-.B \-a
-Test hidden files.
-.TP
-.B \-b
-Test that files are block specials.
-.TP
-.B \-c
-Test that files are character specials.
-.TP
-.B \-d
-Test that files are directories.
-.TP
-.B \-e
-Test that files exist.
-.TP
-.B \-f
-Test that files are regular files.
-.TP
-.B \-g
-Test that files have their set-group-ID flag set.
-.TP
-.B \-h
-Test that files are symbolic links.
-.TP
-.B \-l
-Test the contents of a directory given as an argument.
-.TP
-.BI \-n " file"
-Test that files are newer than
-.IR file .
-.TP
-.BI \-o " file"
-Test that files are older than
-.IR file .
-.TP
-.B \-p
-Test that files are named pipes.
-.TP
-.B \-q
-No files are printed, only the exit status is returned.
-.TP
-.B \-r
-Test that files are readable.
-.TP
-.B \-s
-Test that files are not empty.
-.TP
-.B \-u
-Test that files have their set-user-ID flag set.
-.TP
-.B \-w
-Test that files are writable.
-.TP
-.B \-x
-Test that files are executable.
-.SH EXIT STATUS
-.TP
-.B 0
-At least one file passed all tests.
-.TP
-.B 1
-No files passed all tests.
-.TP
-.B 2
-An error occurred.
-.SH SEE ALSO
-.IR dmenu (1),
-.IR test (1)
diff --git a/suckless/dmenu-4.8/stest.c b/suckless/dmenu-4.8/stest.c
deleted file mode 100644
index e1dcf36..0000000
--- a/suckless/dmenu-4.8/stest.c
+++ /dev/null
@@ -1,84 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <dirent.h>
-#include <stdbool.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/stat.h>
-
-#define FLAG(x)  (flag[(x)-'a'])
-
-static void test(const char *, const char *);
-
-static bool match = false;
-static bool flag[26];
-static struct stat old, new;
-
-int
-main(int argc, char *argv[]) {
-	struct dirent *d;
-	char buf[BUFSIZ], *p;
-	DIR *dir;
-	int opt;
-
-	while((opt = getopt(argc, argv, "abcdefghln:o:pqrsuwx")) != -1)
-		switch(opt) {
-		case 'n': /* newer than file */
-		case 'o': /* older than file */
-			if(!(FLAG(opt) = !stat(optarg, (opt == 'n' ? &new : &old))))
-				perror(optarg);
-			break;
-		default:  /* miscellaneous operators */
-			FLAG(opt) = true;
-			break;
-		case '?': /* error: unknown flag */
-			fprintf(stderr, "usage: %s [-abcdefghlpqrsuwx] [-n file] [-o file] [file...]\n", argv[0]);
-			exit(2);
-		}
-	if(optind == argc)
-		while(fgets(buf, sizeof buf, stdin)) {
-			if((p = strchr(buf, '\n')))
-				*p = '\0';
-			test(buf, buf);
-		}
-	for(; optind < argc; optind++)
-		if(FLAG('l') && (dir = opendir(argv[optind]))) {
-			/* test directory contents */
-			while((d = readdir(dir)))
-				if(snprintf(buf, sizeof buf, "%s/%s", argv[optind], d->d_name) < sizeof buf)
-					test(buf, d->d_name);
-			closedir(dir);
-		}
-		else
-			test(argv[optind], argv[optind]);
-
-	return match ? 0 : 1;
-}
-
-void
-test(const char *path, const char *name) {
-	struct stat st, ln;
-
-	if(!stat(path, &st) && (FLAG('a') || name[0] != '.')          /* hidden files      */
-	&& (!FLAG('b') || S_ISBLK(st.st_mode))                        /* block special     */
-	&& (!FLAG('c') || S_ISCHR(st.st_mode))                        /* character special */
-	&& (!FLAG('d') || S_ISDIR(st.st_mode))                        /* directory         */
-	&& (!FLAG('e') || access(path, F_OK) == 0)                    /* exists            */
-	&& (!FLAG('f') || S_ISREG(st.st_mode))                        /* regular file      */
-	&& (!FLAG('g') || st.st_mode & S_ISGID)                       /* set-group-id flag */
-	&& (!FLAG('h') || (!lstat(path, &ln) && S_ISLNK(ln.st_mode))) /* symbolic link     */
-	&& (!FLAG('n') || st.st_mtime > new.st_mtime)                 /* newer than file   */
-	&& (!FLAG('o') || st.st_mtime < old.st_mtime)                 /* older than file   */
-	&& (!FLAG('p') || S_ISFIFO(st.st_mode))                       /* named pipe        */
-	&& (!FLAG('r') || access(path, R_OK) == 0)                    /* readable          */
-	&& (!FLAG('s') || st.st_size > 0)                             /* not empty         */
-	&& (!FLAG('u') || st.st_mode & S_ISUID)                       /* set-user-id flag  */
-	&& (!FLAG('w') || access(path, W_OK) == 0)                    /* writable          */
-	&& (!FLAG('x') || access(path, X_OK) == 0)) {                 /* executable        */
-		if(FLAG('q'))
-			exit(0);
-		match = true;
-		puts(name);
-	}
-}
diff --git a/suckless/dmenu-4.8/stest.o b/suckless/dmenu-4.8/stest.o
deleted file mode 100644
index 07b6de5..0000000
Binary files a/suckless/dmenu-4.8/stest.o and /dev/null differ
diff --git a/suckless/dwm-6.1/BUGS b/suckless/dwm-6.1/BUGS
deleted file mode 100644
index 6c9574a..0000000
--- a/suckless/dwm-6.1/BUGS
+++ /dev/null
@@ -1,44 +0,0 @@
----
-
-18:17 < Biolunar> when i change my resolution in dwm (to a smaller one) and then back to the native, the top bar is not repainted. that's since 5.7.2, in 5.6 it worked fine
-18:19 < Biolunar> is it just happening to me or a (known) bug?
-18:24 < Biolunar> and in addition, mplayers fullscreen is limited to the small resolution after i changed it back to the native
-
-reproducible with xrandr -s but not with --output and --mode, strange
-
----
-
-yet another corner case:
-open a terminal, focus another monitor, but without moving the mouse
-pointer there
-if there is no client on the other monitor to get the focus, then the
-terminal will be unfocused but it will accept input
-
----
-
-Donald Allen reported this:
-
-starting emacs from dmenu in archlinux results in missing configure of emacs, but mod1-space or mod1-shift-space fix this problem. this problem is new and did not happen in 1.6 xorg servers
-
----
-
-voltaic reports this:
-
-When I use two monitors, one larger in resolution than the other, the
-bar is drawn using the smaller x-dimension on both screens. I think
-what's happening is that there are two bars drawn, but the short bar
-is always on top of the long bar such that I can't see the information
-under the short bar. If I switch to the small screen, hide the short
-bar, and then switch to the large screen, the long bar is drawn
-correctly.
-
-A similar problem occurs when I have started dwm on a small resolution
-monitor (laptop screen) and then I switch to a large external display.
-When I do this, the bar itself is drawn for the original smaller
-resolution, but the information to be printed on the bar is
-right-aligned for a longer bar. So what I see is a bar that has the
-right hand side of it cut-off. See attached screenshot.
-
-I am using standard options for xrandr such as --output VGA1 --auto, etc.
-
----
diff --git a/suckless/dwm-6.1/LICENSE b/suckless/dwm-6.1/LICENSE
deleted file mode 100644
index 4fbb67e..0000000
--- a/suckless/dwm-6.1/LICENSE
+++ /dev/null
@@ -1,33 +0,0 @@
-MIT/X Consortium License
-
-© 2006-2014 Anselm R Garbe <anselm@garbe.us>
-© 2010-2014 Hiltjo Posthuma <hiltjo@codemadness.org>
-© 2007-2011 Peter Hartlich <sgkkr at hartlich dot com>
-© 2010-2011 Connor Lane Smith <cls@lubutu.com>
-© 2006-2009 Jukka Salmi <jukka at salmi dot ch>
-© 2007-2009 Premysl Hruby <dfenze at gmail dot com>
-© 2007-2009 Szabolcs Nagy <nszabolcs at gmail dot com>
-© 2007-2009 Christof Musik <christof at sendfax dot de>
-© 2009 Mate Nagy <mnagy at port70 dot net>
-© 2007-2008 Enno Gottox Boland <gottox at s01 dot de>
-© 2008 Martin Hurton <martin dot hurton at gmail dot com>
-© 2008 Neale Pickett <neale dot woozle dot org>
-© 2006-2007 Sander van Dijk <a dot h dot vandijk at gmail dot com>
-
-Permission is hereby granted, free of charge, to any person obtaining a
-copy of this software and associated documentation files (the "Software"),
-to deal in the Software without restriction, including without limitation
-the rights to use, copy, modify, merge, publish, distribute, sublicense,
-and/or sell copies of the Software, and to permit persons to whom the
-Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT.  IN NO EVENT SHALL
-THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING
-FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
-DEALINGS IN THE SOFTWARE.
diff --git a/suckless/dwm-6.1/Makefile b/suckless/dwm-6.1/Makefile
deleted file mode 100644
index 1ea40b7..0000000
--- a/suckless/dwm-6.1/Makefile
+++ /dev/null
@@ -1,60 +0,0 @@
-# dwm - dynamic window manager
-# See LICENSE file for copyright and license details.
-
-include config.mk
-
-SRC = drw.c dwm.c util.c
-OBJ = ${SRC:.c=.o}
-
-all: options dwm
-
-options:
-	@echo dwm build options:
-	@echo "CFLAGS   = ${CFLAGS}"
-	@echo "LDFLAGS  = ${LDFLAGS}"
-	@echo "CC       = ${CC}"
-
-.c.o:
-	@echo CC $<
-	@${CC} -c ${CFLAGS} $<
-
-${OBJ}: config.h config.mk
-
-config.h:
-	@echo creating $@ from config.def.h
-	@cp config.def.h $@
-
-dwm: ${OBJ}
-	@echo CC -o $@
-	@${CC} -o $@ ${OBJ} ${LDFLAGS}
-
-clean:
-	@echo cleaning
-	@rm -f dwm ${OBJ} dwm-${VERSION}.tar.gz
-
-dist: clean
-	@echo creating dist tarball
-	@mkdir -p dwm-${VERSION}
-	@cp -R LICENSE TODO BUGS Makefile README config.def.h config.mk \
-		dwm.1 drw.h util.h ${SRC} dwm.png transient.c dwm-${VERSION}
-	@tar -cf dwm-${VERSION}.tar dwm-${VERSION}
-	@gzip dwm-${VERSION}.tar
-	@rm -rf dwm-${VERSION}
-
-install: all
-	@echo installing executable file to ${DESTDIR}${PREFIX}/bin
-	@mkdir -p ${DESTDIR}${PREFIX}/bin
-	@cp -f dwm ${DESTDIR}${PREFIX}/bin
-	@chmod 755 ${DESTDIR}${PREFIX}/bin/dwm
-	@echo installing manual page to ${DESTDIR}${MANPREFIX}/man1
-	@mkdir -p ${DESTDIR}${MANPREFIX}/man1
-	@sed "s/VERSION/${VERSION}/g" < dwm.1 > ${DESTDIR}${MANPREFIX}/man1/dwm.1
-	@chmod 644 ${DESTDIR}${MANPREFIX}/man1/dwm.1
-
-uninstall:
-	@echo removing executable file from ${DESTDIR}${PREFIX}/bin
-	@rm -f ${DESTDIR}${PREFIX}/bin/dwm
-	@echo removing manual page from ${DESTDIR}${MANPREFIX}/man1
-	@rm -f ${DESTDIR}${MANPREFIX}/man1/dwm.1
-
-.PHONY: all options clean dist install uninstall
diff --git a/suckless/dwm-6.1/README.md b/suckless/dwm-6.1/README.md
deleted file mode 100644
index 559a6f2..0000000
--- a/suckless/dwm-6.1/README.md
+++ /dev/null
@@ -1,98 +0,0 @@
-# MY SETUP
-
-PATCHES:
- - [tilegap](https://dwm.suckless.org/patches/tilegap/) to set gaps between windows
- - [moveresize](https://dwm.suckless.org/patches/moveresize/) to resize/move windows
- - [statuscolors](https://dwm.suckless.org/patches/statuscolors/) to set different colors for each situation (i.e. normal tags, selected tag, urgent tag, occupied tags)
-
-CHANGES:
- - I've created the `barsize` variable, which represents the size of the dwm statusbar
- - There's a `tagspacing` variable which represents the size of the tag label
- - To remove the windows indicator in the statusbar, change this _for loop_ in the _void drawbar_ function in the **dwm.c** file:
- ```
- for (i = 0; i < LENGTH(tags); i++) {
-     w = TEXTW(tags[i]);
-     drw_setscheme(drw, &scheme[(m->tagset[m->seltags] & 1 << i) ? 1 : (urg & 1 << i ? 2 : 0)]);
-     drw_text(drw, x, 0, w, bh, tags[i], 0);
-     drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-             occ & 1 << i, 0);
-     x += w;
- }
-```
- to this:  
- ```
- for (i = 0; i < LENGTH(tags); i++) {
-     w = TEXTW(tags[i]) + tagspacing;
-     drw_setscheme(drw, &scheme[(m->tagset[m->seltags] & 1 << i) ? 1 : (urg & 1 << i ? 2 : (occ & 1 << i ? 3:0))]);
-     drw_text(drw, x, 0, w, bh, tags[i], 0);
-     x += w;
- }
-```
- **Obs.:** You will need the [statuscolors](https://dwm.suckless.org/patches/statuscolors/) patch to set the colors to each situation (selected, normal, occupied, etc).
- - To remove the current window description, remove this _if/else statement_ in the _void drawbar_ function in the **dwm.c** file:
-    ```
-	if ((w = x - xx) > bh) {
-		x = xx;
-		if (m->sel) {
-			drw_setscheme(drw, &scheme[m == selmon ? 1 : 0]);
-			drw_text(drw, x, 0, w, bh, m->sel->name, 0);
-			drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0);
-		} else {
-			drw_setscheme(drw, &scheme[0]);
-			drw_rect(drw, x, 0, w, bh, 1, 0, 1);
-		}
-	}
-    ```
-
-
-dwm - dynamic window manager
-============================
-dwm is an extremely fast, small, and dynamic window manager for X.
-
-
-Requirements
-------------
-In order to build dwm you need the Xlib header files.
-
-
-Installation
-------------
-Edit config.mk to match your local setup (dwm is installed into
-the /usr/local namespace by default).
-
-Afterwards enter the following command to build and install dwm (if
-necessary as root):
-
-    make clean install
-
-If you are going to use the default bluegray color scheme it is highly
-recommended to also install the bluegray files shipped in the dextra package.
-
-
-Running dwm
------------
-Add the following line to your .xinitrc to start dwm using startx:
-
-    exec dwm
-
-In order to connect dwm to a specific display, make sure that
-the DISPLAY environment variable is set correctly, e.g.:
-
-    DISPLAY=foo.bar:1 exec dwm
-
-(This will start dwm on display :1 of the host foo.bar.)
-
-In order to display status info in the bar, you can do something
-like this in your .xinitrc:
-
-    while xsetroot -name "`date` `uptime | sed 's/.*,//'`"
-    do
-    	sleep 1
-    done &
-    exec dwm
-
-
-Configuration
--------------
-The configuration of dwm is done by creating a custom config.h
-and (re)compiling the source code.
diff --git a/suckless/dwm-6.1/TODO b/suckless/dwm-6.1/TODO
deleted file mode 100644
index b33a08d..0000000
--- a/suckless/dwm-6.1/TODO
+++ /dev/null
@@ -1,4 +0,0 @@
-- add a flag to Key to execute the command on release (needed for commands
-		affecting the keyboard grab, see scrot -s for example)
-- add updategeom() hook for external tools like dzen
-- consider onscreenkeyboard hooks for tablet deployment
diff --git a/suckless/dwm-6.1/config.def.h b/suckless/dwm-6.1/config.def.h
deleted file mode 100644
index 433b242..0000000
--- a/suckless/dwm-6.1/config.def.h
+++ /dev/null
@@ -1,114 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-static const char *fonts[] = {
-	"monospace:size=10"
-};
-static const char dmenufont[]       = "monospace:size=10";
-static const char normbordercolor[] = "#444444";
-static const char normbgcolor[]     = "#222222";
-static const char normfgcolor[]     = "#bbbbbb";
-static const char selbordercolor[]  = "#005577";
-static const char selbgcolor[]      = "#005577";
-static const char selfgcolor[]      = "#eeeeee";
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int gappx     = 18;       /* gap pixel between windows */
-static const unsigned int snap      = 32;       /* snap pixel */
-static const int showbar            = 1;        /* 0 means no bar */
-static const int topbar             = 1;        /* 0 means bottom bar */
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
-	/* xprop(1):
-	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
-	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
-};
-
-/* layout(s) */
-static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster     = 1;    /* number of clients in master area */
-static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
-
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
-};
-
-/* key definitions */
-#define MODKEY Mod1Mask
-#define TAGKEYS(KEY,TAG) \
-	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
-	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
-	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
-	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[]  = { "st", NULL };
-
-static Key keys[] = {
-	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY,                       XK_b,      togglebar,      {0} },
-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY,                       XK_Return, zoom,           {0} },
-	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-	{ MODKEY,                       XK_space,  setlayout,      {0} },
-	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-	TAGKEYS(                        XK_1,                      0)
-	TAGKEYS(                        XK_2,                      1)
-	TAGKEYS(                        XK_3,                      2)
-	TAGKEYS(                        XK_4,                      3)
-	TAGKEYS(                        XK_5,                      4)
-	TAGKEYS(                        XK_6,                      5)
-	TAGKEYS(                        XK_7,                      6)
-	TAGKEYS(                        XK_8,                      7)
-	TAGKEYS(                        XK_9,                      8)
-	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-};
-
-/* button definitions */
-/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
-	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
-	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
-	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-};
-
diff --git a/suckless/dwm-6.1/config.def.h.orig b/suckless/dwm-6.1/config.def.h.orig
deleted file mode 100644
index 7054c06..0000000
--- a/suckless/dwm-6.1/config.def.h.orig
+++ /dev/null
@@ -1,113 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-/* appearance */
-static const char *fonts[] = {
-	"monospace:size=10"
-};
-static const char dmenufont[]       = "monospace:size=10";
-static const char normbordercolor[] = "#444444";
-static const char normbgcolor[]     = "#222222";
-static const char normfgcolor[]     = "#bbbbbb";
-static const char selbordercolor[]  = "#005577";
-static const char selbgcolor[]      = "#005577";
-static const char selfgcolor[]      = "#eeeeee";
-static const unsigned int borderpx  = 1;        /* border pixel of windows */
-static const unsigned int snap      = 32;       /* snap pixel */
-static const int showbar            = 1;        /* 0 means no bar */
-static const int topbar             = 1;        /* 0 means bottom bar */
-
-/* tagging */
-static const char *tags[] = { "1", "2", "3", "4", "5", "6", "7", "8", "9" };
-
-static const Rule rules[] = {
-	/* xprop(1):
-	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
-	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Gimp",     NULL,       NULL,       0,            1,           -1 },
-	{ "Firefox",  NULL,       NULL,       1 << 8,       0,           -1 },
-};
-
-/* layout(s) */
-static const float mfact     = 0.55; /* factor of master area size [0.05..0.95] */
-static const int nmaster     = 1;    /* number of clients in master area */
-static const int resizehints = 1;    /* 1 means respect size hints in tiled resizals */
-
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-	{ "[]=",      tile },    /* first entry is default */
-	{ "><>",      NULL },    /* no layout function means floating behavior */
-	{ "[M]",      monocle },
-};
-
-/* key definitions */
-#define MODKEY Mod1Mask
-#define TAGKEYS(KEY,TAG) \
-	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
-	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
-	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
-	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[] = { "dmenu_run", "-m", dmenumon, "-fn", dmenufont, "-nb", normbgcolor, "-nf", normfgcolor, "-sb", selbgcolor, "-sf", selfgcolor, NULL };
-static const char *termcmd[]  = { "st", NULL };
-
-static Key keys[] = {
-	/* modifier                     key        function        argument */
-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-	{ MODKEY|ShiftMask,             XK_Return, spawn,          {.v = termcmd } },
-	{ MODKEY,                       XK_b,      togglebar,      {0} },
-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-	{ MODKEY,                       XK_Return, zoom,           {0} },
-	{ MODKEY,                       XK_Tab,    view,           {0} },
-	{ MODKEY|ShiftMask,             XK_c,      killclient,     {0} },
-	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-	{ MODKEY,                       XK_space,  setlayout,      {0} },
-	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-	TAGKEYS(                        XK_1,                      0)
-	TAGKEYS(                        XK_2,                      1)
-	TAGKEYS(                        XK_3,                      2)
-	TAGKEYS(                        XK_4,                      3)
-	TAGKEYS(                        XK_5,                      4)
-	TAGKEYS(                        XK_6,                      5)
-	TAGKEYS(                        XK_7,                      6)
-	TAGKEYS(                        XK_8,                      7)
-	TAGKEYS(                        XK_9,                      8)
-	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-};
-
-/* button definitions */
-/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
-	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
-	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
-	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-};
-
diff --git a/suckless/dwm-6.1/config.h b/suckless/dwm-6.1/config.h
deleted file mode 100644
index c2e89a5..0000000
--- a/suckless/dwm-6.1/config.h
+++ /dev/null
@@ -1,217 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#include "patches/moveresize.c"
-#include "patches/push.c"
-
-/* appearance */
-static const char *fonts[] = {
-    "cherry:style=Regular:size=8",
-    "Siji:style=Regular:size=9"
-};
-static const unsigned int borderpx   = 0;        /* border pixel of windows */
-static const unsigned int snap       = 32;       /* snap pixel */
-static const int showbar             = 1;        /* 0 means no bar */
-static const int topbar              = 1;        /* 0 means bottom bar */
-static const unsigned int gappx      = 12;       /* gap pixel between windows */
-static const unsigned int barsize    = 10;       /* size of the dwm bar */
-static const unsigned int tagspacing = 9;        /* size of the dwm bar */
-
-#define NUMCOLORS 9
-static const char colors[NUMCOLORS][MAXCOLORS][9] = {
-	// border	 foreground	  background 7C817C
-	{ "#ffffff",	 "#FDF7E1", 	  "#2A3334" },  // 0 = normal
-	{ "#181818", 	 "#FDF7E1", 	  "#e15443" },  // 1 = selected
-	{ "#b43030", 	 "#FDF7E1", 	  "#b23450" },  // 2 = urgent
-	{ "#181818", 	 "#FDF7E1", 	  "#394547" },  // 3 = occupied
-	{ "#212121", 	 "#ab7438", 	  "#0b0606" },  // 4 = yellow
-	{ "#212121", 	 "#475971", 	  "#0b0606" },  // 5 = blue
-	{ "#212121", 	 "#694255", 	  "#0b0606" },  // 6 = magenta
-	{ "#212121", 	 "#3e6868", 	  "#0b0606" },  // 7 = cyan
-	{ "#212121",	 "#cfa696", 	  "#0b0606" },  // 8 = grey
-};
-
-/* tagging */
-//static const char *tags[] = { "1", "2", "3", "4", "5" };
-static const char *tags[] = { "", "", "", "", "\ue241" };
-
-static const Rule rules[] = {
-	/* xprop(1):
-	 *	WM_CLASS(STRING) = instance, class
-	 *	WM_NAME(STRING) = title
-	 */
-	/* class      instance    title       tags mask     isfloating   monitor */
-	{ "Pale moon"     ,  NULL,       NULL,       1 << 1,       0,           -1 },
-	{ "Telegram"      ,  NULL,       NULL,       1 << 4,       0,           -1 },
-	{ "zathura"       ,  NULL,       NULL,       1 << 3,       0,           -1 },
-	{ "ranger"        ,  NULL,       NULL,       1 << 3,       0,           -1 },
-	{ "neomutt"       ,  NULL,       NULL,       1 << 3,       0,           -1 },
-};
-
-/* layout(s) */
-static const float mfact     = 0.5; /* factor of master area size [0.05..0.95] */
-static const int nmaster     = 1;    /* number of clients in master area */
-static const int resizehints = 0;    /* 1 means respect size hints in tiled resizals */
-
-static const Layout layouts[] = {
-	/* symbol     arrange function */
-    { "\ue002",   tile },    /* first entry is default */
-	{ "\ue006",   NULL },    /* no layout function means floating behavior */
-	{ "\ue000",   monocle }, /* monocle is good for maximizing the preservation and focusing of the window */
-};
-
-/* key definitions */
-/* Mod4Mask == Super key
- * Mod1Mask == Alt key
- * Mod5Mask == Alt Gr
- */
-#define MODKEY Mod4Mask
-#define TAGKEYS(KEY,TAG) \
-	{ MODKEY,                       KEY,      view,           {.ui = 1 << TAG} }, \
-	{ MODKEY|ControlMask,           KEY,      toggleview,     {.ui = 1 << TAG} }, \
-	{ MODKEY|ShiftMask,             KEY,      tag,            {.ui = 1 << TAG} }, \
-	{ MODKEY|ControlMask|ShiftMask, KEY,      toggletag,      {.ui = 1 << TAG} },
-
-/* helper for spawning shell commands in the pre dwm-5.0 fashion */
-#define SHCMD(cmd) { .v = (const char*[]){ "/bin/sh", "-c", cmd, NULL } }
-
-/* commands */
-static char dmenumon[2] = "0"; /* component of dmenucmd, manipulated in spawn() */
-static const char *dmenucmd[]   = { "dmenu_run", "-i", "-l", "3", "-p", "Search ", "-fn", "iosevka Nerd Font:size=11" , "-nb", "#394547", "-nf", "#D8DEE9", "-sb", "#e15443", "-sf", "#2D333D", "-w", "360", "-h", "20", "-x", "24", "-y", "42", NULL };
-static const char *termcmd[]    = { "st", NULL };
-static const char *mail[]       = { "st", "-c", "neomutt", "-e", "neomutt", NULL};
-static const char *ranger[]     = { "st", "-c", "ranger", "-e", "ranger", NULL};
-static const char *sudoranger[] = { "st", "-c", "ranger", "-e", "sudo", "ranger", NULL};
-static const char *dmoji[]      = { "dmoji", NULL};
-static const char *cmustatus[]  = { "cmus-status", NULL};
-static const char *weechat[]    = { "tmux", "new-window", "-t", "main", "weechat", NULL};
-static const char *voldown[]    = { "amixer", "-q", "sset", "Master", "2%-", NULL};
-static const char *volup[]      = { "amixer", "-q", "sset", "Master", "2%+", NULL};
-static const char *volsupdown[] = { "amixer", "-q", "sset", "Master", "5%-", NULL};
-static const char *volsuperup[] = { "amixer", "-q", "sset", "Master", "5%+", NULL};
-static const char *muteall[]    = { "amixer", "-q", "sset", "Master", "toggle", NULL};
-static const char *cmus[]       = { "tmux", "new-window", "-t", "main", "cmus", NULL};
-static const char *cmuspause[]  = { "cmus-remote", "--pause", NULL};
-static const char *lock[]       = { "amixer", "-q", "sset", "Master", "mute", "&&", "locki3.sh", NULL};
-
-static Key keys[] = {
-	/* modifier                     key        function        argument */
-    /* Toggle status bar */
-	{ MODKEY,                       XK_b,      togglebar,      {0} },
-
-	{ MODKEY,                       XK_j,      focusstack,     {.i = +1 } },
-	{ MODKEY,                       XK_k,      focusstack,     {.i = -1 } },
-
-    { MODKEY|ControlMask,           XK_j,      pushdown,       {0} },
-    { MODKEY|ControlMask,           XK_k,      pushup,         {0} },
-
-    /* For tile mode */
-	{ MODKEY,                       XK_i,      incnmaster,     {.i = +1 } },
-	{ MODKEY,                       XK_d,      incnmaster,     {.i = -1 } },
-
-	{ MODKEY,                       XK_h,      setmfact,       {.f = -0.05} },
-	{ MODKEY,                       XK_l,      setmfact,       {.f = +0.05} },
-
-	//{ MODKEY|ShiftMask,             XK_h,      setcfact,       {.f = +0.25} },
-	//{ MODKEY|ShiftMask,             XK_l,      setcfact,       {.f = -0.25} },
-	//{ MODKEY|ShiftMask,             XK_o,      setcfact,       {.f =  0.00} },
-
-    /* Move to the master side // Open terminal */
-	{ MODKEY|ShiftMask,             XK_Return, zoom,           {0} },
-	{ MODKEY,                       XK_Return, spawn,          {.v = termcmd } },
-
-    /* Mod + tab */
-	{ MODKEY,                       XK_Tab,    view,           {0} },
-
-    /* Choose layouts: 1-tile, 2-floating, 3-monocle */
-	{ MODKEY,                       XK_t,      setlayout,      {.v = &layouts[0]} },
-	{ MODKEY,                       XK_f,      setlayout,      {.v = &layouts[1]} },
-	{ MODKEY,                       XK_m,      setlayout,      {.v = &layouts[2]} },
-
-    /* Mute sound with alsa */
-	{ MODKEY|ShiftMask,             XK_m,      spawn,          {.v = muteall } },
-
-	{ MODKEY|ShiftMask,             XK_space,  togglefloating, {0} },
-	{ MODKEY,                       XK_space,  setlayout,      {0} },
-
-	{ MODKEY|ShiftMask,             XK_0,      tag,            {.ui = ~0 } },
-	{ MODKEY,                       XK_0,      view,           {.ui = ~0 } },
-
-	{ MODKEY|ShiftMask,             XK_comma,  tagmon,         {.i = -1 } },
-	{ MODKEY,                       XK_comma,  focusmon,       {.i = -1 } },
-	{ MODKEY|ShiftMask,             XK_period, tagmon,         {.i = +1 } },
-	{ MODKEY,                       XK_period, focusmon,       {.i = +1 } },
-
-    /* Show current song on dunst */
-	{ MODKEY,                       XK_c,      spawn,          {.v = cmustatus } },
-
-    /* Pause music in cmus // Launch dmenu */
-	{ MODKEY|ShiftMask,             XK_p,      spawn,          {.v = cmuspause } },
-	{ MODKEY,                       XK_p,      spawn,          {.v = dmenucmd } },
-
-    /* Open neomutt */
-	{ MODKEY,                       XK_n,      spawn,          {.v = mail } },
-
-    /* Quit dwm // kill window */
-	{ MODKEY|ShiftMask,             XK_q,      quit,           {0} },
-	{ MODKEY,                       XK_q,      killclient,     {0} },
-
-    /* Screenshots to clipboard */
-	{ MODKEY|ShiftMask,             XK_s,      spawn,          SHCMD("scrot -se 'xclip -selection clipboard -t image/png $f && rm -f $f'") },
-	{ MODKEY,                       XK_s,      spawn,          SHCMD("scrot -e 'xclip -selection clipboard -t image/png $f && rm -f $f'") },
-
-    /* Save Screenshots */
-	{ MODKEY|ShiftMask,             XK_Print,  spawn,          SHCMD("scrot -se 'mv $f ~/Pictures/scrot/' && sleep 1 && exec notify-send 'screenshot has been saved in ~/Pictures/scrot'") },
-	{ MODKEY,                       XK_Print,  spawn,          SHCMD("scrot -e 'mv $f ~/Pictures/scrot' && sleep 1 && exec notify-send 'screenshot has been saved in ~/Pictures/scrot'") },
-
-    /* Execute dmoji script // open weechat */
-	{ MODKEY|ShiftMask,             XK_w,      spawn,          {.v = dmoji } },
-	{ MODKEY,                       XK_w,      spawn,          {.v = weechat } },
-
-    /* Start ranger w/ sudo // start ranger */
-	{ MODKEY|ShiftMask,             XK_r,      spawn,          {.v = sudoranger } },
-	{ MODKEY,                       XK_r,      spawn,          {.v = ranger } },
-
-    /* Lock pc (it is not working) T_T */
-	{ MODKEY,                       XK_x,      spawn,          SHCMD("amixer -q sset Master mute && $HOME/bin/locki3.sh") },
-
-    /* Super increase volume // increase volume */
-	{ MODKEY|ShiftMask,             XK_equal,  spawn,          {.v = volsuperup } },
-	{ MODKEY,                       XK_equal,  spawn,          {.v = volup } },
-
-    /* Super decrease volume // decrease volume */
-	{ MODKEY|ShiftMask,             XK_minus,  spawn,          {.v = volsupdown } },
-	{ MODKEY,                       XK_minus,  spawn,          {.v = voldown } },
-
-	{ MODKEY,                       XK_Up,     moveresize,     {.v = "0x -25y 0w 0h"} },
-	{ MODKEY,                       XK_Down,   moveresize,     {.v = "0x 25y 0w 0h"} },
-	{ MODKEY,                       XK_Left,   moveresize,     {.v = "-25x 0y 0w 0h"} },
-	{ MODKEY,                       XK_Right,  moveresize,     {.v = "25x 0y 0w 0h"} },
-	{ MODKEY|ShiftMask,             XK_Up,     moveresize,     {.v = "0x 0y 0w -25h"} },
-	{ MODKEY|ShiftMask,             XK_Down,   moveresize,     {.v = "0x 0y 0w 25h"} },
-	{ MODKEY|ShiftMask,             XK_Left,   moveresize,     {.v = "0x 0y -25w 0h"} },
-	{ MODKEY|ShiftMask,             XK_Right,  moveresize,     {.v = "0x 0y 25w 0h"} },
-
-	TAGKEYS(                        XK_1,                      0)
-	TAGKEYS(                        XK_2,                      1)
-	TAGKEYS(                        XK_3,                      2)
-	TAGKEYS(                        XK_4,                      3)
-	TAGKEYS(                        XK_5,                      4)
-};
-
-/* button definitions */
-/* click can be ClkLtSymbol, ClkStatusText, ClkWinTitle, ClkClientWin, or ClkRootWin */
-static Button buttons[] = {
-	/* click                event mask      button          function        argument */
-	{ ClkLtSymbol,          0,              Button1,        setlayout,      {0} },
-	{ ClkLtSymbol,          0,              Button3,        setlayout,      {.v = &layouts[2]} },
-	{ ClkWinTitle,          0,              Button2,        zoom,           {0} },
-	{ ClkStatusText,        0,              Button2,        spawn,          {.v = termcmd } },
-	{ ClkClientWin,         MODKEY,         Button1,        movemouse,      {0} },
-	{ ClkClientWin,         MODKEY,         Button2,        togglefloating, {0} },
-	{ ClkClientWin,         MODKEY,         Button3,        resizemouse,    {0} },
-	{ ClkTagBar,            0,              Button1,        view,           {0} },
-	{ ClkTagBar,            0,              Button3,        toggleview,     {0} },
-	{ ClkTagBar,            MODKEY,         Button1,        tag,            {0} },
-	{ ClkTagBar,            MODKEY,         Button3,        toggletag,      {0} },
-};
-
diff --git a/suckless/dwm-6.1/config.mk b/suckless/dwm-6.1/config.mk
deleted file mode 100644
index 1fcf34f..0000000
--- a/suckless/dwm-6.1/config.mk
+++ /dev/null
@@ -1,38 +0,0 @@
-# dwm version
-VERSION = 6.1
-
-# Customize below to fit your system
-
-# paths
-PREFIX = /usr/local
-MANPREFIX = ${PREFIX}/share/man
-
-X11INC = /usr/include/X11
-X11LIB = /usr/lib/X11
-
-# Xinerama, comment if you don't want it
-XINERAMALIBS  = -lXinerama
-XINERAMAFLAGS = -DXINERAMA
-
-# freetype
-FREETYPELIBS = -lfontconfig -lXft
-FREETYPEINC = /usr/include/freetype2
-# OpenBSD (uncomment)
-#FREETYPEINC = ${X11INC}/freetype2
-
-# includes and libs
-INCS = -I${X11INC} -I${FREETYPEINC}
-LIBS = -L${X11LIB} -lX11 ${XINERAMALIBS} ${FREETYPELIBS}
-
-# flags
-CPPFLAGS = -D_BSD_SOURCE -D_POSIX_C_SOURCE=2 -DVERSION=\"${VERSION}\" ${XINERAMAFLAGS}
-#CFLAGS   = -g -std=c99 -pedantic -Wall -O0 ${INCS} ${CPPFLAGS}
-CFLAGS   = -std=c99 -pedantic -Wall -Wno-deprecated-declarations -Os ${INCS} ${CPPFLAGS}
-LDFLAGS  = -s ${LIBS}
-
-# Solaris
-#CFLAGS = -fast ${INCS} -DVERSION=\"${VERSION}\"
-#LDFLAGS = ${LIBS}
-
-# compiler and linker
-CC = cc
diff --git a/suckless/dwm-6.1/drw.c b/suckless/dwm-6.1/drw.c
deleted file mode 100644
index 2ea3ae4..0000000
--- a/suckless/dwm-6.1/drw.c
+++ /dev/null
@@ -1,460 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-#define UTF_INVALID 0xFFFD
-#define UTF_SIZ     4
-
-static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
-static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-static long
-utf8decodebyte(const char c, size_t *i)
-{
-	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
-		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
-			return (unsigned char)c & ~utfmask[*i];
-	return 0;
-}
-
-static size_t
-utf8validate(long *u, size_t i)
-{
-	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
-		*u = UTF_INVALID;
-	for (i = 1; *u > utfmax[i]; ++i)
-		;
-	return i;
-}
-
-static size_t
-utf8decode(const char *c, long *u, size_t clen)
-{
-	size_t i, j, len, type;
-	long udecoded;
-
-	*u = UTF_INVALID;
-	if (!clen)
-		return 0;
-	udecoded = utf8decodebyte(c[0], &len);
-	if (!BETWEEN(len, 1, UTF_SIZ))
-		return 1;
-	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
-		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-		if (type)
-			return j;
-	}
-	if (j < len)
-		return 0;
-	*u = udecoded;
-	utf8validate(u, len);
-
-	return len;
-}
-
-Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-{
-	Drw *drw;
-
-	drw = ecalloc(1, sizeof(Drw));
-	drw->dpy = dpy;
-	drw->screen = screen;
-	drw->root = root;
-	drw->w = w;
-	drw->h = h;
-	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-	drw->gc = XCreateGC(dpy, root, 0, NULL);
-	drw->fontcount = 0;
-	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-	return drw;
-}
-
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
-	drw->w = w;
-	drw->h = h;
-	if (drw->drawable)
-		XFreePixmap(drw->dpy, drw->drawable);
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-}
-
-void
-drw_free(Drw *drw)
-{
-	size_t i;
-
-	for (i = 0; i < drw->fontcount; i++)
-		drw_font_free(drw->fonts[i]);
-	XFreePixmap(drw->dpy, drw->drawable);
-	XFreeGC(drw->dpy, drw->gc);
-	free(drw);
-}
-
-/* This function is an implementation detail. Library users should use
- * drw_font_create instead.
- */
-static Fnt *
-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
-{
-	Fnt *font;
-	XftFont *xfont = NULL;
-	FcPattern *pattern = NULL;
-
-	if (fontname) {
-		/* Using the pattern found at font->xfont->pattern does not yield same
-		 * the same substitution results as using the pattern returned by
-		 * FcNameParse; using the latter results in the desired fallback
-		 * behaviour whereas the former just results in
-		 * missing-character-rectangles being drawn, at least with some fonts.
-		 */
-		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
-			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
-			return NULL;
-		}
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
-			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
-			XftFontClose(drw->dpy, xfont);
-			return NULL;
-		}
-	} else if (fontpattern) {
-		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-			fprintf(stderr, "error, cannot load font pattern.\n");
-			return NULL;
-		}
-	} else {
-		die("no font specified.\n");
-	}
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->xfont = xfont;
-	font->pattern = pattern;
-	font->ascent = xfont->ascent;
-	font->descent = xfont->descent;
-	font->h = font->ascent + font->descent;
-	font->dpy = drw->dpy;
-
-	return font;
-}
-
-Fnt*
-drw_font_create(Drw *drw, const char *fontname)
-{
-	return drw_font_xcreate(drw, fontname, NULL);
-}
-
-void
-drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
-{
-	size_t i;
-	Fnt *font;
-
-	for (i = 0; i < fontcount; i++) {
-		if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
-			die("font cache exhausted.\n");
-		} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
-			drw->fonts[drw->fontcount++] = font;
-		}
-	}
-}
-
-void
-drw_font_free(Fnt *font)
-{
-	if (!font)
-		return;
-	if (font->pattern)
-		FcPatternDestroy(font->pattern);
-	XftFontClose(font->dpy, font->xfont);
-	free(font);
-}
-
-Clr *
-drw_clr_create(Drw *drw, const char *clrname)
-{
-	Clr *clr;
-
-	clr = ecalloc(1, sizeof(Clr));
-	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
-	                       clrname, &clr->rgb))
-		die("error, cannot allocate color '%s'\n", clrname);
-	clr->pix = clr->rgb.pixel;
-
-	return clr;
-}
-
-void
-drw_clr_free(Clr *clr)
-{
-	free(clr);
-}
-
-void
-drw_setscheme(Drw *drw, ClrScheme *scheme)
-{
-	drw->scheme = scheme;
-}
-
-int
-drw_get_width(Drw *drw, int numcolors, const char *text)
-{
-	int i;
-	Fnt *curfont = drw->fonts[0];
-	int w = drw_text(drw, 0, 0, 0, 0, text, 0) + curfont->h;
-
-	for (i = 0; i < strlen(text); i++) {
-		if (text[i] > 0 && text[i] <= numcolors) {
-			/* we found a color code
-			 * drw_text counted it as a normal character and added one character's width
-			 * we aren't going to render this character, so we remove one character's width */
-			w -= curfont->xfont->max_advance_width;
-
-			if (i == 0 || i + 1 == strlen(text)) {
-				/* we're on the first or the last character of the string
-				 * drw_text already added one character's height (divided by 2) as padding to the beginning and end
-				 * we don't want to double this padding, so we skip this character */
-				continue;
-			}
-
-			if (text[i - 1] > 0 && text[i - 1] <= numcolors) {
-				/* the previous character was also a color code
-				 * we already added padding in the previous iteration
-				 * we don't want to double this padding, so we skip this character */
-				continue;
-			}
-
-			/* we are somewhere in the middle of the string and the color has changed
-			 * we want to add one character's height (divided by 2) as padding to the end of the previous colored text
-			 * and to the beginning of the new colored text */
-			w += curfont->h;
-		}
-	}
-
-  return w;
-}
-
-void
-drw_colored_text(Drw *drw, ClrScheme *scheme, int numcolors, int x, int y, unsigned int w, unsigned int h, char *text)
-{
-	if (!drw || !drw->fontcount || !drw->scheme)
-		return;
-
-	char *buf = text, *ptr = buf, c = 1;
-	int i;
-
-	while (*ptr) {
-		for (i = 0; *ptr < 0 || *ptr > numcolors; i++, ptr++);
-		if (!*ptr)
-			break;
-		c = *ptr;
-		*ptr = 0;
-		if (i)
-			x = drw_text(drw, x, y, w, h, buf, 0) + drw->fonts[0]->h;
-		*ptr = c;
-		drw_setscheme(drw, &scheme[c-1]);
-		buf = ++ptr;
-	}
-	drw_text(drw, x, y, w, h, buf, 0);
-}
-
-void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
-{
-	if (!drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
-	if (filled)
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
-	else if (empty)
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-}
-
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
-{
-	char buf[1024];
-	int tx, ty, th;
-	Extnts tex;
-	XftDraw *d = NULL;
-	Fnt *curfont, *nextfont;
-	size_t i, len;
-	int utf8strlen, utf8charlen, render;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0;
-
-	if (!drw->scheme || !drw->fontcount)
-		return 0;
-
-	if (!(render = x || y || w || h)) {
-		w = ~w;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, invert ?
-		               drw->scheme->fg->pix : drw->scheme->bg->pix);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-	}
-
-	curfont = drw->fonts[0];
-	while (1) {
-		utf8strlen = 0;
-		utf8str = text;
-		nextfont = NULL;
-		while (*text) {
-			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
-			for (i = 0; i < drw->fontcount; i++) {
-				charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint);
-				if (charexists) {
-					if (drw->fonts[i] == curfont) {
-						utf8strlen += utf8charlen;
-						text += utf8charlen;
-					} else {
-						nextfont = drw->fonts[i];
-					}
-					break;
-				}
-			}
-
-			if (!charexists || (nextfont && nextfont != curfont))
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (utf8strlen) {
-			drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
-			/* shorten text if necessary */
-			for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
-				drw_font_getexts(curfont, utf8str, len, &tex);
-
-			if (len) {
-				memcpy(buf, utf8str, len);
-				buf[len] = '\0';
-				if (len < utf8strlen)
-					for (i = len; i && i > len - 3; buf[--i] = '.');
-
-				if (render) {
-					th = curfont->ascent + curfont->descent;
-					ty = y + (h / 2) - (th / 2) + curfont->ascent;
-					tx = x + (h / 2);
-					XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
-				}
-				x += tex.w;
-				w -= tex.w;
-			}
-		}
-
-		if (!*text) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			curfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn.
-			 */
-			charexists = 1;
-
-			if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
-				continue;
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts[0]->pattern) {
-				/* Refer to the comment in drw_font_xcreate for more
-				 * information. */
-				die("the first font in the cache must be loaded from a font string.\n");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				curfont = drw_font_xcreate(drw, NULL, match);
-				if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
-					drw->fonts[drw->fontcount++] = curfont;
-				} else {
-					drw_font_free(curfont);
-					curfont = drw->fonts[0];
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x;
-}
-
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
-	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
-	XSync(drw->dpy, False);
-}
-
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
-{
-	XGlyphInfo ext;
-
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	tex->h = font->h;
-	tex->w = ext.xOff;
-}
-
-unsigned int
-drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
-{
-	Extnts tex;
-
-	drw_font_getexts(font, text, len, &tex);
-
-	return tex.w;
-}
-
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
-	Cur *cur;
-
-	cur = ecalloc(1, sizeof(Cur));
-	cur->cursor = XCreateFontCursor(drw->dpy, shape);
-
-	return cur;
-}
-
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
-	if (!cursor)
-		return;
-	XFreeCursor(drw->dpy, cursor->cursor);
-	free(cursor);
-}
diff --git a/suckless/dwm-6.1/drw.c.orig b/suckless/dwm-6.1/drw.c.orig
deleted file mode 100644
index 2ea3ae4..0000000
--- a/suckless/dwm-6.1/drw.c.orig
+++ /dev/null
@@ -1,460 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <X11/Xlib.h>
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-#define UTF_INVALID 0xFFFD
-#define UTF_SIZ     4
-
-static const unsigned char utfbyte[UTF_SIZ + 1] = {0x80,    0, 0xC0, 0xE0, 0xF0};
-static const unsigned char utfmask[UTF_SIZ + 1] = {0xC0, 0x80, 0xE0, 0xF0, 0xF8};
-static const long utfmin[UTF_SIZ + 1] = {       0,    0,  0x80,  0x800,  0x10000};
-static const long utfmax[UTF_SIZ + 1] = {0x10FFFF, 0x7F, 0x7FF, 0xFFFF, 0x10FFFF};
-
-static long
-utf8decodebyte(const char c, size_t *i)
-{
-	for (*i = 0; *i < (UTF_SIZ + 1); ++(*i))
-		if (((unsigned char)c & utfmask[*i]) == utfbyte[*i])
-			return (unsigned char)c & ~utfmask[*i];
-	return 0;
-}
-
-static size_t
-utf8validate(long *u, size_t i)
-{
-	if (!BETWEEN(*u, utfmin[i], utfmax[i]) || BETWEEN(*u, 0xD800, 0xDFFF))
-		*u = UTF_INVALID;
-	for (i = 1; *u > utfmax[i]; ++i)
-		;
-	return i;
-}
-
-static size_t
-utf8decode(const char *c, long *u, size_t clen)
-{
-	size_t i, j, len, type;
-	long udecoded;
-
-	*u = UTF_INVALID;
-	if (!clen)
-		return 0;
-	udecoded = utf8decodebyte(c[0], &len);
-	if (!BETWEEN(len, 1, UTF_SIZ))
-		return 1;
-	for (i = 1, j = 1; i < clen && j < len; ++i, ++j) {
-		udecoded = (udecoded << 6) | utf8decodebyte(c[i], &type);
-		if (type)
-			return j;
-	}
-	if (j < len)
-		return 0;
-	*u = udecoded;
-	utf8validate(u, len);
-
-	return len;
-}
-
-Drw *
-drw_create(Display *dpy, int screen, Window root, unsigned int w, unsigned int h)
-{
-	Drw *drw;
-
-	drw = ecalloc(1, sizeof(Drw));
-	drw->dpy = dpy;
-	drw->screen = screen;
-	drw->root = root;
-	drw->w = w;
-	drw->h = h;
-	drw->drawable = XCreatePixmap(dpy, root, w, h, DefaultDepth(dpy, screen));
-	drw->gc = XCreateGC(dpy, root, 0, NULL);
-	drw->fontcount = 0;
-	XSetLineAttributes(dpy, drw->gc, 1, LineSolid, CapButt, JoinMiter);
-
-	return drw;
-}
-
-void
-drw_resize(Drw *drw, unsigned int w, unsigned int h)
-{
-	drw->w = w;
-	drw->h = h;
-	if (drw->drawable)
-		XFreePixmap(drw->dpy, drw->drawable);
-	drw->drawable = XCreatePixmap(drw->dpy, drw->root, w, h, DefaultDepth(drw->dpy, drw->screen));
-}
-
-void
-drw_free(Drw *drw)
-{
-	size_t i;
-
-	for (i = 0; i < drw->fontcount; i++)
-		drw_font_free(drw->fonts[i]);
-	XFreePixmap(drw->dpy, drw->drawable);
-	XFreeGC(drw->dpy, drw->gc);
-	free(drw);
-}
-
-/* This function is an implementation detail. Library users should use
- * drw_font_create instead.
- */
-static Fnt *
-drw_font_xcreate(Drw *drw, const char *fontname, FcPattern *fontpattern)
-{
-	Fnt *font;
-	XftFont *xfont = NULL;
-	FcPattern *pattern = NULL;
-
-	if (fontname) {
-		/* Using the pattern found at font->xfont->pattern does not yield same
-		 * the same substitution results as using the pattern returned by
-		 * FcNameParse; using the latter results in the desired fallback
-		 * behaviour whereas the former just results in
-		 * missing-character-rectangles being drawn, at least with some fonts.
-		 */
-		if (!(xfont = XftFontOpenName(drw->dpy, drw->screen, fontname))) {
-			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
-			return NULL;
-		}
-		if (!(pattern = FcNameParse((FcChar8 *) fontname))) {
-			fprintf(stderr, "error, cannot load font: '%s'\n", fontname);
-			XftFontClose(drw->dpy, xfont);
-			return NULL;
-		}
-	} else if (fontpattern) {
-		if (!(xfont = XftFontOpenPattern(drw->dpy, fontpattern))) {
-			fprintf(stderr, "error, cannot load font pattern.\n");
-			return NULL;
-		}
-	} else {
-		die("no font specified.\n");
-	}
-
-	font = ecalloc(1, sizeof(Fnt));
-	font->xfont = xfont;
-	font->pattern = pattern;
-	font->ascent = xfont->ascent;
-	font->descent = xfont->descent;
-	font->h = font->ascent + font->descent;
-	font->dpy = drw->dpy;
-
-	return font;
-}
-
-Fnt*
-drw_font_create(Drw *drw, const char *fontname)
-{
-	return drw_font_xcreate(drw, fontname, NULL);
-}
-
-void
-drw_load_fonts(Drw* drw, const char *fonts[], size_t fontcount)
-{
-	size_t i;
-	Fnt *font;
-
-	for (i = 0; i < fontcount; i++) {
-		if (drw->fontcount >= DRW_FONT_CACHE_SIZE) {
-			die("font cache exhausted.\n");
-		} else if ((font = drw_font_xcreate(drw, fonts[i], NULL))) {
-			drw->fonts[drw->fontcount++] = font;
-		}
-	}
-}
-
-void
-drw_font_free(Fnt *font)
-{
-	if (!font)
-		return;
-	if (font->pattern)
-		FcPatternDestroy(font->pattern);
-	XftFontClose(font->dpy, font->xfont);
-	free(font);
-}
-
-Clr *
-drw_clr_create(Drw *drw, const char *clrname)
-{
-	Clr *clr;
-
-	clr = ecalloc(1, sizeof(Clr));
-	if (!XftColorAllocName(drw->dpy, DefaultVisual(drw->dpy, drw->screen),
-	                       DefaultColormap(drw->dpy, drw->screen),
-	                       clrname, &clr->rgb))
-		die("error, cannot allocate color '%s'\n", clrname);
-	clr->pix = clr->rgb.pixel;
-
-	return clr;
-}
-
-void
-drw_clr_free(Clr *clr)
-{
-	free(clr);
-}
-
-void
-drw_setscheme(Drw *drw, ClrScheme *scheme)
-{
-	drw->scheme = scheme;
-}
-
-int
-drw_get_width(Drw *drw, int numcolors, const char *text)
-{
-	int i;
-	Fnt *curfont = drw->fonts[0];
-	int w = drw_text(drw, 0, 0, 0, 0, text, 0) + curfont->h;
-
-	for (i = 0; i < strlen(text); i++) {
-		if (text[i] > 0 && text[i] <= numcolors) {
-			/* we found a color code
-			 * drw_text counted it as a normal character and added one character's width
-			 * we aren't going to render this character, so we remove one character's width */
-			w -= curfont->xfont->max_advance_width;
-
-			if (i == 0 || i + 1 == strlen(text)) {
-				/* we're on the first or the last character of the string
-				 * drw_text already added one character's height (divided by 2) as padding to the beginning and end
-				 * we don't want to double this padding, so we skip this character */
-				continue;
-			}
-
-			if (text[i - 1] > 0 && text[i - 1] <= numcolors) {
-				/* the previous character was also a color code
-				 * we already added padding in the previous iteration
-				 * we don't want to double this padding, so we skip this character */
-				continue;
-			}
-
-			/* we are somewhere in the middle of the string and the color has changed
-			 * we want to add one character's height (divided by 2) as padding to the end of the previous colored text
-			 * and to the beginning of the new colored text */
-			w += curfont->h;
-		}
-	}
-
-  return w;
-}
-
-void
-drw_colored_text(Drw *drw, ClrScheme *scheme, int numcolors, int x, int y, unsigned int w, unsigned int h, char *text)
-{
-	if (!drw || !drw->fontcount || !drw->scheme)
-		return;
-
-	char *buf = text, *ptr = buf, c = 1;
-	int i;
-
-	while (*ptr) {
-		for (i = 0; *ptr < 0 || *ptr > numcolors; i++, ptr++);
-		if (!*ptr)
-			break;
-		c = *ptr;
-		*ptr = 0;
-		if (i)
-			x = drw_text(drw, x, y, w, h, buf, 0) + drw->fonts[0]->h;
-		*ptr = c;
-		drw_setscheme(drw, &scheme[c-1]);
-		buf = ++ptr;
-	}
-	drw_text(drw, x, y, w, h, buf, 0);
-}
-
-void
-drw_rect(Drw *drw, int x, int y, unsigned int w, unsigned int h, int filled, int empty, int invert)
-{
-	if (!drw->scheme)
-		return;
-	XSetForeground(drw->dpy, drw->gc, invert ? drw->scheme->bg->pix : drw->scheme->fg->pix);
-	if (filled)
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w + 1, h + 1);
-	else if (empty)
-		XDrawRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-}
-
-int
-drw_text(Drw *drw, int x, int y, unsigned int w, unsigned int h, const char *text, int invert)
-{
-	char buf[1024];
-	int tx, ty, th;
-	Extnts tex;
-	XftDraw *d = NULL;
-	Fnt *curfont, *nextfont;
-	size_t i, len;
-	int utf8strlen, utf8charlen, render;
-	long utf8codepoint = 0;
-	const char *utf8str;
-	FcCharSet *fccharset;
-	FcPattern *fcpattern;
-	FcPattern *match;
-	XftResult result;
-	int charexists = 0;
-
-	if (!drw->scheme || !drw->fontcount)
-		return 0;
-
-	if (!(render = x || y || w || h)) {
-		w = ~w;
-	} else {
-		XSetForeground(drw->dpy, drw->gc, invert ?
-		               drw->scheme->fg->pix : drw->scheme->bg->pix);
-		XFillRectangle(drw->dpy, drw->drawable, drw->gc, x, y, w, h);
-		d = XftDrawCreate(drw->dpy, drw->drawable,
-		                  DefaultVisual(drw->dpy, drw->screen),
-		                  DefaultColormap(drw->dpy, drw->screen));
-	}
-
-	curfont = drw->fonts[0];
-	while (1) {
-		utf8strlen = 0;
-		utf8str = text;
-		nextfont = NULL;
-		while (*text) {
-			utf8charlen = utf8decode(text, &utf8codepoint, UTF_SIZ);
-			for (i = 0; i < drw->fontcount; i++) {
-				charexists = charexists || XftCharExists(drw->dpy, drw->fonts[i]->xfont, utf8codepoint);
-				if (charexists) {
-					if (drw->fonts[i] == curfont) {
-						utf8strlen += utf8charlen;
-						text += utf8charlen;
-					} else {
-						nextfont = drw->fonts[i];
-					}
-					break;
-				}
-			}
-
-			if (!charexists || (nextfont && nextfont != curfont))
-				break;
-			else
-				charexists = 0;
-		}
-
-		if (utf8strlen) {
-			drw_font_getexts(curfont, utf8str, utf8strlen, &tex);
-			/* shorten text if necessary */
-			for (len = MIN(utf8strlen, (sizeof buf) - 1); len && (tex.w > w - drw->fonts[0]->h || w < drw->fonts[0]->h); len--)
-				drw_font_getexts(curfont, utf8str, len, &tex);
-
-			if (len) {
-				memcpy(buf, utf8str, len);
-				buf[len] = '\0';
-				if (len < utf8strlen)
-					for (i = len; i && i > len - 3; buf[--i] = '.');
-
-				if (render) {
-					th = curfont->ascent + curfont->descent;
-					ty = y + (h / 2) - (th / 2) + curfont->ascent;
-					tx = x + (h / 2);
-					XftDrawStringUtf8(d, invert ? &drw->scheme->bg->rgb : &drw->scheme->fg->rgb, curfont->xfont, tx, ty, (XftChar8 *)buf, len);
-				}
-				x += tex.w;
-				w -= tex.w;
-			}
-		}
-
-		if (!*text) {
-			break;
-		} else if (nextfont) {
-			charexists = 0;
-			curfont = nextfont;
-		} else {
-			/* Regardless of whether or not a fallback font is found, the
-			 * character must be drawn.
-			 */
-			charexists = 1;
-
-			if (drw->fontcount >= DRW_FONT_CACHE_SIZE)
-				continue;
-
-			fccharset = FcCharSetCreate();
-			FcCharSetAddChar(fccharset, utf8codepoint);
-
-			if (!drw->fonts[0]->pattern) {
-				/* Refer to the comment in drw_font_xcreate for more
-				 * information. */
-				die("the first font in the cache must be loaded from a font string.\n");
-			}
-
-			fcpattern = FcPatternDuplicate(drw->fonts[0]->pattern);
-			FcPatternAddCharSet(fcpattern, FC_CHARSET, fccharset);
-			FcPatternAddBool(fcpattern, FC_SCALABLE, FcTrue);
-
-			FcConfigSubstitute(NULL, fcpattern, FcMatchPattern);
-			FcDefaultSubstitute(fcpattern);
-			match = XftFontMatch(drw->dpy, drw->screen, fcpattern, &result);
-
-			FcCharSetDestroy(fccharset);
-			FcPatternDestroy(fcpattern);
-
-			if (match) {
-				curfont = drw_font_xcreate(drw, NULL, match);
-				if (curfont && XftCharExists(drw->dpy, curfont->xfont, utf8codepoint)) {
-					drw->fonts[drw->fontcount++] = curfont;
-				} else {
-					drw_font_free(curfont);
-					curfont = drw->fonts[0];
-				}
-			}
-		}
-	}
-	if (d)
-		XftDrawDestroy(d);
-
-	return x;
-}
-
-void
-drw_map(Drw *drw, Window win, int x, int y, unsigned int w, unsigned int h)
-{
-	XCopyArea(drw->dpy, drw->drawable, win, drw->gc, x, y, w, h, x, y);
-	XSync(drw->dpy, False);
-}
-
-void
-drw_font_getexts(Fnt *font, const char *text, unsigned int len, Extnts *tex)
-{
-	XGlyphInfo ext;
-
-	XftTextExtentsUtf8(font->dpy, font->xfont, (XftChar8 *)text, len, &ext);
-	tex->h = font->h;
-	tex->w = ext.xOff;
-}
-
-unsigned int
-drw_font_getexts_width(Fnt *font, const char *text, unsigned int len)
-{
-	Extnts tex;
-
-	drw_font_getexts(font, text, len, &tex);
-
-	return tex.w;
-}
-
-Cur *
-drw_cur_create(Drw *drw, int shape)
-{
-	Cur *cur;
-
-	cur = ecalloc(1, sizeof(Cur));
-	cur->cursor = XCreateFontCursor(drw->dpy, shape);
-
-	return cur;
-}
-
-void
-drw_cur_free(Drw *drw, Cur *cursor)
-{
-	if (!cursor)
-		return;
-	XFreeCursor(drw->dpy, cursor->cursor);
-	free(cursor);
-}
diff --git a/suckless/dwm-6.1/drw.h b/suckless/dwm-6.1/drw.h
deleted file mode 100644
index c51f6cd..0000000
--- a/suckless/dwm-6.1/drw.h
+++ /dev/null
@@ -1,76 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#define DRW_FONT_CACHE_SIZE 32
-
-typedef struct {
-	unsigned long pix;
-	XftColor rgb;
-} Clr;
-
-typedef struct {
-	Cursor cursor;
-} Cur;
-
-typedef struct {
-	Display *dpy;
-	int ascent;
-	int descent;
-	unsigned int h;
-	XftFont *xfont;
-	FcPattern *pattern;
-} Fnt;
-
-typedef struct {
-	Clr *fg;
-	Clr *bg;
-	Clr *border;
-} ClrScheme;
-
-typedef struct {
-	unsigned int w, h;
-	Display *dpy;
-	int screen;
-	Window root;
-	Drawable drawable;
-	GC gc;
-	ClrScheme *scheme;
-	size_t fontcount;
-	Fnt *fonts[DRW_FONT_CACHE_SIZE];
-} Drw;
-
-typedef struct {
-	unsigned int w;
-	unsigned int h;
-} Extnts;
-
-/* Drawable abstraction */
-Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
-void drw_resize(Drw *, unsigned int, unsigned int);
-void drw_free(Drw *);
-
-/* Fnt abstraction */
-Fnt *drw_font_create(Drw *, const char *);
-void drw_load_fonts(Drw *, const char *[], size_t);
-void drw_font_free(Fnt *);
-void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
-unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);
-
-/* Colour abstraction */
-Clr *drw_clr_create(Drw *, const char *);
-void drw_clr_free(Clr *);
-
-/* Cursor abstraction */
-Cur *drw_cur_create(Drw *, int);
-void drw_cur_free(Drw *, Cur *);
-
-/* Drawing context manipulation */
-void drw_setfont(Drw *, Fnt *);
-void drw_setscheme(Drw *, ClrScheme *);
-
-/* Drawing functions */
-int drw_get_width(Drw *, int, const char *);
-void drw_colored_text(Drw *, ClrScheme *, int, int, int, unsigned int, unsigned int, char *);
-void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
-int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int);
-
-/* Map functions */
-void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);
diff --git a/suckless/dwm-6.1/drw.h.orig b/suckless/dwm-6.1/drw.h.orig
deleted file mode 100644
index c51f6cd..0000000
--- a/suckless/dwm-6.1/drw.h.orig
+++ /dev/null
@@ -1,76 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#define DRW_FONT_CACHE_SIZE 32
-
-typedef struct {
-	unsigned long pix;
-	XftColor rgb;
-} Clr;
-
-typedef struct {
-	Cursor cursor;
-} Cur;
-
-typedef struct {
-	Display *dpy;
-	int ascent;
-	int descent;
-	unsigned int h;
-	XftFont *xfont;
-	FcPattern *pattern;
-} Fnt;
-
-typedef struct {
-	Clr *fg;
-	Clr *bg;
-	Clr *border;
-} ClrScheme;
-
-typedef struct {
-	unsigned int w, h;
-	Display *dpy;
-	int screen;
-	Window root;
-	Drawable drawable;
-	GC gc;
-	ClrScheme *scheme;
-	size_t fontcount;
-	Fnt *fonts[DRW_FONT_CACHE_SIZE];
-} Drw;
-
-typedef struct {
-	unsigned int w;
-	unsigned int h;
-} Extnts;
-
-/* Drawable abstraction */
-Drw *drw_create(Display *, int, Window, unsigned int, unsigned int);
-void drw_resize(Drw *, unsigned int, unsigned int);
-void drw_free(Drw *);
-
-/* Fnt abstraction */
-Fnt *drw_font_create(Drw *, const char *);
-void drw_load_fonts(Drw *, const char *[], size_t);
-void drw_font_free(Fnt *);
-void drw_font_getexts(Fnt *, const char *, unsigned int, Extnts *);
-unsigned int drw_font_getexts_width(Fnt *, const char *, unsigned int);
-
-/* Colour abstraction */
-Clr *drw_clr_create(Drw *, const char *);
-void drw_clr_free(Clr *);
-
-/* Cursor abstraction */
-Cur *drw_cur_create(Drw *, int);
-void drw_cur_free(Drw *, Cur *);
-
-/* Drawing context manipulation */
-void drw_setfont(Drw *, Fnt *);
-void drw_setscheme(Drw *, ClrScheme *);
-
-/* Drawing functions */
-int drw_get_width(Drw *, int, const char *);
-void drw_colored_text(Drw *, ClrScheme *, int, int, int, unsigned int, unsigned int, char *);
-void drw_rect(Drw *, int, int, unsigned int, unsigned int, int, int, int);
-int drw_text(Drw *, int, int, unsigned int, unsigned int, const char *, int);
-
-/* Map functions */
-void drw_map(Drw *, Window, int, int, unsigned int, unsigned int);
diff --git a/suckless/dwm-6.1/drw.o b/suckless/dwm-6.1/drw.o
deleted file mode 100644
index c04ca58..0000000
Binary files a/suckless/dwm-6.1/drw.o and /dev/null differ
diff --git a/suckless/dwm-6.1/dwm b/suckless/dwm-6.1/dwm
deleted file mode 100755
index 6d1bd3c..0000000
Binary files a/suckless/dwm-6.1/dwm and /dev/null differ
diff --git a/suckless/dwm-6.1/dwm.1 b/suckless/dwm-6.1/dwm.1
deleted file mode 100644
index 6687011..0000000
--- a/suckless/dwm-6.1/dwm.1
+++ /dev/null
@@ -1,176 +0,0 @@
-.TH DWM 1 dwm\-VERSION
-.SH NAME
-dwm \- dynamic window manager
-.SH SYNOPSIS
-.B dwm
-.RB [ \-v ]
-.SH DESCRIPTION
-dwm is a dynamic window manager for X. It manages windows in tiled, monocle
-and floating layouts. Either layout can be applied dynamically, optimising the
-environment for the application in use and the task performed.
-.P
-In tiled layouts windows are managed in a master and stacking area. The master
-area contains the window which currently needs most attention, whereas the
-stacking area contains all other windows. In monocle layout all windows are
-maximised to the screen size. In floating layout windows can be resized and
-moved freely. Dialog windows are always managed floating, regardless of the
-layout applied.
-.P
-Windows are grouped by tags. Each window can be tagged with one or multiple
-tags. Selecting certain tags displays all windows with these tags.
-.P
-Each screen contains a small status bar which displays all available tags, the
-layout, the title of the focused window, and the text read from the root window
-name property, if the screen is focused. A floating window is indicated with an
-empty square and a maximised floating window is indicated with a filled square
-before the windows title.  The selected tags are indicated with a different
-color. The tags of the focused window are indicated with a filled square in the
-top left corner.  The tags which are applied to one or more windows are
-indicated with an empty square in the top left corner.
-.P
-dwm draws a small border around windows to indicate the focus state.
-.SH OPTIONS
-.TP
-.B \-v
-prints version information to standard output, then exits.
-.SH USAGE
-.SS Status bar
-.TP
-.B X root window name
-is read and displayed in the status text area. It can be set with the
-.BR xsetroot (1)
-command.
-.TP
-.B Button1
-click on a tag label to display all windows with that tag, click on the layout
-label toggles between tiled and floating layout.
-.TP
-.B Button3
-click on a tag label adds/removes all windows with that tag to/from the view.
-.TP
-.B Mod1\-Button1
-click on a tag label applies that tag to the focused window.
-.TP
-.B Mod1\-Button3
-click on a tag label adds/removes that tag to/from the focused window.
-.SS Keyboard commands
-.TP
-.B Mod1\-Shift\-Return
-Start
-.BR st(1).
-.TP
-.B Mod1\-,
-Focus previous screen, if any.
-.TP
-.B Mod1\-.
-Focus next screen, if any.
-.TP
-.B Mod1\-Shift\-,
-Send focused window to previous screen, if any.
-.TP
-.B Mod1\-Shift\-.
-Send focused window to next screen, if any.
-.TP
-.B Mod1\-b
-Toggles bar on and off.
-.TP
-.B Mod1\-t
-Sets tiled layout.
-.TP
-.B Mod1\-f
-Sets floating layout.
-.TP
-.B Mod1\-m
-Sets monocle layout.
-.TP
-.B Mod1\-space
-Toggles between current and previous layout.
-.TP
-.B Mod1\-j
-Focus next window.
-.TP
-.B Mod1\-k
-Focus previous window.
-.TP
-.B Mod1\-i
-Increase clients in master area.
-.TP
-.B Mod1\-d
-Decrease clients in master area.
-.TP
-.B Mod1\-l
-Increase master area size.
-.TP
-.B Mod1\-h
-Decrease master area size.
-.TP
-.B Mod1\-Return
-Zooms/cycles focused window to/from master area (tiled layouts only).
-.TP
-.B Mod1\-Shift\-c
-Close focused window.
-.TP
-.B Mod1\-Shift\-space
-Toggle focused window between tiled and floating state.
-.TP
-.B Mod1\-Tab
-Toggles to the previously selected tags.
-.TP
-.B Mod1\-Shift\-[1..n]
-Apply nth tag to focused window.
-.TP
-.B Mod1\-Shift\-0
-Apply all tags to focused window.
-.TP
-.B Mod1\-Control\-Shift\-[1..n]
-Add/remove nth tag to/from focused window.
-.TP
-.B Mod1\-[1..n]
-View all windows with nth tag.
-.TP
-.B Mod1\-0
-View all windows with any tag.
-.TP
-.B Mod1\-Control\-[1..n]
-Add/remove all windows with nth tag to/from the view.
-.TP
-.B Mod1\-Shift\-q
-Quit dwm.
-.SS Mouse commands
-.TP
-.B Mod1\-Button1
-Move focused window while dragging. Tiled windows will be toggled to the floating state.
-.TP
-.B Mod1\-Button2
-Toggles focused window between floating and tiled state.
-.TP
-.B Mod1\-Button3
-Resize focused window while dragging. Tiled windows will be toggled to the floating state.
-.SH CUSTOMIZATION
-dwm is customized by creating a custom config.h and (re)compiling the source
-code. This keeps it fast, secure and simple.
-.SH SEE ALSO
-.BR dmenu (1),
-.BR st (1)
-.SH BUGS
-Java applications which use the XToolkit/XAWT backend may draw grey windows
-only. The XToolkit/XAWT backend breaks ICCCM-compliance in recent JDK 1.5 and early
-JDK 1.6 versions, because it assumes a reparenting window manager. Possible workarounds
-are using JDK 1.4 (which doesn't contain the XToolkit/XAWT backend) or setting the
-environment variable
-.BR AWT_TOOLKIT=MToolkit
-(to use the older Motif backend instead) or running
-.B xprop -root -f _NET_WM_NAME 32a -set _NET_WM_NAME LG3D
-or
-.B wmname LG3D
-(to pretend that a non-reparenting window manager is running that the
-XToolkit/XAWT backend can recognize) or when using OpenJDK setting the environment variable
-.BR _JAVA_AWT_WM_NONREPARENTING=1 .
-.P
-GTK 2.10.9+ versions contain a broken
-.BR Save\-As
-file dialog implementation,
-which requests to reconfigure its window size in an endless loop. However, its
-window is still respondable during this state, so you can simply ignore the flicker
-until a new GTK version appears, which will fix this bug, approximately
-GTK 2.10.12+ versions.
diff --git a/suckless/dwm-6.1/dwm.c b/suckless/dwm-6.1/dwm.c
deleted file mode 100644
index 756bd41..0000000
--- a/suckless/dwm-6.1/dwm.c
+++ /dev/null
@@ -1,2144 +0,0 @@
-/* See LICENSE file for copyright and license details.
- *
- * dynamic window manager is designed like any other X client as well. It is
- * driven through handling X events. In contrast to other X clients, a window
- * manager selects for SubstructureRedirectMask on the root window, to receive
- * events about window (dis-)appearance.  Only one X connection at a time is
- * allowed to select for this event mask.
- *
- * The event handlers of dwm are organized in an array which is accessed
- * whenever a new event has been fetched. This allows event dispatching
- * in O(1) time.
- *
- * Each child of the root window is called a client, except windows which have
- * set the override_redirect flag.  Clients are organized in a linked client
- * list on each monitor, the focus history is remembered through a stack list
- * on each monitor. Each client contains a bit array to indicate the tags of a
- * client.
- *
- * Keys and tagging rules are organized as arrays and defined in config.h.
- *
- * To understand everything else, start reading main().
- */
-#include <errno.h>
-#include <locale.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif /* XINERAMA */
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-/* macros */
-#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
-#define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
-        * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
-#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
-#define LENGTH(X)               (sizeof X / sizeof X[0])
-#define MAXCOLORS               9
-#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
-#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
-#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
-#define TAGMASK                 ((1 << LENGTH(tags)) - 1)
-#define TEXTW(X)                (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
-
-/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
-enum { NetSupported, NetWMName, NetWMState,
-    NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-    NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-    ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-
-typedef union {
-    int i;
-    unsigned int ui;
-    float f;
-    const void *v;
-} Arg;
-
-typedef struct {
-    unsigned int click;
-    unsigned int mask;
-    unsigned int button;
-    void (*func)(const Arg *arg);
-    const Arg arg;
-} Button;
-
-typedef struct Monitor Monitor;
-typedef struct Client Client;
-struct Client {
-    char name[256];
-    float mina, maxa;
-    int x, y, w, h;
-    int oldx, oldy, oldw, oldh;
-    int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-    int bw, oldbw;
-    unsigned int tags;
-    int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-    Client *next;
-    Client *snext;
-    Monitor *mon;
-    Window win;
-};
-
-typedef struct {
-    unsigned int mod;
-    KeySym keysym;
-    void (*func)(const Arg *);
-    const Arg arg;
-} Key;
-
-typedef struct {
-    const char *symbol;
-    void (*arrange)(Monitor *);
-} Layout;
-
-struct Monitor {
-    char ltsymbol[16];
-    float mfact;
-    int nmaster;
-    int num;
-    int by;               /* bar geometry */
-    int mx, my, mw, mh;   /* screen size */
-    int wx, wy, ww, wh;   /* window area  */
-    unsigned int seltags;
-    unsigned int sellt;
-    unsigned int tagset[2];
-    int showbar;
-    int topbar;
-    Client *clients;
-    Client *sel;
-    Client *stack;
-    Monitor *next;
-    Window barwin;
-    const Layout *lt[2];
-};
-
-typedef struct {
-    const char *class;
-    const char *instance;
-    const char *title;
-    unsigned int tags;
-    int isfloating;
-    int monitor;
-} Rule;
-
-/* function declarations */
-static void applyrules(Client *c);
-static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-static void arrange(Monitor *m);
-static void arrangemon(Monitor *m);
-static void attach(Client *c);
-static void attachstack(Client *c);
-static void buttonpress(XEvent *e);
-static void checkotherwm(void);
-static void cleanup(void);
-static void cleanupmon(Monitor *mon);
-static void clearurgent(Client *c);
-static void clientmessage(XEvent *e);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static Monitor *createmon(void);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static Monitor *dirtomon(int dir);
-static void drawbar(Monitor *m);
-static void drawbars(void);
-static void enternotify(XEvent *e);
-static void expose(XEvent *e);
-static void focus(Client *c);
-static void focusin(XEvent *e);
-static void focusmon(const Arg *arg);
-static void focusstack(const Arg *arg);
-static int getrootptr(int *x, int *y);
-static long getstate(Window w);
-static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, int focused);
-static void grabkeys(void);
-static void incnmaster(const Arg *arg);
-static void keypress(XEvent *e);
-static void killclient(const Arg *arg);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void monocle(Monitor *m);
-static void motionnotify(XEvent *e);
-static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c);
-static void pop(Client *);
-static void propertynotify(XEvent *e);
-static void quit(const Arg *arg);
-static Monitor *recttomon(int x, int y, int w, int h);
-static void resize(Client *c, int x, int y, int w, int h, int interact);
-static void resizeclient(Client *c, int x, int y, int w, int h);
-static void resizemouse(const Arg *arg);
-static void restack(Monitor *m);
-static void run(void);
-static void scan(void);
-static int sendevent(Client *c, Atom proto);
-static void sendmon(Client *c, Monitor *m);
-static void setclientstate(Client *c, long state);
-static void setfocus(Client *c);
-static void setfullscreen(Client *c, int fullscreen);
-static void setlayout(const Arg *arg);
-static void setmfact(const Arg *arg);
-static void setup(void);
-static void showhide(Client *c);
-static void sigchld(int unused);
-static void spawn(const Arg *arg);
-static void tag(const Arg *arg);
-static void tagmon(const Arg *arg);
-static void tile(Monitor *);
-static void togglebar(const Arg *arg);
-static void togglefloating(const Arg *arg);
-static void toggletag(const Arg *arg);
-static void toggleview(const Arg *arg);
-static void unfocus(Client *c, int setfocus);
-static void unmanage(Client *c, int destroyed);
-static void unmapnotify(XEvent *e);
-static int updategeom(void);
-static void updatebarpos(Monitor *m);
-static void updatebars(void);
-static void updateclientlist(void);
-static void updatenumlockmask(void);
-static void updatesizehints(Client *c);
-static void updatestatus(void);
-static void updatewindowtype(Client *c);
-static void updatetitle(Client *c);
-static void updatewmhints(Client *c);
-static void view(const Arg *arg);
-static Client *wintoclient(Window w);
-static Monitor *wintomon(Window w);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dpy, XErrorEvent *ee);
-static int xerrorstart(Display *dpy, XErrorEvent *ee);
-static void zoom(const Arg *arg);
-
-/* variables */
-static const char broken[] = "broken";
-static char stext[256];
-static int screen;
-static int sw, sh;           /* X display screen geometry width, height */
-static int bh, blw = 0;      /* bar geometry */
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
-    [ButtonPress] = buttonpress,
-    [ClientMessage] = clientmessage,
-    [ConfigureRequest] = configurerequest,
-    [ConfigureNotify] = configurenotify,
-    [DestroyNotify] = destroynotify,
-    [EnterNotify] = enternotify,
-    [Expose] = expose,
-    [FocusIn] = focusin,
-    [KeyPress] = keypress,
-    [MappingNotify] = mappingnotify,
-    [MapRequest] = maprequest,
-    [MotionNotify] = motionnotify,
-    [PropertyNotify] = propertynotify,
-    [UnmapNotify] = unmapnotify
-};
-static Atom wmatom[WMLast], netatom[NetLast];
-static int running = 1;
-static Cur *cursor[CurLast];
-static ClrScheme scheme[MAXCOLORS];
-static Display *dpy;
-static Drw *drw;
-static Monitor *mons, *selmon;
-static Window root;
-
-/* configuration, allows nested code to access above variables */
-#include "config.h"
-
-/* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
-
-/* function implementations */
-    void
-applyrules(Client *c)
-{
-    const char *class, *instance;
-    unsigned int i;
-    const Rule *r;
-    Monitor *m;
-    XClassHint ch = { NULL, NULL };
-
-    /* rule matching */
-    c->isfloating = 0;
-    c->tags = 0;
-    XGetClassHint(dpy, c->win, &ch);
-    class    = ch.res_class ? ch.res_class : broken;
-    instance = ch.res_name  ? ch.res_name  : broken;
-
-    for (i = 0; i < LENGTH(rules); i++) {
-        r = &rules[i];
-        if ((!r->title || strstr(c->name, r->title))
-                && (!r->class || strstr(class, r->class))
-                && (!r->instance || strstr(instance, r->instance)))
-        {
-            c->isfloating = r->isfloating;
-            c->tags |= r->tags;
-            for (m = mons; m && m->num != r->monitor; m = m->next);
-            if (m)
-                c->mon = m;
-        }
-    }
-    if (ch.res_class)
-        XFree(ch.res_class);
-    if (ch.res_name)
-        XFree(ch.res_name);
-    c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
-}
-
-    int
-applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
-{
-    int baseismin;
-    Monitor *m = c->mon;
-
-    /* set minimum possible */
-    *w = MAX(1, *w);
-    *h = MAX(1, *h);
-    if (interact) {
-        if (*x > sw)
-            *x = sw - WIDTH(c);
-        if (*y > sh)
-            *y = sh - HEIGHT(c);
-        if (*x + *w + 2 * c->bw < 0)
-            *x = 0;
-        if (*y + *h + 2 * c->bw < 0)
-            *y = 0;
-    } else {
-        if (*x >= m->wx + m->ww)
-            *x = m->wx + m->ww - WIDTH(c);
-        if (*y >= m->wy + m->wh)
-            *y = m->wy + m->wh - HEIGHT(c);
-        if (*x + *w + 2 * c->bw <= m->wx)
-            *x = m->wx;
-        if (*y + *h + 2 * c->bw <= m->wy)
-            *y = m->wy;
-    }
-    if (*h < bh)
-        *h = bh;
-    if (*w < bh)
-        *w = bh;
-    if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
-        /* see last two sentences in ICCCM 4.1.2.3 */
-        baseismin = c->basew == c->minw && c->baseh == c->minh;
-        if (!baseismin) { /* temporarily remove base dimensions */
-            *w -= c->basew;
-            *h -= c->baseh;
-        }
-        /* adjust for aspect limits */
-        if (c->mina > 0 && c->maxa > 0) {
-            if (c->maxa < (float)*w / *h)
-                *w = *h * c->maxa + 0.5;
-            else if (c->mina < (float)*h / *w)
-                *h = *w * c->mina + 0.5;
-        }
-        if (baseismin) { /* increment calculation requires this */
-            *w -= c->basew;
-            *h -= c->baseh;
-        }
-        /* adjust for increment value */
-        if (c->incw)
-            *w -= *w % c->incw;
-        if (c->inch)
-            *h -= *h % c->inch;
-        /* restore base dimensions */
-        *w = MAX(*w + c->basew, c->minw);
-        *h = MAX(*h + c->baseh, c->minh);
-        if (c->maxw)
-            *w = MIN(*w, c->maxw);
-        if (c->maxh)
-            *h = MIN(*h, c->maxh);
-    }
-    return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
-}
-
-    void
-arrange(Monitor *m)
-{
-    if (m)
-        showhide(m->stack);
-    else for (m = mons; m; m = m->next)
-        showhide(m->stack);
-    if (m) {
-        arrangemon(m);
-        restack(m);
-    } else for (m = mons; m; m = m->next)
-        arrangemon(m);
-}
-
-    void
-arrangemon(Monitor *m)
-{
-    strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
-    if (m->lt[m->sellt]->arrange)
-        m->lt[m->sellt]->arrange(m);
-}
-
-    void
-attach(Client *c)
-{
-    c->next = c->mon->clients;
-    c->mon->clients = c;
-}
-
-    void
-attachstack(Client *c)
-{
-    c->snext = c->mon->stack;
-    c->mon->stack = c;
-}
-
-    void
-buttonpress(XEvent *e)
-{
-    unsigned int i, x, click;
-    Arg arg = {0};
-    Client *c;
-    Monitor *m;
-    XButtonPressedEvent *ev = &e->xbutton;
-
-    click = ClkRootWin;
-    /* focus monitor if necessary */
-    if ((m = wintomon(ev->window)) && m != selmon) {
-        unfocus(selmon->sel, 1);
-        selmon = m;
-        focus(NULL);
-    }
-    if (ev->window == selmon->barwin) {
-        i = x = 0;
-        unsigned int occ = 0;
-        for(c = m->clients; c; c = c->next)
-            occ |= c->tags;
-        do {
-            /* do not reserve space for vacant tags */
-            if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-                continue;
-            x += TEXTW(tags[i]);
-        } while (ev->x >= x && ++i < LENGTH(tags));
-        if (i < LENGTH(tags)) {
-            click = ClkTagBar;
-            arg.ui = 1 << i;
-        } else if (ev->x < x + blw)
-            click = ClkLtSymbol;
-        else if (ev->x > selmon->ww - TEXTW(stext))
-            click = ClkStatusText;
-        else
-            click = ClkWinTitle;
-    } else if ((c = wintoclient(ev->window))) {
-        focus(c);
-        click = ClkClientWin;
-    }
-    for (i = 0; i < LENGTH(buttons); i++)
-        if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-                && CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-            buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-}
-
-    void
-checkotherwm(void)
-{
-    xerrorxlib = XSetErrorHandler(xerrorstart);
-    /* this causes an error if some other window manager is running */
-    XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
-    XSync(dpy, False);
-    XSetErrorHandler(xerror);
-    XSync(dpy, False);
-}
-
-    void
-cleanup(void)
-{
-    Arg a = {.ui = ~0};
-    Layout foo = { "", NULL };
-    Monitor *m;
-    size_t i;
-
-    view(&a);
-    selmon->lt[selmon->sellt] = &foo;
-    for (m = mons; m; m = m->next)
-        while (m->stack)
-            unmanage(m->stack, 0);
-    XUngrabKey(dpy, AnyKey, AnyModifier, root);
-    while (mons)
-        cleanupmon(mons);
-    for (i = 0; i < CurLast; i++)
-        drw_cur_free(drw, cursor[i]);
-    for (i = 0; i < SchemeLast; i++) {
-        drw_clr_free(scheme[i].border);
-        drw_clr_free(scheme[i].bg);
-        drw_clr_free(scheme[i].fg);
-    }
-    drw_free(drw);
-    XSync(dpy, False);
-    XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-    XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-}
-
-    void
-cleanupmon(Monitor *mon)
-{
-    Monitor *m;
-
-    if (mon == mons)
-        mons = mons->next;
-    else {
-        for (m = mons; m && m->next != mon; m = m->next);
-        m->next = mon->next;
-    }
-    XUnmapWindow(dpy, mon->barwin);
-    XDestroyWindow(dpy, mon->barwin);
-    free(mon);
-}
-
-    void
-clearurgent(Client *c)
-{
-    XWMHints *wmh;
-
-    c->isurgent = 0;
-    if (!(wmh = XGetWMHints(dpy, c->win)))
-        return;
-    wmh->flags &= ~XUrgencyHint;
-    XSetWMHints(dpy, c->win, wmh);
-    XFree(wmh);
-}
-
-    void
-clientmessage(XEvent *e)
-{
-    XClientMessageEvent *cme = &e->xclient;
-    Client *c = wintoclient(cme->window);
-
-    if (!c)
-        return;
-    if (cme->message_type == netatom[NetWMState]) {
-        if (cme->data.l[1] == netatom[NetWMFullscreen] || cme->data.l[2] == netatom[NetWMFullscreen])
-            setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
-                        || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
-    } else if (cme->message_type == netatom[NetActiveWindow]) {
-        if (!ISVISIBLE(c)) {
-            c->mon->seltags ^= 1;
-            c->mon->tagset[c->mon->seltags] = c->tags;
-        }
-        pop(c);
-    }
-}
-
-    void
-configure(Client *c)
-{
-    XConfigureEvent ce;
-
-    ce.type = ConfigureNotify;
-    ce.display = dpy;
-    ce.event = c->win;
-    ce.window = c->win;
-    ce.x = c->x;
-    ce.y = c->y;
-    ce.width = c->w;
-    ce.height = c->h;
-    ce.border_width = c->bw;
-    ce.above = None;
-    ce.override_redirect = False;
-    XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
-}
-
-    void
-configurenotify(XEvent *e)
-{
-    Monitor *m;
-    XConfigureEvent *ev = &e->xconfigure;
-    int dirty;
-
-    /* TODO: updategeom handling sucks, needs to be simplified */
-    if (ev->window == root) {
-        dirty = (sw != ev->width || sh != ev->height);
-        sw = ev->width;
-        sh = ev->height;
-        if (updategeom() || dirty) {
-            drw_resize(drw, sw, bh);
-            updatebars();
-            for (m = mons; m; m = m->next)
-                XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-            focus(NULL);
-            arrange(NULL);
-        }
-    }
-}
-
-    void
-configurerequest(XEvent *e)
-{
-    Client *c;
-    Monitor *m;
-    XConfigureRequestEvent *ev = &e->xconfigurerequest;
-    XWindowChanges wc;
-
-    if ((c = wintoclient(ev->window))) {
-        if (ev->value_mask & CWBorderWidth)
-            c->bw = ev->border_width;
-        else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
-            m = c->mon;
-            if (ev->value_mask & CWX) {
-                c->oldx = c->x;
-                c->x = m->mx + ev->x;
-            }
-            if (ev->value_mask & CWY) {
-                c->oldy = c->y;
-                c->y = m->my + ev->y;
-            }
-            if (ev->value_mask & CWWidth) {
-                c->oldw = c->w;
-                c->w = ev->width;
-            }
-            if (ev->value_mask & CWHeight) {
-                c->oldh = c->h;
-                c->h = ev->height;
-            }
-            if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
-                c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
-            if ((c->y + c->h) > m->my + m->mh && c->isfloating)
-                c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
-            if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
-                configure(c);
-            if (ISVISIBLE(c))
-                XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-        } else
-            configure(c);
-    } else {
-        wc.x = ev->x;
-        wc.y = ev->y;
-        wc.width = ev->width;
-        wc.height = ev->height;
-        wc.border_width = ev->border_width;
-        wc.sibling = ev->above;
-        wc.stack_mode = ev->detail;
-        XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-    }
-    XSync(dpy, False);
-}
-
-    Monitor *
-createmon(void)
-{
-    Monitor *m;
-
-    m = ecalloc(1, sizeof(Monitor));
-    m->tagset[0] = m->tagset[1] = 1;
-    m->mfact = mfact;
-    m->nmaster = nmaster;
-    m->showbar = showbar;
-    m->topbar = topbar;
-    m->lt[0] = &layouts[0];
-    m->lt[1] = &layouts[1 % LENGTH(layouts)];
-    strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-    return m;
-}
-
-    void
-destroynotify(XEvent *e)
-{
-    Client *c;
-    XDestroyWindowEvent *ev = &e->xdestroywindow;
-
-    if ((c = wintoclient(ev->window)))
-        unmanage(c, 1);
-}
-
-    void
-detach(Client *c)
-{
-    Client **tc;
-
-    for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
-    *tc = c->next;
-}
-
-    void
-detachstack(Client *c)
-{
-    Client **tc, *t;
-
-    for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
-    *tc = c->snext;
-
-    if (c == c->mon->sel) {
-        for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
-        c->mon->sel = t;
-    }
-}
-
-    Monitor *
-dirtomon(int dir)
-{
-    Monitor *m = NULL;
-
-    if (dir > 0) {
-        if (!(m = selmon->next))
-            m = mons;
-    } else if (selmon == mons)
-        for (m = mons; m->next; m = m->next);
-    else
-        for (m = mons; m->next != selmon; m = m->next);
-    return m;
-}
-
-    void
-drawbar(Monitor *m)
-{
-    int x, xx, w, dx;
-    unsigned int i, occ = 0, urg = 0;
-    Client *c;
-
-    dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
-
-    for (c = m->clients; c; c = c->next) {
-        occ |= c->tags;
-        if (c->isurgent)
-            urg |= c->tags;
-    }
-    x = 0;
-    for (i = 0; i < LENGTH(tags); i++) {
-        w = TEXTW(tags[i]) + tagspacing;
-        drw_setscheme(drw, &scheme[(m->tagset[m->seltags] & 1 << i) ? 1 : (urg & 1 << i ? 2 : (occ & 1 << i ? 3:0))]);
-        drw_text(drw, x, 0, w, bh, tags[i], 0);
-        x += w;
-    }
-    w = blw = TEXTW(m->ltsymbol);
-    drw_setscheme(drw, &scheme[0]);
-    drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
-    x += w;
-    xx = x;
-    if (m == selmon) { /* status is only drawn on selected monitor */
-        w = drw_get_width(drw, NUMCOLORS, stext);
-        x = m->ww - w;
-        if (x < xx) {
-            x = xx;
-            w = m->ww - xx;
-        }
-        drw_colored_text(drw, scheme, NUMCOLORS, x, 0, w, bh, stext);
-    } else
-        x = m->ww;
-    if ((w = x - xx) > bh) {
-        x = xx;
-        drw_setscheme(drw, &scheme[0]);
-        drw_rect(drw, x, 0, w, bh, 1, 0, 1);
-    }
-    drw_map(drw, m->barwin, 0, 0, m->ww, bh);
-}
-
-    void
-drawbars(void)
-{
-    Monitor *m;
-
-    for (m = mons; m; m = m->next)
-        drawbar(m);
-}
-
-    void
-enternotify(XEvent *e)
-{
-    Client *c;
-    Monitor *m;
-    XCrossingEvent *ev = &e->xcrossing;
-
-    if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
-        return;
-    c = wintoclient(ev->window);
-    m = c ? c->mon : wintomon(ev->window);
-    if (m != selmon) {
-        unfocus(selmon->sel, 1);
-        selmon = m;
-    } else if (!c || c == selmon->sel)
-        return;
-    focus(c);
-}
-
-    void
-expose(XEvent *e)
-{
-    Monitor *m;
-    XExposeEvent *ev = &e->xexpose;
-
-    if (ev->count == 0 && (m = wintomon(ev->window)))
-        drawbar(m);
-}
-
-    void
-focus(Client *c)
-{
-    if (!c || !ISVISIBLE(c))
-        for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
-    /* was if (selmon->sel) */
-    if (selmon->sel && selmon->sel != c)
-        unfocus(selmon->sel, 0);
-    if (c) {
-        if (c->mon != selmon)
-            selmon = c->mon;
-        if (c->isurgent)
-            clearurgent(c);
-        detachstack(c);
-        attachstack(c);
-        grabbuttons(c, 1);
-        XSetWindowBorder(dpy, c->win, scheme[1].border->pix);
-        setfocus(c);
-    } else {
-        XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-        XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-    }
-    selmon->sel = c;
-    drawbars();
-}
-
-/* there are some broken focus acquiring clients */
-    void
-focusin(XEvent *e)
-{
-    XFocusChangeEvent *ev = &e->xfocus;
-
-    if (selmon->sel && ev->window != selmon->sel->win)
-        setfocus(selmon->sel);
-}
-
-    void
-focusmon(const Arg *arg)
-{
-    Monitor *m;
-
-    if (!mons->next)
-        return;
-    if ((m = dirtomon(arg->i)) == selmon)
-        return;
-    unfocus(selmon->sel, 0); /* s/1/0/ fixes input focus issues
-                                in gedit and anjuta */
-    selmon = m;
-    focus(NULL);
-}
-
-    void
-focusstack(const Arg *arg)
-{
-    Client *c = NULL, *i;
-
-    if (!selmon->sel)
-        return;
-    if (arg->i > 0) {
-        for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
-        if (!c)
-            for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
-    } else {
-        for (i = selmon->clients; i != selmon->sel; i = i->next)
-            if (ISVISIBLE(i))
-                c = i;
-        if (!c)
-            for (; i; i = i->next)
-                if (ISVISIBLE(i))
-                    c = i;
-    }
-    if (c) {
-        focus(c);
-        restack(selmon);
-    }
-}
-
-    Atom
-getatomprop(Client *c, Atom prop)
-{
-    int di;
-    unsigned long dl;
-    unsigned char *p = NULL;
-    Atom da, atom = None;
-
-    if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-                &da, &di, &dl, &dl, &p) == Success && p) {
-        atom = *(Atom *)p;
-        XFree(p);
-    }
-    return atom;
-}
-
-    int
-getrootptr(int *x, int *y)
-{
-    int di;
-    unsigned int dui;
-    Window dummy;
-
-    return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
-}
-
-    long
-getstate(Window w)
-{
-    int format;
-    long result = -1;
-    unsigned char *p = NULL;
-    unsigned long n, extra;
-    Atom real;
-
-    if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-                &real, &format, &n, &extra, (unsigned char **)&p) != Success)
-        return -1;
-    if (n != 0)
-        result = *p;
-    XFree(p);
-    return result;
-}
-
-    int
-gettextprop(Window w, Atom atom, char *text, unsigned int size)
-{
-    char **list = NULL;
-    int n;
-    XTextProperty name;
-
-    if (!text || size == 0)
-        return 0;
-    text[0] = '\0';
-    XGetTextProperty(dpy, w, &name, atom);
-    if (!name.nitems)
-        return 0;
-    if (name.encoding == XA_STRING)
-        strncpy(text, (char *)name.value, size - 1);
-    else {
-        if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
-            strncpy(text, *list, size - 1);
-            XFreeStringList(list);
-        }
-    }
-    text[size - 1] = '\0';
-    XFree(name.value);
-    return 1;
-}
-
-    void
-grabbuttons(Client *c, int focused)
-{
-    updatenumlockmask();
-    {
-        unsigned int i, j;
-        unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-        if (focused) {
-            for (i = 0; i < LENGTH(buttons); i++)
-                if (buttons[i].click == ClkClientWin)
-                    for (j = 0; j < LENGTH(modifiers); j++)
-                        XGrabButton(dpy, buttons[i].button,
-                                buttons[i].mask | modifiers[j],
-                                c->win, False, BUTTONMASK,
-                                GrabModeAsync, GrabModeSync, None, None);
-        } else
-            XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-                    BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-    }
-}
-
-    void
-grabkeys(void)
-{
-    updatenumlockmask();
-    {
-        unsigned int i, j;
-        unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-        KeyCode code;
-
-        XUngrabKey(dpy, AnyKey, AnyModifier, root);
-        for (i = 0; i < LENGTH(keys); i++)
-            if ((code = XKeysymToKeycode(dpy, keys[i].keysym)))
-                for (j = 0; j < LENGTH(modifiers); j++)
-                    XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
-                            True, GrabModeAsync, GrabModeAsync);
-    }
-}
-
-    void
-incnmaster(const Arg *arg)
-{
-    selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-    arrange(selmon);
-}
-
-#ifdef XINERAMA
-    static int
-isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
-{
-    while (n--)
-        if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
-                && unique[n].width == info->width && unique[n].height == info->height)
-            return 0;
-    return 1;
-}
-#endif /* XINERAMA */
-
-    void
-keypress(XEvent *e)
-{
-    unsigned int i;
-    KeySym keysym;
-    XKeyEvent *ev;
-
-    ev = &e->xkey;
-    keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-    for (i = 0; i < LENGTH(keys); i++)
-        if (keysym == keys[i].keysym
-                && CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-                && keys[i].func)
-            keys[i].func(&(keys[i].arg));
-}
-
-    void
-killclient(const Arg *arg)
-{
-    if (!selmon->sel)
-        return;
-    if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-        XGrabServer(dpy);
-        XSetErrorHandler(xerrordummy);
-        XSetCloseDownMode(dpy, DestroyAll);
-        XKillClient(dpy, selmon->sel->win);
-        XSync(dpy, False);
-        XSetErrorHandler(xerror);
-        XUngrabServer(dpy);
-    }
-}
-
-    void
-manage(Window w, XWindowAttributes *wa)
-{
-    Client *c, *t = NULL;
-    Window trans = None;
-    XWindowChanges wc;
-
-    c = ecalloc(1, sizeof(Client));
-    c->win = w;
-    updatetitle(c);
-    if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
-        c->mon = t->mon;
-        c->tags = t->tags;
-    } else {
-        c->mon = selmon;
-        applyrules(c);
-    }
-    /* geometry */
-    c->x = c->oldx = wa->x;
-    c->y = c->oldy = wa->y;
-    c->w = c->oldw = wa->width;
-    c->h = c->oldh = wa->height;
-    c->oldbw = wa->border_width;
-
-    if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
-        c->x = c->mon->mx + c->mon->mw - WIDTH(c);
-    if (c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
-        c->y = c->mon->my + c->mon->mh - HEIGHT(c);
-    c->x = MAX(c->x, c->mon->mx);
-    /* only fix client y-offset, if the client center might cover the bar */
-    c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
-                && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
-    c->bw = borderpx;
-
-    wc.border_width = c->bw;
-    XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-    XSetWindowBorder(dpy, w, scheme[0].border->pix);
-    configure(c); /* propagates border_width, if size doesn't change */
-    updatewindowtype(c);
-    updatesizehints(c);
-    updatewmhints(c);
-    XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
-    grabbuttons(c, 0);
-    if (!c->isfloating)
-        c->isfloating = c->oldstate = trans != None || c->isfixed;
-    if (c->isfloating)
-        XRaiseWindow(dpy, c->win);
-    attach(c);
-    attachstack(c);
-    XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
-            (unsigned char *) &(c->win), 1);
-    XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
-    setclientstate(c, NormalState);
-    if (c->mon == selmon)
-        unfocus(selmon->sel, 0);
-    c->mon->sel = c;
-    arrange(c->mon);
-    XMapWindow(dpy, c->win);
-    focus(NULL);
-}
-
-    void
-mappingnotify(XEvent *e)
-{
-    XMappingEvent *ev = &e->xmapping;
-
-    XRefreshKeyboardMapping(ev);
-    if (ev->request == MappingKeyboard)
-        grabkeys();
-}
-
-    void
-maprequest(XEvent *e)
-{
-    static XWindowAttributes wa;
-    XMapRequestEvent *ev = &e->xmaprequest;
-
-    if (!XGetWindowAttributes(dpy, ev->window, &wa))
-        return;
-    if (wa.override_redirect)
-        return;
-    if (!wintoclient(ev->window))
-        manage(ev->window, &wa);
-}
-
-    void
-monocle(Monitor *m)
-{
-    unsigned int n = 0;
-    Client *c;
-
-    for (c = m->clients; c; c = c->next)
-        if (ISVISIBLE(c))
-            n++;
-    if (n > 0) /* override layout symbol */
-        snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-    for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-        resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
-}
-
-    void
-motionnotify(XEvent *e)
-{
-    static Monitor *mon = NULL;
-    Monitor *m;
-    XMotionEvent *ev = &e->xmotion;
-
-    if (ev->window != root)
-        return;
-    if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
-        unfocus(selmon->sel, 1);
-        selmon = m;
-        focus(NULL);
-    }
-    mon = m;
-}
-
-    void
-movemouse(const Arg *arg)
-{
-    int x, y, ocx, ocy, nx, ny;
-    Client *c;
-    Monitor *m;
-    XEvent ev;
-    Time lasttime = 0;
-
-    if (!(c = selmon->sel))
-        return;
-    if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
-        return;
-    restack(selmon);
-    ocx = c->x;
-    ocy = c->y;
-    if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
-        return;
-    if (!getrootptr(&x, &y))
-        return;
-    do {
-        XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-        switch(ev.type) {
-            case ConfigureRequest:
-            case Expose:
-            case MapRequest:
-                handler[ev.type](&ev);
-                break;
-            case MotionNotify:
-                if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-                    continue;
-                lasttime = ev.xmotion.time;
-
-                nx = ocx + (ev.xmotion.x - x);
-                ny = ocy + (ev.xmotion.y - y);
-                if (nx >= selmon->wx && nx <= selmon->wx + selmon->ww
-                        && ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
-                    if (abs(selmon->wx - nx) < snap)
-                        nx = selmon->wx;
-                    else if ((selmon->wx + selmon->ww) - (nx + WIDTH(c)) < snap)
-                        nx = selmon->wx + selmon->ww - WIDTH(c);
-                    if (abs(selmon->wy - ny) < snap)
-                        ny = selmon->wy;
-                    else if ((selmon->wy + selmon->wh) - (ny + HEIGHT(c)) < snap)
-                        ny = selmon->wy + selmon->wh - HEIGHT(c);
-                    if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                            && (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
-                        togglefloating(NULL);
-                }
-                if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                    resize(c, nx, ny, c->w, c->h, 1);
-                break;
-        }
-    } while (ev.type != ButtonRelease);
-    XUngrabPointer(dpy, CurrentTime);
-    if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-        sendmon(c, m);
-        selmon = m;
-        focus(NULL);
-    }
-}
-
-    Client *
-nexttiled(Client *c)
-{
-    for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
-    return c;
-}
-
-    void
-pop(Client *c)
-{
-    detach(c);
-    attach(c);
-    focus(c);
-    arrange(c->mon);
-}
-
-    void
-propertynotify(XEvent *e)
-{
-    Client *c;
-    Window trans;
-    XPropertyEvent *ev = &e->xproperty;
-
-    if ((ev->window == root) && (ev->atom == XA_WM_NAME))
-        updatestatus();
-    else if (ev->state == PropertyDelete)
-        return; /* ignore */
-    else if ((c = wintoclient(ev->window))) {
-        switch(ev->atom) {
-            default: break;
-            case XA_WM_TRANSIENT_FOR:
-                     if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
-                             (c->isfloating = (wintoclient(trans)) != NULL))
-                         arrange(c->mon);
-                     break;
-            case XA_WM_NORMAL_HINTS:
-                     updatesizehints(c);
-                     break;
-            case XA_WM_HINTS:
-                     updatewmhints(c);
-                     drawbars();
-                     break;
-        }
-        if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-            updatetitle(c);
-            if (c == c->mon->sel)
-                drawbar(c->mon);
-        }
-        if (ev->atom == netatom[NetWMWindowType])
-            updatewindowtype(c);
-    }
-}
-
-    void
-quit(const Arg *arg)
-{
-    running = 0;
-}
-
-    Monitor *
-recttomon(int x, int y, int w, int h)
-{
-    Monitor *m, *r = selmon;
-    int a, area = 0;
-
-    for (m = mons; m; m = m->next)
-        if ((a = INTERSECT(x, y, w, h, m)) > area) {
-            area = a;
-            r = m;
-        }
-    return r;
-}
-
-    void
-resize(Client *c, int x, int y, int w, int h, int interact)
-{
-    if (applysizehints(c, &x, &y, &w, &h, interact))
-        resizeclient(c, x, y, w, h);
-}
-
-    void
-resizeclient(Client *c, int x, int y, int w, int h)
-{
-    XWindowChanges wc;
-
-    c->oldx = c->x; c->x = wc.x = x;
-    c->oldy = c->y; c->y = wc.y = y;
-    c->oldw = c->w; c->w = wc.width = w;
-    c->oldh = c->h; c->h = wc.height = h;
-    wc.border_width = c->bw;
-    XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
-    configure(c);
-    XSync(dpy, False);
-}
-
-    void
-resizemouse(const Arg *arg)
-{
-    int ocx, ocy, nw, nh;
-    Client *c;
-    Monitor *m;
-    XEvent ev;
-    Time lasttime = 0;
-
-    if (!(c = selmon->sel))
-        return;
-    if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
-        return;
-    restack(selmon);
-    ocx = c->x;
-    ocy = c->y;
-    if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-                None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
-        return;
-    XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-    do {
-        XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-        switch(ev.type) {
-            case ConfigureRequest:
-            case Expose:
-            case MapRequest:
-                handler[ev.type](&ev);
-                break;
-            case MotionNotify:
-                if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-                    continue;
-                lasttime = ev.xmotion.time;
-
-                nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
-                nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-                if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
-                        && c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
-                {
-                    if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-                            && (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
-                        togglefloating(NULL);
-                }
-                if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-                    resize(c, c->x, c->y, nw, nh, 1);
-                break;
-        }
-    } while (ev.type != ButtonRelease);
-    XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-    XUngrabPointer(dpy, CurrentTime);
-    while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-    if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-        sendmon(c, m);
-        selmon = m;
-        focus(NULL);
-    }
-}
-
-    void
-restack(Monitor *m)
-{
-    Client *c;
-    XEvent ev;
-    XWindowChanges wc;
-
-    drawbar(m);
-    if (!m->sel)
-        return;
-    if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
-        XRaiseWindow(dpy, m->sel->win);
-    if (m->lt[m->sellt]->arrange) {
-        wc.stack_mode = Below;
-        wc.sibling = m->barwin;
-        for (c = m->stack; c; c = c->snext)
-            if (!c->isfloating && ISVISIBLE(c)) {
-                XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
-                wc.sibling = c->win;
-            }
-    }
-    XSync(dpy, False);
-    while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-    void
-run(void)
-{
-    XEvent ev;
-    /* main event loop */
-    XSync(dpy, False);
-    while (running && !XNextEvent(dpy, &ev))
-        if (handler[ev.type])
-            handler[ev.type](&ev); /* call handler */
-}
-
-    void
-scan(void)
-{
-    unsigned int i, num;
-    Window d1, d2, *wins = NULL;
-    XWindowAttributes wa;
-
-    if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
-        for (i = 0; i < num; i++) {
-            if (!XGetWindowAttributes(dpy, wins[i], &wa)
-                    || wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
-                continue;
-            if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
-                manage(wins[i], &wa);
-        }
-        for (i = 0; i < num; i++) { /* now the transients */
-            if (!XGetWindowAttributes(dpy, wins[i], &wa))
-                continue;
-            if (XGetTransientForHint(dpy, wins[i], &d1)
-                    && (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
-                manage(wins[i], &wa);
-        }
-        if (wins)
-            XFree(wins);
-    }
-}
-
-    void
-sendmon(Client *c, Monitor *m)
-{
-    if (c->mon == m)
-        return;
-    unfocus(c, 1);
-    detach(c);
-    detachstack(c);
-    c->mon = m;
-    c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-    attach(c);
-    attachstack(c);
-    focus(NULL);
-    arrange(NULL);
-}
-
-    void
-setclientstate(Client *c, long state)
-{
-    long data[] = { state, None };
-
-    XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
-            PropModeReplace, (unsigned char *)data, 2);
-}
-
-    int
-sendevent(Client *c, Atom proto)
-{
-    int n;
-    Atom *protocols;
-    int exists = 0;
-    XEvent ev;
-
-    if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-        while (!exists && n--)
-            exists = protocols[n] == proto;
-        XFree(protocols);
-    }
-    if (exists) {
-        ev.type = ClientMessage;
-        ev.xclient.window = c->win;
-        ev.xclient.message_type = wmatom[WMProtocols];
-        ev.xclient.format = 32;
-        ev.xclient.data.l[0] = proto;
-        ev.xclient.data.l[1] = CurrentTime;
-        XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-    }
-    return exists;
-}
-
-    void
-setfocus(Client *c)
-{
-    if (!c->neverfocus) {
-        XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-        XChangeProperty(dpy, root, netatom[NetActiveWindow],
-                XA_WINDOW, 32, PropModeReplace,
-                (unsigned char *) &(c->win), 1);
-    }
-    sendevent(c, wmatom[WMTakeFocus]);
-}
-
-    void
-setfullscreen(Client *c, int fullscreen)
-{
-    if (fullscreen && !c->isfullscreen) {
-        XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-                PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
-        c->isfullscreen = 1;
-        c->oldstate = c->isfloating;
-        c->oldbw = c->bw;
-        c->bw = 0;
-        c->isfloating = 1;
-        resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-        XRaiseWindow(dpy, c->win);
-    } else if (!fullscreen && c->isfullscreen){
-        XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-                PropModeReplace, (unsigned char*)0, 0);
-        c->isfullscreen = 0;
-        c->isfloating = c->oldstate;
-        c->bw = c->oldbw;
-        c->x = c->oldx;
-        c->y = c->oldy;
-        c->w = c->oldw;
-        c->h = c->oldh;
-        resizeclient(c, c->x, c->y, c->w, c->h);
-        arrange(c->mon);
-    }
-}
-
-    void
-setlayout(const Arg *arg)
-{
-    if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-        selmon->sellt ^= 1;
-    if (arg && arg->v)
-        selmon->lt[selmon->sellt] = (Layout *)arg->v;
-    strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
-    if (selmon->sel)
-        arrange(selmon);
-    else
-        drawbar(selmon);
-}
-
-/* arg > 1.0 will set mfact absolutly */
-    void
-setmfact(const Arg *arg)
-{
-    float f;
-
-    if (!arg || !selmon->lt[selmon->sellt]->arrange)
-        return;
-    f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
-    if (f < 0.1 || f > 0.9)
-        return;
-    selmon->mfact = f;
-    arrange(selmon);
-}
-
-    void
-setup(void)
-{
-    XSetWindowAttributes wa;
-
-    /* clean up any zombies immediately */
-    sigchld(0);
-
-    /* init screen */
-    screen = DefaultScreen(dpy);
-    sw = DisplayWidth(dpy, screen);
-    sh = DisplayHeight(dpy, screen);
-    root = RootWindow(dpy, screen);
-    drw = drw_create(dpy, screen, root, sw, sh);
-    drw_load_fonts(drw, fonts, LENGTH(fonts));
-    if (!drw->fontcount)
-        die("no fonts could be loaded.\n");
-    /* Here you change the dwm bar size */
-    bh = drw->fonts[0]->h + barsize;
-    updategeom();
-    /* init atoms */
-    wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-    wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-    wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
-    wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-    netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
-    netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-    netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-    netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
-    netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-    netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
-    netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-    netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-    /* init cursors */
-    cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
-    cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-    cursor[CurMove] = drw_cur_create(drw, XC_fleur);
-    /* init appearance */
-    for(int i = 0; i < NUMCOLORS; i++){
-        scheme[i].border = drw_clr_create(drw, colors[i][0]);
-        scheme[i].fg = drw_clr_create(drw, colors[i][1]);
-        scheme[i].bg = drw_clr_create(drw, colors[i][2]);
-    }
-
-    /* init bars */
-    updatebars();
-    updatestatus();
-    /* EWMH support per view */
-    XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-            PropModeReplace, (unsigned char *) netatom, NetLast);
-    XDeleteProperty(dpy, root, netatom[NetClientList]);
-    /* select for events */
-    wa.cursor = cursor[CurNormal]->cursor;
-    wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask|PointerMotionMask
-        |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
-    XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
-    XSelectInput(dpy, root, wa.event_mask);
-    grabkeys();
-    focus(NULL);
-}
-
-    void
-showhide(Client *c)
-{
-    if (!c)
-        return;
-    if (ISVISIBLE(c)) {
-        /* show clients top down */
-        XMoveWindow(dpy, c->win, c->x, c->y);
-        if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-            resize(c, c->x, c->y, c->w, c->h, 0);
-        showhide(c->snext);
-    } else {
-        /* hide clients bottom up */
-        showhide(c->snext);
-        XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
-    }
-}
-
-    void
-sigchld(int unused)
-{
-    if (signal(SIGCHLD, sigchld) == SIG_ERR)
-        die("can't install SIGCHLD handler:");
-    while (0 < waitpid(-1, NULL, WNOHANG));
-}
-
-    void
-spawn(const Arg *arg)
-{
-    if (arg->v == dmenucmd)
-        dmenumon[0] = '0' + selmon->num;
-    if (fork() == 0) {
-        if (dpy)
-            close(ConnectionNumber(dpy));
-        setsid();
-        execvp(((char **)arg->v)[0], (char **)arg->v);
-        fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
-        perror(" failed");
-        exit(EXIT_SUCCESS);
-    }
-}
-
-    void
-tag(const Arg *arg)
-{
-    if (selmon->sel && arg->ui & TAGMASK) {
-        selmon->sel->tags = arg->ui & TAGMASK;
-        focus(NULL);
-        arrange(selmon);
-    }
-}
-
-    void
-tagmon(const Arg *arg)
-{
-    if (!selmon->sel || !mons->next)
-        return;
-    sendmon(selmon->sel, dirtomon(arg->i));
-}
-
-    void
-tile(Monitor *m)
-{
-    unsigned int i, n, h, mw, my, ty, ns;
-    Client *c;
-
-    for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-    if (n == 0)
-        return;
-
-    if (n > m->nmaster) {
-        mw = m->nmaster ? m->ww * m->mfact : 0;
-        ns = m->nmaster > 0 ? 2 : 1;
-    } else {
-        mw = m->ww;
-        ns = 1;
-    }
-    for(i = 0, my = ty = gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-        if (i < m->nmaster) {
-            h = (m->wh - my) / (MIN(n, m->nmaster) - i) - gappx;
-            resize(c, m->wx + gappx, m->wy + my, mw - (2*c->bw) - gappx*(5-ns)/2, h - (2*c->bw), False);
-            my += HEIGHT(c) + gappx;
-        } else {
-            h = (m->wh - ty) / (n - i) - gappx;
-            resize(c, m->wx + mw + gappx/ns, m->wy + ty, m->ww - mw - (2*c->bw) - gappx*(5-ns)/2, h - (2*c->bw), False);
-            ty += HEIGHT(c) + gappx;
-        }
-}
-
-    void
-togglebar(const Arg *arg)
-{
-    selmon->showbar = !selmon->showbar;
-    updatebarpos(selmon);
-    XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
-    arrange(selmon);
-}
-
-    void
-togglefloating(const Arg *arg)
-{
-    if (!selmon->sel)
-        return;
-    if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
-        return;
-    selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
-    if (selmon->sel->isfloating)
-        resize(selmon->sel, selmon->sel->x, selmon->sel->y,
-                selmon->sel->w, selmon->sel->h, 0);
-    arrange(selmon);
-}
-
-    void
-toggletag(const Arg *arg)
-{
-    unsigned int newtags;
-
-    if (!selmon->sel)
-        return;
-    newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
-    if (newtags) {
-        selmon->sel->tags = newtags;
-        focus(NULL);
-        arrange(selmon);
-    }
-}
-
-    void
-toggleview(const Arg *arg)
-{
-    unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
-
-    if (newtagset) {
-        selmon->tagset[selmon->seltags] = newtagset;
-        focus(NULL);
-        arrange(selmon);
-    }
-}
-
-    void
-unfocus(Client *c, int setfocus)
-{
-    if (!c)
-        return;
-    grabbuttons(c, 0);
-    XSetWindowBorder(dpy, c->win, scheme[0].border->pix);
-    if (setfocus) {
-        XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-        XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-    }
-}
-
-    void
-unmanage(Client *c, int destroyed)
-{
-    Monitor *m = c->mon;
-    XWindowChanges wc;
-
-    /* The server grab construct avoids race conditions. */
-    detach(c);
-    detachstack(c);
-    if (!destroyed) {
-        wc.border_width = c->oldbw;
-        XGrabServer(dpy);
-        XSetErrorHandler(xerrordummy);
-        XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-        XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-        setclientstate(c, WithdrawnState);
-        XSync(dpy, False);
-        XSetErrorHandler(xerror);
-        XUngrabServer(dpy);
-    }
-    free(c);
-    focus(NULL);
-    updateclientlist();
-    arrange(m);
-}
-
-    void
-unmapnotify(XEvent *e)
-{
-    Client *c;
-    XUnmapEvent *ev = &e->xunmap;
-
-    if ((c = wintoclient(ev->window))) {
-        if (ev->send_event)
-            setclientstate(c, WithdrawnState);
-        else
-            unmanage(c, 0);
-    }
-}
-
-    void
-updatebars(void)
-{
-    Monitor *m;
-    XSetWindowAttributes wa = {
-        .override_redirect = True,
-        .background_pixmap = ParentRelative,
-        .event_mask = ButtonPressMask|ExposureMask
-    };
-    for (m = mons; m; m = m->next) {
-        if (m->barwin)
-            continue;
-        m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-                CopyFromParent, DefaultVisual(dpy, screen),
-                CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-        XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-        XMapRaised(dpy, m->barwin);
-    }
-}
-
-    void
-updatebarpos(Monitor *m)
-{
-    m->wy = m->my;
-    m->wh = m->mh;
-    if (m->showbar) {
-        m->wh -= bh;
-        m->by = m->topbar ? m->wy : m->wy + m->wh;
-        m->wy = m->topbar ? m->wy + bh : m->wy;
-    } else
-        m->by = -bh;
-}
-
-    void
-updateclientlist()
-{
-    Client *c;
-    Monitor *m;
-
-    XDeleteProperty(dpy, root, netatom[NetClientList]);
-    for (m = mons; m; m = m->next)
-        for (c = m->clients; c; c = c->next)
-            XChangeProperty(dpy, root, netatom[NetClientList],
-                    XA_WINDOW, 32, PropModeAppend,
-                    (unsigned char *) &(c->win), 1);
-}
-
-    int
-updategeom(void)
-{
-    int dirty = 0;
-
-#ifdef XINERAMA
-    if (XineramaIsActive(dpy)) {
-        int i, j, n, nn;
-        Client *c;
-        Monitor *m;
-        XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
-        XineramaScreenInfo *unique = NULL;
-
-        for (n = 0, m = mons; m; m = m->next, n++);
-        /* only consider unique geometries as separate screens */
-        unique = ecalloc(nn, sizeof(XineramaScreenInfo));
-        for (i = 0, j = 0; i < nn; i++)
-            if (isuniquegeom(unique, j, &info[i]))
-                memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
-        XFree(info);
-        nn = j;
-        if (n <= nn) {
-            for (i = 0; i < (nn - n); i++) { /* new monitors available */
-                for (m = mons; m && m->next; m = m->next);
-                if (m)
-                    m->next = createmon();
-                else
-                    mons = createmon();
-            }
-            for (i = 0, m = mons; i < nn && m; m = m->next, i++)
-                if (i >= n
-                        || (unique[i].x_org != m->mx || unique[i].y_org != m->my
-                            || unique[i].width != m->mw || unique[i].height != m->mh))
-                {
-                    dirty = 1;
-                    m->num = i;
-                    m->mx = m->wx = unique[i].x_org;
-                    m->my = m->wy = unique[i].y_org;
-                    m->mw = m->ww = unique[i].width;
-                    m->mh = m->wh = unique[i].height;
-                    updatebarpos(m);
-                }
-        } else {
-            /* less monitors available nn < n */
-            for (i = nn; i < n; i++) {
-                for (m = mons; m && m->next; m = m->next);
-                while (m->clients) {
-                    dirty = 1;
-                    c = m->clients;
-                    m->clients = c->next;
-                    detachstack(c);
-                    c->mon = mons;
-                    attach(c);
-                    attachstack(c);
-                }
-                if (m == selmon)
-                    selmon = mons;
-                cleanupmon(m);
-            }
-        }
-        free(unique);
-    } else
-#endif /* XINERAMA */
-        /* default monitor setup */
-    {
-        if (!mons)
-            mons = createmon();
-        if (mons->mw != sw || mons->mh != sh) {
-            dirty = 1;
-            mons->mw = mons->ww = sw;
-            mons->mh = mons->wh = sh;
-            updatebarpos(mons);
-        }
-    }
-    if (dirty) {
-        selmon = mons;
-        selmon = wintomon(root);
-    }
-    return dirty;
-}
-
-    void
-updatenumlockmask(void)
-{
-    unsigned int i, j;
-    XModifierKeymap *modmap;
-
-    numlockmask = 0;
-    modmap = XGetModifierMapping(dpy);
-    for (i = 0; i < 8; i++)
-        for (j = 0; j < modmap->max_keypermod; j++)
-            if (modmap->modifiermap[i * modmap->max_keypermod + j]
-                    == XKeysymToKeycode(dpy, XK_Num_Lock))
-                numlockmask = (1 << i);
-    XFreeModifiermap(modmap);
-}
-
-    void
-updatesizehints(Client *c)
-{
-    long msize;
-    XSizeHints size;
-
-    if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
-        /* size is uninitialized, ensure that size.flags aren't used */
-        size.flags = PSize;
-    if (size.flags & PBaseSize) {
-        c->basew = size.base_width;
-        c->baseh = size.base_height;
-    } else if (size.flags & PMinSize) {
-        c->basew = size.min_width;
-        c->baseh = size.min_height;
-    } else
-        c->basew = c->baseh = 0;
-    if (size.flags & PResizeInc) {
-        c->incw = size.width_inc;
-        c->inch = size.height_inc;
-    } else
-        c->incw = c->inch = 0;
-    if (size.flags & PMaxSize) {
-        c->maxw = size.max_width;
-        c->maxh = size.max_height;
-    } else
-        c->maxw = c->maxh = 0;
-    if (size.flags & PMinSize) {
-        c->minw = size.min_width;
-        c->minh = size.min_height;
-    } else if (size.flags & PBaseSize) {
-        c->minw = size.base_width;
-        c->minh = size.base_height;
-    } else
-        c->minw = c->minh = 0;
-    if (size.flags & PAspect) {
-        c->mina = (float)size.min_aspect.y / size.min_aspect.x;
-        c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
-    } else
-        c->maxa = c->mina = 0.0;
-    c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-            && c->maxw == c->minw && c->maxh == c->minh);
-}
-
-    void
-updatetitle(Client *c)
-{
-    if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-        gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
-    if (c->name[0] == '\0') /* hack to mark broken clients */
-        strcpy(c->name, broken);
-}
-
-    void
-updatestatus(void)
-{
-    if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
-        strcpy(stext, "dwm-"VERSION);
-    drawbar(selmon);
-}
-
-    void
-updatewindowtype(Client *c)
-{
-    Atom state = getatomprop(c, netatom[NetWMState]);
-    Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-
-    if (state == netatom[NetWMFullscreen])
-        setfullscreen(c, 1);
-    if (wtype == netatom[NetWMWindowTypeDialog])
-        c->isfloating = 1;
-}
-
-    void
-updatewmhints(Client *c)
-{
-    XWMHints *wmh;
-
-    if ((wmh = XGetWMHints(dpy, c->win))) {
-        if (c == selmon->sel && wmh->flags & XUrgencyHint) {
-            wmh->flags &= ~XUrgencyHint;
-            XSetWMHints(dpy, c->win, wmh);
-        } else
-            c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
-        if (wmh->flags & InputHint)
-            c->neverfocus = !wmh->input;
-        else
-            c->neverfocus = 0;
-        XFree(wmh);
-    }
-}
-
-    void
-view(const Arg *arg)
-{
-    if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
-        return;
-    selmon->seltags ^= 1; /* toggle sel tagset */
-    if (arg->ui & TAGMASK)
-        selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-    focus(NULL);
-    arrange(selmon);
-}
-
-    Client *
-wintoclient(Window w)
-{
-    Client *c;
-    Monitor *m;
-
-    for (m = mons; m; m = m->next)
-        for (c = m->clients; c; c = c->next)
-            if (c->win == w)
-                return c;
-    return NULL;
-}
-
-    Monitor *
-wintomon(Window w)
-{
-    int x, y;
-    Client *c;
-    Monitor *m;
-
-    if (w == root && getrootptr(&x, &y))
-        return recttomon(x, y, 1, 1);
-    for (m = mons; m; m = m->next)
-        if (w == m->barwin)
-            return m;
-    if ((c = wintoclient(w)))
-        return c->mon;
-    return selmon;
-}
-
-/* There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
- * default error handler, which may call exit.  */
-    int
-xerror(Display *dpy, XErrorEvent *ee)
-{
-    if (ee->error_code == BadWindow
-            || (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
-            || (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
-            || (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
-            || (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
-            || (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
-            || (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
-            || (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
-            || (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
-        return 0;
-    fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-            ee->request_code, ee->error_code);
-    return xerrorxlib(dpy, ee); /* may call exit */
-}
-
-    int
-xerrordummy(Display *dpy, XErrorEvent *ee)
-{
-    return 0;
-}
-
-/* Startup Error handler to check if another window manager
- * is already running. */
-    int
-xerrorstart(Display *dpy, XErrorEvent *ee)
-{
-    die("dwm: another window manager is already running\n");
-    return -1;
-}
-
-    void
-zoom(const Arg *arg)
-{
-    Client *c = selmon->sel;
-
-    if (!selmon->lt[selmon->sellt]->arrange
-            || (selmon->sel && selmon->sel->isfloating))
-        return;
-    if (c == nexttiled(selmon->clients))
-        if (!c || !(c = nexttiled(c->next)))
-            return;
-    pop(c);
-}
-
-    int
-main(int argc, char *argv[])
-{
-    if (argc == 2 && !strcmp("-v", argv[1]))
-        die("dwm-"VERSION "\n");
-    else if (argc != 1)
-        die("usage: dwm [-v]\n");
-    if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-        fputs("warning: no locale support\n", stderr);
-    if (!(dpy = XOpenDisplay(NULL)))
-        die("dwm: cannot open display\n");
-    checkotherwm();
-    setup();
-    scan();
-    run();
-    cleanup();
-    XCloseDisplay(dpy);
-    return EXIT_SUCCESS;
-}
diff --git a/suckless/dwm-6.1/dwm.c.orig b/suckless/dwm-6.1/dwm.c.orig
deleted file mode 100644
index c4b3590..0000000
--- a/suckless/dwm-6.1/dwm.c.orig
+++ /dev/null
@@ -1,2146 +0,0 @@
-/* See LICENSE file for copyright and license details.
- *
- * dynamic window manager is designed like any other X client as well. It is
- * driven through handling X events. In contrast to other X clients, a window
- * manager selects for SubstructureRedirectMask on the root window, to receive
- * events about window (dis-)appearance.  Only one X connection at a time is
- * allowed to select for this event mask.
- *
- * The event handlers of dwm are organized in an array which is accessed
- * whenever a new event has been fetched. This allows event dispatching
- * in O(1) time.
- *
- * Each child of the root window is called a client, except windows which have
- * set the override_redirect flag.  Clients are organized in a linked client
- * list on each monitor, the focus history is remembered through a stack list
- * on each monitor. Each client contains a bit array to indicate the tags of a
- * client.
- *
- * Keys and tagging rules are organized as arrays and defined in config.h.
- *
- * To understand everything else, start reading main().
- */
-#include <errno.h>
-#include <locale.h>
-#include <signal.h>
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <unistd.h>
-#include <sys/types.h>
-#include <sys/wait.h>
-#include <X11/cursorfont.h>
-#include <X11/keysym.h>
-#include <X11/Xatom.h>
-#include <X11/Xlib.h>
-#include <X11/Xproto.h>
-#include <X11/Xutil.h>
-#ifdef XINERAMA
-#include <X11/extensions/Xinerama.h>
-#endif /* XINERAMA */
-#include <X11/Xft/Xft.h>
-
-#include "drw.h"
-#include "util.h"
-
-/* macros */
-#define BUTTONMASK              (ButtonPressMask|ButtonReleaseMask)
-#define CLEANMASK(mask)         (mask & ~(numlockmask|LockMask) & (ShiftMask|ControlMask|Mod1Mask|Mod2Mask|Mod3Mask|Mod4Mask|Mod5Mask))
-#define INTERSECT(x,y,w,h,m)    (MAX(0, MIN((x)+(w),(m)->wx+(m)->ww) - MAX((x),(m)->wx)) \
-                               * MAX(0, MIN((y)+(h),(m)->wy+(m)->wh) - MAX((y),(m)->wy)))
-#define ISVISIBLE(C)            ((C->tags & C->mon->tagset[C->mon->seltags]))
-#define LENGTH(X)               (sizeof X / sizeof X[0])
-#define MAXCOLORS               9
-#define MOUSEMASK               (BUTTONMASK|PointerMotionMask)
-#define WIDTH(X)                ((X)->w + 2 * (X)->bw)
-#define HEIGHT(X)               ((X)->h + 2 * (X)->bw)
-#define TAGMASK                 ((1 << LENGTH(tags)) - 1)
-#define TEXTW(X)                (drw_text(drw, 0, 0, 0, 0, (X), 0) + drw->fonts[0]->h)
-
-/* enums */
-enum { CurNormal, CurResize, CurMove, CurLast }; /* cursor */
-enum { SchemeNorm, SchemeSel, SchemeLast }; /* color schemes */
-enum { NetSupported, NetWMName, NetWMState,
-       NetWMFullscreen, NetActiveWindow, NetWMWindowType,
-       NetWMWindowTypeDialog, NetClientList, NetLast }; /* EWMH atoms */
-enum { WMProtocols, WMDelete, WMState, WMTakeFocus, WMLast }; /* default atoms */
-enum { ClkTagBar, ClkLtSymbol, ClkStatusText, ClkWinTitle,
-       ClkClientWin, ClkRootWin, ClkLast }; /* clicks */
-
-typedef union {
-	int i;
-	unsigned int ui;
-	float f;
-	const void *v;
-} Arg;
-
-typedef struct {
-	unsigned int click;
-	unsigned int mask;
-	unsigned int button;
-	void (*func)(const Arg *arg);
-	const Arg arg;
-} Button;
-
-typedef struct Monitor Monitor;
-typedef struct Client Client;
-struct Client {
-	char name[256];
-	float mina, maxa;
-	int x, y, w, h;
-	int oldx, oldy, oldw, oldh;
-	int basew, baseh, incw, inch, maxw, maxh, minw, minh;
-	int bw, oldbw;
-	unsigned int tags;
-	int isfixed, isfloating, isurgent, neverfocus, oldstate, isfullscreen;
-	Client *next;
-	Client *snext;
-	Monitor *mon;
-	Window win;
-};
-
-typedef struct {
-	unsigned int mod;
-	KeySym keysym;
-	void (*func)(const Arg *);
-	const Arg arg;
-} Key;
-
-typedef struct {
-	const char *symbol;
-	void (*arrange)(Monitor *);
-} Layout;
-
-struct Monitor {
-	char ltsymbol[16];
-	float mfact;
-	int nmaster;
-	int num;
-	int by;               /* bar geometry */
-	int mx, my, mw, mh;   /* screen size */
-	int wx, wy, ww, wh;   /* window area  */
-	unsigned int seltags;
-	unsigned int sellt;
-	unsigned int tagset[2];
-	int showbar;
-	int topbar;
-	Client *clients;
-	Client *sel;
-	Client *stack;
-	Monitor *next;
-	Window barwin;
-	const Layout *lt[2];
-};
-
-typedef struct {
-	const char *class;
-	const char *instance;
-	const char *title;
-	unsigned int tags;
-	int isfloating;
-	int monitor;
-} Rule;
-
-/* function declarations */
-static void applyrules(Client *c);
-static int applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact);
-static void arrange(Monitor *m);
-static void arrangemon(Monitor *m);
-static void attach(Client *c);
-static void attachstack(Client *c);
-static void buttonpress(XEvent *e);
-static void checkotherwm(void);
-static void cleanup(void);
-static void cleanupmon(Monitor *mon);
-static void clearurgent(Client *c);
-static void clientmessage(XEvent *e);
-static void configure(Client *c);
-static void configurenotify(XEvent *e);
-static void configurerequest(XEvent *e);
-static Monitor *createmon(void);
-static void destroynotify(XEvent *e);
-static void detach(Client *c);
-static void detachstack(Client *c);
-static Monitor *dirtomon(int dir);
-static void drawbar(Monitor *m);
-static void drawbars(void);
-static void enternotify(XEvent *e);
-static void expose(XEvent *e);
-static void focus(Client *c);
-static void focusin(XEvent *e);
-static void focusmon(const Arg *arg);
-static void focusstack(const Arg *arg);
-static int getrootptr(int *x, int *y);
-static long getstate(Window w);
-static int gettextprop(Window w, Atom atom, char *text, unsigned int size);
-static void grabbuttons(Client *c, int focused);
-static void grabkeys(void);
-static void incnmaster(const Arg *arg);
-static void keypress(XEvent *e);
-static void killclient(const Arg *arg);
-static void manage(Window w, XWindowAttributes *wa);
-static void mappingnotify(XEvent *e);
-static void maprequest(XEvent *e);
-static void monocle(Monitor *m);
-static void motionnotify(XEvent *e);
-static void movemouse(const Arg *arg);
-static Client *nexttiled(Client *c);
-static void pop(Client *);
-static void propertynotify(XEvent *e);
-static void quit(const Arg *arg);
-static Monitor *recttomon(int x, int y, int w, int h);
-static void resize(Client *c, int x, int y, int w, int h, int interact);
-static void resizeclient(Client *c, int x, int y, int w, int h);
-static void resizemouse(const Arg *arg);
-static void restack(Monitor *m);
-static void run(void);
-static void scan(void);
-static int sendevent(Client *c, Atom proto);
-static void sendmon(Client *c, Monitor *m);
-static void setclientstate(Client *c, long state);
-static void setfocus(Client *c);
-static void setfullscreen(Client *c, int fullscreen);
-static void setlayout(const Arg *arg);
-static void setmfact(const Arg *arg);
-static void setup(void);
-static void showhide(Client *c);
-static void sigchld(int unused);
-static void spawn(const Arg *arg);
-static void tag(const Arg *arg);
-static void tagmon(const Arg *arg);
-static void tile(Monitor *);
-static void togglebar(const Arg *arg);
-static void togglefloating(const Arg *arg);
-static void toggletag(const Arg *arg);
-static void toggleview(const Arg *arg);
-static void unfocus(Client *c, int setfocus);
-static void unmanage(Client *c, int destroyed);
-static void unmapnotify(XEvent *e);
-static int updategeom(void);
-static void updatebarpos(Monitor *m);
-static void updatebars(void);
-static void updateclientlist(void);
-static void updatenumlockmask(void);
-static void updatesizehints(Client *c);
-static void updatestatus(void);
-static void updatewindowtype(Client *c);
-static void updatetitle(Client *c);
-static void updatewmhints(Client *c);
-static void view(const Arg *arg);
-static Client *wintoclient(Window w);
-static Monitor *wintomon(Window w);
-static int xerror(Display *dpy, XErrorEvent *ee);
-static int xerrordummy(Display *dpy, XErrorEvent *ee);
-static int xerrorstart(Display *dpy, XErrorEvent *ee);
-static void zoom(const Arg *arg);
-
-/* variables */
-static const char broken[] = "broken";
-static char stext[256];
-static int screen;
-static int sw, sh;           /* X display screen geometry width, height */
-static int bh, blw = 0;      /* bar geometry */
-static int (*xerrorxlib)(Display *, XErrorEvent *);
-static unsigned int numlockmask = 0;
-static void (*handler[LASTEvent]) (XEvent *) = {
-	[ButtonPress] = buttonpress,
-	[ClientMessage] = clientmessage,
-	[ConfigureRequest] = configurerequest,
-	[ConfigureNotify] = configurenotify,
-	[DestroyNotify] = destroynotify,
-	[EnterNotify] = enternotify,
-	[Expose] = expose,
-	[FocusIn] = focusin,
-	[KeyPress] = keypress,
-	[MappingNotify] = mappingnotify,
-	[MapRequest] = maprequest,
-	[MotionNotify] = motionnotify,
-	[PropertyNotify] = propertynotify,
-	[UnmapNotify] = unmapnotify
-};
-static Atom wmatom[WMLast], netatom[NetLast];
-static int running = 1;
-static Cur *cursor[CurLast];
-static ClrScheme scheme[MAXCOLORS];
-static Display *dpy;
-static Drw *drw;
-static Monitor *mons, *selmon;
-static Window root;
-
-/* configuration, allows nested code to access above variables */
-#include "config.h"
-
-/* compile-time check if all tags fit into an unsigned int bit array. */
-struct NumTags { char limitexceeded[LENGTH(tags) > 31 ? -1 : 1]; };
-
-/* function implementations */
-void
-applyrules(Client *c)
-{
-	const char *class, *instance;
-	unsigned int i;
-	const Rule *r;
-	Monitor *m;
-	XClassHint ch = { NULL, NULL };
-
-	/* rule matching */
-	c->isfloating = 0;
-	c->tags = 0;
-	XGetClassHint(dpy, c->win, &ch);
-	class    = ch.res_class ? ch.res_class : broken;
-	instance = ch.res_name  ? ch.res_name  : broken;
-
-	for (i = 0; i < LENGTH(rules); i++) {
-		r = &rules[i];
-		if ((!r->title || strstr(c->name, r->title))
-		&& (!r->class || strstr(class, r->class))
-		&& (!r->instance || strstr(instance, r->instance)))
-		{
-			c->isfloating = r->isfloating;
-			c->tags |= r->tags;
-			for (m = mons; m && m->num != r->monitor; m = m->next);
-			if (m)
-				c->mon = m;
-		}
-	}
-	if (ch.res_class)
-		XFree(ch.res_class);
-	if (ch.res_name)
-		XFree(ch.res_name);
-	c->tags = c->tags & TAGMASK ? c->tags & TAGMASK : c->mon->tagset[c->mon->seltags];
-}
-
-int
-applysizehints(Client *c, int *x, int *y, int *w, int *h, int interact)
-{
-	int baseismin;
-	Monitor *m = c->mon;
-
-	/* set minimum possible */
-	*w = MAX(1, *w);
-	*h = MAX(1, *h);
-	if (interact) {
-		if (*x > sw)
-			*x = sw - WIDTH(c);
-		if (*y > sh)
-			*y = sh - HEIGHT(c);
-		if (*x + *w + 2 * c->bw < 0)
-			*x = 0;
-		if (*y + *h + 2 * c->bw < 0)
-			*y = 0;
-	} else {
-		if (*x >= m->wx + m->ww)
-			*x = m->wx + m->ww - WIDTH(c);
-		if (*y >= m->wy + m->wh)
-			*y = m->wy + m->wh - HEIGHT(c);
-		if (*x + *w + 2 * c->bw <= m->wx)
-			*x = m->wx;
-		if (*y + *h + 2 * c->bw <= m->wy)
-			*y = m->wy;
-	}
-	if (*h < bh)
-		*h = bh;
-	if (*w < bh)
-		*w = bh;
-	if (resizehints || c->isfloating || !c->mon->lt[c->mon->sellt]->arrange) {
-		/* see last two sentences in ICCCM 4.1.2.3 */
-		baseismin = c->basew == c->minw && c->baseh == c->minh;
-		if (!baseismin) { /* temporarily remove base dimensions */
-			*w -= c->basew;
-			*h -= c->baseh;
-		}
-		/* adjust for aspect limits */
-		if (c->mina > 0 && c->maxa > 0) {
-			if (c->maxa < (float)*w / *h)
-				*w = *h * c->maxa + 0.5;
-			else if (c->mina < (float)*h / *w)
-				*h = *w * c->mina + 0.5;
-		}
-		if (baseismin) { /* increment calculation requires this */
-			*w -= c->basew;
-			*h -= c->baseh;
-		}
-		/* adjust for increment value */
-		if (c->incw)
-			*w -= *w % c->incw;
-		if (c->inch)
-			*h -= *h % c->inch;
-		/* restore base dimensions */
-		*w = MAX(*w + c->basew, c->minw);
-		*h = MAX(*h + c->baseh, c->minh);
-		if (c->maxw)
-			*w = MIN(*w, c->maxw);
-		if (c->maxh)
-			*h = MIN(*h, c->maxh);
-	}
-	return *x != c->x || *y != c->y || *w != c->w || *h != c->h;
-}
-
-void
-arrange(Monitor *m)
-{
-	if (m)
-		showhide(m->stack);
-	else for (m = mons; m; m = m->next)
-		showhide(m->stack);
-	if (m) {
-		arrangemon(m);
-		restack(m);
-	} else for (m = mons; m; m = m->next)
-		arrangemon(m);
-}
-
-void
-arrangemon(Monitor *m)
-{
-	strncpy(m->ltsymbol, m->lt[m->sellt]->symbol, sizeof m->ltsymbol);
-	if (m->lt[m->sellt]->arrange)
-		m->lt[m->sellt]->arrange(m);
-}
-
-void
-attach(Client *c)
-{
-	c->next = c->mon->clients;
-	c->mon->clients = c;
-}
-
-void
-attachstack(Client *c)
-{
-	c->snext = c->mon->stack;
-	c->mon->stack = c;
-}
-
-void
-buttonpress(XEvent *e)
-{
-	unsigned int i, x, click;
-	Arg arg = {0};
-	Client *c;
-	Monitor *m;
-	XButtonPressedEvent *ev = &e->xbutton;
-
-	click = ClkRootWin;
-	/* focus monitor if necessary */
-	if ((m = wintomon(ev->window)) && m != selmon) {
-		unfocus(selmon->sel, 1);
-		selmon = m;
-		focus(NULL);
-	}
-	if (ev->window == selmon->barwin) {
-		i = x = 0;
-		do
-			x += TEXTW(tags[i]);
-		while (ev->x >= x && ++i < LENGTH(tags));
-		if (i < LENGTH(tags)) {
-			click = ClkTagBar;
-			arg.ui = 1 << i;
-		} else if (ev->x < x + blw)
-			click = ClkLtSymbol;
-		else if (ev->x > selmon->ww - TEXTW(stext))
-			click = ClkStatusText;
-		else
-			click = ClkWinTitle;
-	} else if ((c = wintoclient(ev->window))) {
-		focus(c);
-		click = ClkClientWin;
-	}
-	for (i = 0; i < LENGTH(buttons); i++)
-		if (click == buttons[i].click && buttons[i].func && buttons[i].button == ev->button
-		&& CLEANMASK(buttons[i].mask) == CLEANMASK(ev->state))
-			buttons[i].func(click == ClkTagBar && buttons[i].arg.i == 0 ? &arg : &buttons[i].arg);
-}
-
-void
-checkotherwm(void)
-{
-	xerrorxlib = XSetErrorHandler(xerrorstart);
-	/* this causes an error if some other window manager is running */
-	XSelectInput(dpy, DefaultRootWindow(dpy), SubstructureRedirectMask);
-	XSync(dpy, False);
-	XSetErrorHandler(xerror);
-	XSync(dpy, False);
-}
-
-void
-cleanup(void)
-{
-	Arg a = {.ui = ~0};
-	Layout foo = { "", NULL };
-	Monitor *m;
-	size_t i;
-
-	view(&a);
-	selmon->lt[selmon->sellt] = &foo;
-	for (m = mons; m; m = m->next)
-		while (m->stack)
-			unmanage(m->stack, 0);
-	XUngrabKey(dpy, AnyKey, AnyModifier, root);
-	while (mons)
-		cleanupmon(mons);
-	for (i = 0; i < CurLast; i++)
-		drw_cur_free(drw, cursor[i]);
-	for (i = 0; i < SchemeLast; i++) {
-		drw_clr_free(scheme[i].border);
-		drw_clr_free(scheme[i].bg);
-		drw_clr_free(scheme[i].fg);
-	}
-	drw_free(drw);
-	XSync(dpy, False);
-	XSetInputFocus(dpy, PointerRoot, RevertToPointerRoot, CurrentTime);
-	XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-}
-
-void
-cleanupmon(Monitor *mon)
-{
-	Monitor *m;
-
-	if (mon == mons)
-		mons = mons->next;
-	else {
-		for (m = mons; m && m->next != mon; m = m->next);
-		m->next = mon->next;
-	}
-	XUnmapWindow(dpy, mon->barwin);
-	XDestroyWindow(dpy, mon->barwin);
-	free(mon);
-}
-
-void
-clearurgent(Client *c)
-{
-	XWMHints *wmh;
-
-	c->isurgent = 0;
-	if (!(wmh = XGetWMHints(dpy, c->win)))
-		return;
-	wmh->flags &= ~XUrgencyHint;
-	XSetWMHints(dpy, c->win, wmh);
-	XFree(wmh);
-}
-
-void
-clientmessage(XEvent *e)
-{
-	XClientMessageEvent *cme = &e->xclient;
-	Client *c = wintoclient(cme->window);
-
-	if (!c)
-		return;
-	if (cme->message_type == netatom[NetWMState]) {
-		if (cme->data.l[1] == netatom[NetWMFullscreen] || cme->data.l[2] == netatom[NetWMFullscreen])
-			setfullscreen(c, (cme->data.l[0] == 1 /* _NET_WM_STATE_ADD    */
-			              || (cme->data.l[0] == 2 /* _NET_WM_STATE_TOGGLE */ && !c->isfullscreen)));
-	} else if (cme->message_type == netatom[NetActiveWindow]) {
-		if (!ISVISIBLE(c)) {
-			c->mon->seltags ^= 1;
-			c->mon->tagset[c->mon->seltags] = c->tags;
-		}
-		pop(c);
-	}
-}
-
-void
-configure(Client *c)
-{
-	XConfigureEvent ce;
-
-	ce.type = ConfigureNotify;
-	ce.display = dpy;
-	ce.event = c->win;
-	ce.window = c->win;
-	ce.x = c->x;
-	ce.y = c->y;
-	ce.width = c->w;
-	ce.height = c->h;
-	ce.border_width = c->bw;
-	ce.above = None;
-	ce.override_redirect = False;
-	XSendEvent(dpy, c->win, False, StructureNotifyMask, (XEvent *)&ce);
-}
-
-void
-configurenotify(XEvent *e)
-{
-	Monitor *m;
-	XConfigureEvent *ev = &e->xconfigure;
-	int dirty;
-
-	/* TODO: updategeom handling sucks, needs to be simplified */
-	if (ev->window == root) {
-		dirty = (sw != ev->width || sh != ev->height);
-		sw = ev->width;
-		sh = ev->height;
-		if (updategeom() || dirty) {
-			drw_resize(drw, sw, bh);
-			updatebars();
-			for (m = mons; m; m = m->next)
-				XMoveResizeWindow(dpy, m->barwin, m->wx, m->by, m->ww, bh);
-			focus(NULL);
-			arrange(NULL);
-		}
-	}
-}
-
-void
-configurerequest(XEvent *e)
-{
-	Client *c;
-	Monitor *m;
-	XConfigureRequestEvent *ev = &e->xconfigurerequest;
-	XWindowChanges wc;
-
-	if ((c = wintoclient(ev->window))) {
-		if (ev->value_mask & CWBorderWidth)
-			c->bw = ev->border_width;
-		else if (c->isfloating || !selmon->lt[selmon->sellt]->arrange) {
-			m = c->mon;
-			if (ev->value_mask & CWX) {
-				c->oldx = c->x;
-				c->x = m->mx + ev->x;
-			}
-			if (ev->value_mask & CWY) {
-				c->oldy = c->y;
-				c->y = m->my + ev->y;
-			}
-			if (ev->value_mask & CWWidth) {
-				c->oldw = c->w;
-				c->w = ev->width;
-			}
-			if (ev->value_mask & CWHeight) {
-				c->oldh = c->h;
-				c->h = ev->height;
-			}
-			if ((c->x + c->w) > m->mx + m->mw && c->isfloating)
-				c->x = m->mx + (m->mw / 2 - WIDTH(c) / 2); /* center in x direction */
-			if ((c->y + c->h) > m->my + m->mh && c->isfloating)
-				c->y = m->my + (m->mh / 2 - HEIGHT(c) / 2); /* center in y direction */
-			if ((ev->value_mask & (CWX|CWY)) && !(ev->value_mask & (CWWidth|CWHeight)))
-				configure(c);
-			if (ISVISIBLE(c))
-				XMoveResizeWindow(dpy, c->win, c->x, c->y, c->w, c->h);
-		} else
-			configure(c);
-	} else {
-		wc.x = ev->x;
-		wc.y = ev->y;
-		wc.width = ev->width;
-		wc.height = ev->height;
-		wc.border_width = ev->border_width;
-		wc.sibling = ev->above;
-		wc.stack_mode = ev->detail;
-		XConfigureWindow(dpy, ev->window, ev->value_mask, &wc);
-	}
-	XSync(dpy, False);
-}
-
-Monitor *
-createmon(void)
-{
-	Monitor *m;
-
-	m = ecalloc(1, sizeof(Monitor));
-	m->tagset[0] = m->tagset[1] = 1;
-	m->mfact = mfact;
-	m->nmaster = nmaster;
-	m->showbar = showbar;
-	m->topbar = topbar;
-	m->lt[0] = &layouts[0];
-	m->lt[1] = &layouts[1 % LENGTH(layouts)];
-	strncpy(m->ltsymbol, layouts[0].symbol, sizeof m->ltsymbol);
-	return m;
-}
-
-void
-destroynotify(XEvent *e)
-{
-	Client *c;
-	XDestroyWindowEvent *ev = &e->xdestroywindow;
-
-	if ((c = wintoclient(ev->window)))
-		unmanage(c, 1);
-}
-
-void
-detach(Client *c)
-{
-	Client **tc;
-
-	for (tc = &c->mon->clients; *tc && *tc != c; tc = &(*tc)->next);
-	*tc = c->next;
-}
-
-void
-detachstack(Client *c)
-{
-	Client **tc, *t;
-
-	for (tc = &c->mon->stack; *tc && *tc != c; tc = &(*tc)->snext);
-	*tc = c->snext;
-
-	if (c == c->mon->sel) {
-		for (t = c->mon->stack; t && !ISVISIBLE(t); t = t->snext);
-		c->mon->sel = t;
-	}
-}
-
-Monitor *
-dirtomon(int dir)
-{
-	Monitor *m = NULL;
-
-	if (dir > 0) {
-		if (!(m = selmon->next))
-			m = mons;
-	} else if (selmon == mons)
-		for (m = mons; m->next; m = m->next);
-	else
-		for (m = mons; m->next != selmon; m = m->next);
-	return m;
-}
-
-void
-drawbar(Monitor *m)
-{
-	int x, xx, w, dx;
-	unsigned int i, occ = 0, urg = 0;
-	Client *c;
-
-	dx = (drw->fonts[0]->ascent + drw->fonts[0]->descent + 2) / 4;
-
-	for (c = m->clients; c; c = c->next) {
-		occ |= c->tags;
-		if (c->isurgent)
-			urg |= c->tags;
-	}
-	x = 0;
-	for (i = 0; i < LENGTH(tags); i++) {
-		w = TEXTW(tags[i]);
-		drw_setscheme(drw, &scheme[(m->tagset[m->seltags] & 1 << i) ? 1 : (urg & 1 << i ? 2 : 0)]);
-		drw_text(drw, x, 0, w, bh, tags[i], 0);
-		drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
-		         occ & 1 << i, 0);
-		x += w;
-	}
-	w = blw = TEXTW(m->ltsymbol);
-	drw_setscheme(drw, &scheme[0]);
-	drw_text(drw, x, 0, w, bh, m->ltsymbol, 0);
-	x += w;
-	xx = x;
-	if (m == selmon) { /* status is only drawn on selected monitor */
-		w = drw_get_width(drw, NUMCOLORS, stext);
-		x = m->ww - w;
-		if (x < xx) {
-			x = xx;
-			w = m->ww - xx;
-		}
-		drw_colored_text(drw, scheme, NUMCOLORS, x, 0, w, bh, stext);
-	} else
-		x = m->ww;
-	if ((w = x - xx) > bh) {
-		x = xx;
-		if (m->sel) {
-			drw_setscheme(drw, &scheme[m == selmon ? 1 : 0]);
-			drw_text(drw, x, 0, w, bh, m->sel->name, 0);
-			drw_rect(drw, x + 1, 1, dx, dx, m->sel->isfixed, m->sel->isfloating, 0);
-		} else {
-			drw_setscheme(drw, &scheme[0]);
-			drw_rect(drw, x, 0, w, bh, 1, 0, 1);
-		}
-	}
-	drw_map(drw, m->barwin, 0, 0, m->ww, bh);
-}
-
-void
-drawbars(void)
-{
-	Monitor *m;
-
-	for (m = mons; m; m = m->next)
-		drawbar(m);
-}
-
-void
-enternotify(XEvent *e)
-{
-	Client *c;
-	Monitor *m;
-	XCrossingEvent *ev = &e->xcrossing;
-
-	if ((ev->mode != NotifyNormal || ev->detail == NotifyInferior) && ev->window != root)
-		return;
-	c = wintoclient(ev->window);
-	m = c ? c->mon : wintomon(ev->window);
-	if (m != selmon) {
-		unfocus(selmon->sel, 1);
-		selmon = m;
-	} else if (!c || c == selmon->sel)
-		return;
-	focus(c);
-}
-
-void
-expose(XEvent *e)
-{
-	Monitor *m;
-	XExposeEvent *ev = &e->xexpose;
-
-	if (ev->count == 0 && (m = wintomon(ev->window)))
-		drawbar(m);
-}
-
-void
-focus(Client *c)
-{
-	if (!c || !ISVISIBLE(c))
-		for (c = selmon->stack; c && !ISVISIBLE(c); c = c->snext);
-	/* was if (selmon->sel) */
-	if (selmon->sel && selmon->sel != c)
-		unfocus(selmon->sel, 0);
-	if (c) {
-		if (c->mon != selmon)
-			selmon = c->mon;
-		if (c->isurgent)
-			clearurgent(c);
-		detachstack(c);
-		attachstack(c);
-		grabbuttons(c, 1);
-		XSetWindowBorder(dpy, c->win, scheme[1].border->pix);
-		setfocus(c);
-	} else {
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-	}
-	selmon->sel = c;
-	drawbars();
-}
-
-/* there are some broken focus acquiring clients */
-void
-focusin(XEvent *e)
-{
-	XFocusChangeEvent *ev = &e->xfocus;
-
-	if (selmon->sel && ev->window != selmon->sel->win)
-		setfocus(selmon->sel);
-}
-
-void
-focusmon(const Arg *arg)
-{
-	Monitor *m;
-
-	if (!mons->next)
-		return;
-	if ((m = dirtomon(arg->i)) == selmon)
-		return;
-	unfocus(selmon->sel, 0); /* s/1/0/ fixes input focus issues
-					in gedit and anjuta */
-	selmon = m;
-	focus(NULL);
-}
-
-void
-focusstack(const Arg *arg)
-{
-	Client *c = NULL, *i;
-
-	if (!selmon->sel)
-		return;
-	if (arg->i > 0) {
-		for (c = selmon->sel->next; c && !ISVISIBLE(c); c = c->next);
-		if (!c)
-			for (c = selmon->clients; c && !ISVISIBLE(c); c = c->next);
-	} else {
-		for (i = selmon->clients; i != selmon->sel; i = i->next)
-			if (ISVISIBLE(i))
-				c = i;
-		if (!c)
-			for (; i; i = i->next)
-				if (ISVISIBLE(i))
-					c = i;
-	}
-	if (c) {
-		focus(c);
-		restack(selmon);
-	}
-}
-
-Atom
-getatomprop(Client *c, Atom prop)
-{
-	int di;
-	unsigned long dl;
-	unsigned char *p = NULL;
-	Atom da, atom = None;
-
-	if (XGetWindowProperty(dpy, c->win, prop, 0L, sizeof atom, False, XA_ATOM,
-	                      &da, &di, &dl, &dl, &p) == Success && p) {
-		atom = *(Atom *)p;
-		XFree(p);
-	}
-	return atom;
-}
-
-int
-getrootptr(int *x, int *y)
-{
-	int di;
-	unsigned int dui;
-	Window dummy;
-
-	return XQueryPointer(dpy, root, &dummy, &dummy, x, y, &di, &di, &dui);
-}
-
-long
-getstate(Window w)
-{
-	int format;
-	long result = -1;
-	unsigned char *p = NULL;
-	unsigned long n, extra;
-	Atom real;
-
-	if (XGetWindowProperty(dpy, w, wmatom[WMState], 0L, 2L, False, wmatom[WMState],
-	                      &real, &format, &n, &extra, (unsigned char **)&p) != Success)
-		return -1;
-	if (n != 0)
-		result = *p;
-	XFree(p);
-	return result;
-}
-
-int
-gettextprop(Window w, Atom atom, char *text, unsigned int size)
-{
-	char **list = NULL;
-	int n;
-	XTextProperty name;
-
-	if (!text || size == 0)
-		return 0;
-	text[0] = '\0';
-	XGetTextProperty(dpy, w, &name, atom);
-	if (!name.nitems)
-		return 0;
-	if (name.encoding == XA_STRING)
-		strncpy(text, (char *)name.value, size - 1);
-	else {
-		if (XmbTextPropertyToTextList(dpy, &name, &list, &n) >= Success && n > 0 && *list) {
-			strncpy(text, *list, size - 1);
-			XFreeStringList(list);
-		}
-	}
-	text[size - 1] = '\0';
-	XFree(name.value);
-	return 1;
-}
-
-void
-grabbuttons(Client *c, int focused)
-{
-	updatenumlockmask();
-	{
-		unsigned int i, j;
-		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-		if (focused) {
-			for (i = 0; i < LENGTH(buttons); i++)
-				if (buttons[i].click == ClkClientWin)
-					for (j = 0; j < LENGTH(modifiers); j++)
-						XGrabButton(dpy, buttons[i].button,
-						            buttons[i].mask | modifiers[j],
-						            c->win, False, BUTTONMASK,
-						            GrabModeAsync, GrabModeSync, None, None);
-		} else
-			XGrabButton(dpy, AnyButton, AnyModifier, c->win, False,
-			            BUTTONMASK, GrabModeAsync, GrabModeSync, None, None);
-	}
-}
-
-void
-grabkeys(void)
-{
-	updatenumlockmask();
-	{
-		unsigned int i, j;
-		unsigned int modifiers[] = { 0, LockMask, numlockmask, numlockmask|LockMask };
-		KeyCode code;
-
-		XUngrabKey(dpy, AnyKey, AnyModifier, root);
-		for (i = 0; i < LENGTH(keys); i++)
-			if ((code = XKeysymToKeycode(dpy, keys[i].keysym)))
-				for (j = 0; j < LENGTH(modifiers); j++)
-					XGrabKey(dpy, code, keys[i].mod | modifiers[j], root,
-						 True, GrabModeAsync, GrabModeAsync);
-	}
-}
-
-void
-incnmaster(const Arg *arg)
-{
-	selmon->nmaster = MAX(selmon->nmaster + arg->i, 0);
-	arrange(selmon);
-}
-
-#ifdef XINERAMA
-static int
-isuniquegeom(XineramaScreenInfo *unique, size_t n, XineramaScreenInfo *info)
-{
-	while (n--)
-		if (unique[n].x_org == info->x_org && unique[n].y_org == info->y_org
-		&& unique[n].width == info->width && unique[n].height == info->height)
-			return 0;
-	return 1;
-}
-#endif /* XINERAMA */
-
-void
-keypress(XEvent *e)
-{
-	unsigned int i;
-	KeySym keysym;
-	XKeyEvent *ev;
-
-	ev = &e->xkey;
-	keysym = XKeycodeToKeysym(dpy, (KeyCode)ev->keycode, 0);
-	for (i = 0; i < LENGTH(keys); i++)
-		if (keysym == keys[i].keysym
-		&& CLEANMASK(keys[i].mod) == CLEANMASK(ev->state)
-		&& keys[i].func)
-			keys[i].func(&(keys[i].arg));
-}
-
-void
-killclient(const Arg *arg)
-{
-	if (!selmon->sel)
-		return;
-	if (!sendevent(selmon->sel, wmatom[WMDelete])) {
-		XGrabServer(dpy);
-		XSetErrorHandler(xerrordummy);
-		XSetCloseDownMode(dpy, DestroyAll);
-		XKillClient(dpy, selmon->sel->win);
-		XSync(dpy, False);
-		XSetErrorHandler(xerror);
-		XUngrabServer(dpy);
-	}
-}
-
-void
-manage(Window w, XWindowAttributes *wa)
-{
-	Client *c, *t = NULL;
-	Window trans = None;
-	XWindowChanges wc;
-
-	c = ecalloc(1, sizeof(Client));
-	c->win = w;
-	updatetitle(c);
-	if (XGetTransientForHint(dpy, w, &trans) && (t = wintoclient(trans))) {
-		c->mon = t->mon;
-		c->tags = t->tags;
-	} else {
-		c->mon = selmon;
-		applyrules(c);
-	}
-	/* geometry */
-	c->x = c->oldx = wa->x;
-	c->y = c->oldy = wa->y;
-	c->w = c->oldw = wa->width;
-	c->h = c->oldh = wa->height;
-	c->oldbw = wa->border_width;
-
-	if (c->x + WIDTH(c) > c->mon->mx + c->mon->mw)
-		c->x = c->mon->mx + c->mon->mw - WIDTH(c);
-	if (c->y + HEIGHT(c) > c->mon->my + c->mon->mh)
-		c->y = c->mon->my + c->mon->mh - HEIGHT(c);
-	c->x = MAX(c->x, c->mon->mx);
-	/* only fix client y-offset, if the client center might cover the bar */
-	c->y = MAX(c->y, ((c->mon->by == c->mon->my) && (c->x + (c->w / 2) >= c->mon->wx)
-	           && (c->x + (c->w / 2) < c->mon->wx + c->mon->ww)) ? bh : c->mon->my);
-	c->bw = borderpx;
-
-	wc.border_width = c->bw;
-	XConfigureWindow(dpy, w, CWBorderWidth, &wc);
-	XSetWindowBorder(dpy, w, scheme[0].border->pix);
-	configure(c); /* propagates border_width, if size doesn't change */
-	updatewindowtype(c);
-	updatesizehints(c);
-	updatewmhints(c);
-	XSelectInput(dpy, w, EnterWindowMask|FocusChangeMask|PropertyChangeMask|StructureNotifyMask);
-	grabbuttons(c, 0);
-	if (!c->isfloating)
-		c->isfloating = c->oldstate = trans != None || c->isfixed;
-	if (c->isfloating)
-		XRaiseWindow(dpy, c->win);
-	attach(c);
-	attachstack(c);
-	XChangeProperty(dpy, root, netatom[NetClientList], XA_WINDOW, 32, PropModeAppend,
-	                (unsigned char *) &(c->win), 1);
-	XMoveResizeWindow(dpy, c->win, c->x + 2 * sw, c->y, c->w, c->h); /* some windows require this */
-	setclientstate(c, NormalState);
-	if (c->mon == selmon)
-		unfocus(selmon->sel, 0);
-	c->mon->sel = c;
-	arrange(c->mon);
-	XMapWindow(dpy, c->win);
-	focus(NULL);
-}
-
-void
-mappingnotify(XEvent *e)
-{
-	XMappingEvent *ev = &e->xmapping;
-
-	XRefreshKeyboardMapping(ev);
-	if (ev->request == MappingKeyboard)
-		grabkeys();
-}
-
-void
-maprequest(XEvent *e)
-{
-	static XWindowAttributes wa;
-	XMapRequestEvent *ev = &e->xmaprequest;
-
-	if (!XGetWindowAttributes(dpy, ev->window, &wa))
-		return;
-	if (wa.override_redirect)
-		return;
-	if (!wintoclient(ev->window))
-		manage(ev->window, &wa);
-}
-
-void
-monocle(Monitor *m)
-{
-	unsigned int n = 0;
-	Client *c;
-
-	for (c = m->clients; c; c = c->next)
-		if (ISVISIBLE(c))
-			n++;
-	if (n > 0) /* override layout symbol */
-		snprintf(m->ltsymbol, sizeof m->ltsymbol, "[%d]", n);
-	for (c = nexttiled(m->clients); c; c = nexttiled(c->next))
-		resize(c, m->wx, m->wy, m->ww - 2 * c->bw, m->wh - 2 * c->bw, 0);
-}
-
-void
-motionnotify(XEvent *e)
-{
-	static Monitor *mon = NULL;
-	Monitor *m;
-	XMotionEvent *ev = &e->xmotion;
-
-	if (ev->window != root)
-		return;
-	if ((m = recttomon(ev->x_root, ev->y_root, 1, 1)) != mon && mon) {
-		unfocus(selmon->sel, 1);
-		selmon = m;
-		focus(NULL);
-	}
-	mon = m;
-}
-
-void
-movemouse(const Arg *arg)
-{
-	int x, y, ocx, ocy, nx, ny;
-	Client *c;
-	Monitor *m;
-	XEvent ev;
-	Time lasttime = 0;
-
-	if (!(c = selmon->sel))
-		return;
-	if (c->isfullscreen) /* no support moving fullscreen windows by mouse */
-		return;
-	restack(selmon);
-	ocx = c->x;
-	ocy = c->y;
-	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-	None, cursor[CurMove]->cursor, CurrentTime) != GrabSuccess)
-		return;
-	if (!getrootptr(&x, &y))
-		return;
-	do {
-		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-		switch(ev.type) {
-		case ConfigureRequest:
-		case Expose:
-		case MapRequest:
-			handler[ev.type](&ev);
-			break;
-		case MotionNotify:
-			if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-				continue;
-			lasttime = ev.xmotion.time;
-
-			nx = ocx + (ev.xmotion.x - x);
-			ny = ocy + (ev.xmotion.y - y);
-			if (nx >= selmon->wx && nx <= selmon->wx + selmon->ww
-			&& ny >= selmon->wy && ny <= selmon->wy + selmon->wh) {
-				if (abs(selmon->wx - nx) < snap)
-					nx = selmon->wx;
-				else if ((selmon->wx + selmon->ww) - (nx + WIDTH(c)) < snap)
-					nx = selmon->wx + selmon->ww - WIDTH(c);
-				if (abs(selmon->wy - ny) < snap)
-					ny = selmon->wy;
-				else if ((selmon->wy + selmon->wh) - (ny + HEIGHT(c)) < snap)
-					ny = selmon->wy + selmon->wh - HEIGHT(c);
-				if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-				&& (abs(nx - c->x) > snap || abs(ny - c->y) > snap))
-					togglefloating(NULL);
-			}
-			if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-				resize(c, nx, ny, c->w, c->h, 1);
-			break;
-		}
-	} while (ev.type != ButtonRelease);
-	XUngrabPointer(dpy, CurrentTime);
-	if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-		sendmon(c, m);
-		selmon = m;
-		focus(NULL);
-	}
-}
-
-Client *
-nexttiled(Client *c)
-{
-	for (; c && (c->isfloating || !ISVISIBLE(c)); c = c->next);
-	return c;
-}
-
-void
-pop(Client *c)
-{
-	detach(c);
-	attach(c);
-	focus(c);
-	arrange(c->mon);
-}
-
-void
-propertynotify(XEvent *e)
-{
-	Client *c;
-	Window trans;
-	XPropertyEvent *ev = &e->xproperty;
-
-	if ((ev->window == root) && (ev->atom == XA_WM_NAME))
-		updatestatus();
-	else if (ev->state == PropertyDelete)
-		return; /* ignore */
-	else if ((c = wintoclient(ev->window))) {
-		switch(ev->atom) {
-		default: break;
-		case XA_WM_TRANSIENT_FOR:
-			if (!c->isfloating && (XGetTransientForHint(dpy, c->win, &trans)) &&
-			   (c->isfloating = (wintoclient(trans)) != NULL))
-				arrange(c->mon);
-			break;
-		case XA_WM_NORMAL_HINTS:
-			updatesizehints(c);
-			break;
-		case XA_WM_HINTS:
-			updatewmhints(c);
-			drawbars();
-			break;
-		}
-		if (ev->atom == XA_WM_NAME || ev->atom == netatom[NetWMName]) {
-			updatetitle(c);
-			if (c == c->mon->sel)
-				drawbar(c->mon);
-		}
-		if (ev->atom == netatom[NetWMWindowType])
-			updatewindowtype(c);
-	}
-}
-
-void
-quit(const Arg *arg)
-{
-	running = 0;
-}
-
-Monitor *
-recttomon(int x, int y, int w, int h)
-{
-	Monitor *m, *r = selmon;
-	int a, area = 0;
-
-	for (m = mons; m; m = m->next)
-		if ((a = INTERSECT(x, y, w, h, m)) > area) {
-			area = a;
-			r = m;
-		}
-	return r;
-}
-
-void
-resize(Client *c, int x, int y, int w, int h, int interact)
-{
-	if (applysizehints(c, &x, &y, &w, &h, interact))
-		resizeclient(c, x, y, w, h);
-}
-
-void
-resizeclient(Client *c, int x, int y, int w, int h)
-{
-	XWindowChanges wc;
-
-	c->oldx = c->x; c->x = wc.x = x;
-	c->oldy = c->y; c->y = wc.y = y;
-	c->oldw = c->w; c->w = wc.width = w;
-	c->oldh = c->h; c->h = wc.height = h;
-	wc.border_width = c->bw;
-	XConfigureWindow(dpy, c->win, CWX|CWY|CWWidth|CWHeight|CWBorderWidth, &wc);
-	configure(c);
-	XSync(dpy, False);
-}
-
-void
-resizemouse(const Arg *arg)
-{
-	int ocx, ocy, nw, nh;
-	Client *c;
-	Monitor *m;
-	XEvent ev;
-	Time lasttime = 0;
-
-	if (!(c = selmon->sel))
-		return;
-	if (c->isfullscreen) /* no support resizing fullscreen windows by mouse */
-		return;
-	restack(selmon);
-	ocx = c->x;
-	ocy = c->y;
-	if (XGrabPointer(dpy, root, False, MOUSEMASK, GrabModeAsync, GrabModeAsync,
-	                None, cursor[CurResize]->cursor, CurrentTime) != GrabSuccess)
-		return;
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-	do {
-		XMaskEvent(dpy, MOUSEMASK|ExposureMask|SubstructureRedirectMask, &ev);
-		switch(ev.type) {
-		case ConfigureRequest:
-		case Expose:
-		case MapRequest:
-			handler[ev.type](&ev);
-			break;
-		case MotionNotify:
-			if ((ev.xmotion.time - lasttime) <= (1000 / 60))
-				continue;
-			lasttime = ev.xmotion.time;
-
-			nw = MAX(ev.xmotion.x - ocx - 2 * c->bw + 1, 1);
-			nh = MAX(ev.xmotion.y - ocy - 2 * c->bw + 1, 1);
-			if (c->mon->wx + nw >= selmon->wx && c->mon->wx + nw <= selmon->wx + selmon->ww
-			&& c->mon->wy + nh >= selmon->wy && c->mon->wy + nh <= selmon->wy + selmon->wh)
-			{
-				if (!c->isfloating && selmon->lt[selmon->sellt]->arrange
-				&& (abs(nw - c->w) > snap || abs(nh - c->h) > snap))
-					togglefloating(NULL);
-			}
-			if (!selmon->lt[selmon->sellt]->arrange || c->isfloating)
-				resize(c, c->x, c->y, nw, nh, 1);
-			break;
-		}
-	} while (ev.type != ButtonRelease);
-	XWarpPointer(dpy, None, c->win, 0, 0, 0, 0, c->w + c->bw - 1, c->h + c->bw - 1);
-	XUngrabPointer(dpy, CurrentTime);
-	while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-	if ((m = recttomon(c->x, c->y, c->w, c->h)) != selmon) {
-		sendmon(c, m);
-		selmon = m;
-		focus(NULL);
-	}
-}
-
-void
-restack(Monitor *m)
-{
-	Client *c;
-	XEvent ev;
-	XWindowChanges wc;
-
-	drawbar(m);
-	if (!m->sel)
-		return;
-	if (m->sel->isfloating || !m->lt[m->sellt]->arrange)
-		XRaiseWindow(dpy, m->sel->win);
-	if (m->lt[m->sellt]->arrange) {
-		wc.stack_mode = Below;
-		wc.sibling = m->barwin;
-		for (c = m->stack; c; c = c->snext)
-			if (!c->isfloating && ISVISIBLE(c)) {
-				XConfigureWindow(dpy, c->win, CWSibling|CWStackMode, &wc);
-				wc.sibling = c->win;
-			}
-	}
-	XSync(dpy, False);
-	while (XCheckMaskEvent(dpy, EnterWindowMask, &ev));
-}
-
-void
-run(void)
-{
-	XEvent ev;
-	/* main event loop */
-	XSync(dpy, False);
-	while (running && !XNextEvent(dpy, &ev))
-		if (handler[ev.type])
-			handler[ev.type](&ev); /* call handler */
-}
-
-void
-scan(void)
-{
-	unsigned int i, num;
-	Window d1, d2, *wins = NULL;
-	XWindowAttributes wa;
-
-	if (XQueryTree(dpy, root, &d1, &d2, &wins, &num)) {
-		for (i = 0; i < num; i++) {
-			if (!XGetWindowAttributes(dpy, wins[i], &wa)
-			|| wa.override_redirect || XGetTransientForHint(dpy, wins[i], &d1))
-				continue;
-			if (wa.map_state == IsViewable || getstate(wins[i]) == IconicState)
-				manage(wins[i], &wa);
-		}
-		for (i = 0; i < num; i++) { /* now the transients */
-			if (!XGetWindowAttributes(dpy, wins[i], &wa))
-				continue;
-			if (XGetTransientForHint(dpy, wins[i], &d1)
-			&& (wa.map_state == IsViewable || getstate(wins[i]) == IconicState))
-				manage(wins[i], &wa);
-		}
-		if (wins)
-			XFree(wins);
-	}
-}
-
-void
-sendmon(Client *c, Monitor *m)
-{
-	if (c->mon == m)
-		return;
-	unfocus(c, 1);
-	detach(c);
-	detachstack(c);
-	c->mon = m;
-	c->tags = m->tagset[m->seltags]; /* assign tags of target monitor */
-	attach(c);
-	attachstack(c);
-	focus(NULL);
-	arrange(NULL);
-}
-
-void
-setclientstate(Client *c, long state)
-{
-	long data[] = { state, None };
-
-	XChangeProperty(dpy, c->win, wmatom[WMState], wmatom[WMState], 32,
-			PropModeReplace, (unsigned char *)data, 2);
-}
-
-int
-sendevent(Client *c, Atom proto)
-{
-	int n;
-	Atom *protocols;
-	int exists = 0;
-	XEvent ev;
-
-	if (XGetWMProtocols(dpy, c->win, &protocols, &n)) {
-		while (!exists && n--)
-			exists = protocols[n] == proto;
-		XFree(protocols);
-	}
-	if (exists) {
-		ev.type = ClientMessage;
-		ev.xclient.window = c->win;
-		ev.xclient.message_type = wmatom[WMProtocols];
-		ev.xclient.format = 32;
-		ev.xclient.data.l[0] = proto;
-		ev.xclient.data.l[1] = CurrentTime;
-		XSendEvent(dpy, c->win, False, NoEventMask, &ev);
-	}
-	return exists;
-}
-
-void
-setfocus(Client *c)
-{
-	if (!c->neverfocus) {
-		XSetInputFocus(dpy, c->win, RevertToPointerRoot, CurrentTime);
-		XChangeProperty(dpy, root, netatom[NetActiveWindow],
-		                XA_WINDOW, 32, PropModeReplace,
-		                (unsigned char *) &(c->win), 1);
-	}
-	sendevent(c, wmatom[WMTakeFocus]);
-}
-
-void
-setfullscreen(Client *c, int fullscreen)
-{
-	if (fullscreen && !c->isfullscreen) {
-		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-		                PropModeReplace, (unsigned char*)&netatom[NetWMFullscreen], 1);
-		c->isfullscreen = 1;
-		c->oldstate = c->isfloating;
-		c->oldbw = c->bw;
-		c->bw = 0;
-		c->isfloating = 1;
-		resizeclient(c, c->mon->mx, c->mon->my, c->mon->mw, c->mon->mh);
-		XRaiseWindow(dpy, c->win);
-	} else if (!fullscreen && c->isfullscreen){
-		XChangeProperty(dpy, c->win, netatom[NetWMState], XA_ATOM, 32,
-		                PropModeReplace, (unsigned char*)0, 0);
-		c->isfullscreen = 0;
-		c->isfloating = c->oldstate;
-		c->bw = c->oldbw;
-		c->x = c->oldx;
-		c->y = c->oldy;
-		c->w = c->oldw;
-		c->h = c->oldh;
-		resizeclient(c, c->x, c->y, c->w, c->h);
-		arrange(c->mon);
-	}
-}
-
-void
-setlayout(const Arg *arg)
-{
-	if (!arg || !arg->v || arg->v != selmon->lt[selmon->sellt])
-		selmon->sellt ^= 1;
-	if (arg && arg->v)
-		selmon->lt[selmon->sellt] = (Layout *)arg->v;
-	strncpy(selmon->ltsymbol, selmon->lt[selmon->sellt]->symbol, sizeof selmon->ltsymbol);
-	if (selmon->sel)
-		arrange(selmon);
-	else
-		drawbar(selmon);
-}
-
-/* arg > 1.0 will set mfact absolutly */
-void
-setmfact(const Arg *arg)
-{
-	float f;
-
-	if (!arg || !selmon->lt[selmon->sellt]->arrange)
-		return;
-	f = arg->f < 1.0 ? arg->f + selmon->mfact : arg->f - 1.0;
-	if (f < 0.1 || f > 0.9)
-		return;
-	selmon->mfact = f;
-	arrange(selmon);
-}
-
-void
-setup(void)
-{
-	XSetWindowAttributes wa;
-
-	/* clean up any zombies immediately */
-	sigchld(0);
-
-	/* init screen */
-	screen = DefaultScreen(dpy);
-	sw = DisplayWidth(dpy, screen);
-	sh = DisplayHeight(dpy, screen);
-	root = RootWindow(dpy, screen);
-	drw = drw_create(dpy, screen, root, sw, sh);
-	drw_load_fonts(drw, fonts, LENGTH(fonts));
-	if (!drw->fontcount)
-		die("no fonts could be loaded.\n");
-    /* Here you change the dwm bar size */
-	bh = drw->fonts[0]->h + barsize;
-	updategeom();
-	/* init atoms */
-	wmatom[WMProtocols] = XInternAtom(dpy, "WM_PROTOCOLS", False);
-	wmatom[WMDelete] = XInternAtom(dpy, "WM_DELETE_WINDOW", False);
-	wmatom[WMState] = XInternAtom(dpy, "WM_STATE", False);
-	wmatom[WMTakeFocus] = XInternAtom(dpy, "WM_TAKE_FOCUS", False);
-	netatom[NetActiveWindow] = XInternAtom(dpy, "_NET_ACTIVE_WINDOW", False);
-	netatom[NetSupported] = XInternAtom(dpy, "_NET_SUPPORTED", False);
-	netatom[NetWMName] = XInternAtom(dpy, "_NET_WM_NAME", False);
-	netatom[NetWMState] = XInternAtom(dpy, "_NET_WM_STATE", False);
-	netatom[NetWMFullscreen] = XInternAtom(dpy, "_NET_WM_STATE_FULLSCREEN", False);
-	netatom[NetWMWindowType] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE", False);
-	netatom[NetWMWindowTypeDialog] = XInternAtom(dpy, "_NET_WM_WINDOW_TYPE_DIALOG", False);
-	netatom[NetClientList] = XInternAtom(dpy, "_NET_CLIENT_LIST", False);
-	/* init cursors */
-	cursor[CurNormal] = drw_cur_create(drw, XC_left_ptr);
-	cursor[CurResize] = drw_cur_create(drw, XC_sizing);
-	cursor[CurMove] = drw_cur_create(drw, XC_fleur);
-	/* init appearance */
-	for(int i = 0; i < NUMCOLORS; i++){
-		scheme[i].border = drw_clr_create(drw, colors[i][0]);
-		scheme[i].fg = drw_clr_create(drw, colors[i][1]);
-		scheme[i].bg = drw_clr_create(drw, colors[i][2]);
-	}
-
-	/* init bars */
-	updatebars();
-	updatestatus();
-	/* EWMH support per view */
-	XChangeProperty(dpy, root, netatom[NetSupported], XA_ATOM, 32,
-			PropModeReplace, (unsigned char *) netatom, NetLast);
-	XDeleteProperty(dpy, root, netatom[NetClientList]);
-	/* select for events */
-	wa.cursor = cursor[CurNormal]->cursor;
-	wa.event_mask = SubstructureRedirectMask|SubstructureNotifyMask|ButtonPressMask|PointerMotionMask
-	                |EnterWindowMask|LeaveWindowMask|StructureNotifyMask|PropertyChangeMask;
-	XChangeWindowAttributes(dpy, root, CWEventMask|CWCursor, &wa);
-	XSelectInput(dpy, root, wa.event_mask);
-	grabkeys();
-	focus(NULL);
-}
-
-void
-showhide(Client *c)
-{
-	if (!c)
-		return;
-	if (ISVISIBLE(c)) {
-		/* show clients top down */
-		XMoveWindow(dpy, c->win, c->x, c->y);
-		if ((!c->mon->lt[c->mon->sellt]->arrange || c->isfloating) && !c->isfullscreen)
-			resize(c, c->x, c->y, c->w, c->h, 0);
-		showhide(c->snext);
-	} else {
-		/* hide clients bottom up */
-		showhide(c->snext);
-		XMoveWindow(dpy, c->win, WIDTH(c) * -2, c->y);
-	}
-}
-
-void
-sigchld(int unused)
-{
-	if (signal(SIGCHLD, sigchld) == SIG_ERR)
-		die("can't install SIGCHLD handler:");
-	while (0 < waitpid(-1, NULL, WNOHANG));
-}
-
-void
-spawn(const Arg *arg)
-{
-	if (arg->v == dmenucmd)
-		dmenumon[0] = '0' + selmon->num;
-	if (fork() == 0) {
-		if (dpy)
-			close(ConnectionNumber(dpy));
-		setsid();
-		execvp(((char **)arg->v)[0], (char **)arg->v);
-		fprintf(stderr, "dwm: execvp %s", ((char **)arg->v)[0]);
-		perror(" failed");
-		exit(EXIT_SUCCESS);
-	}
-}
-
-void
-tag(const Arg *arg)
-{
-	if (selmon->sel && arg->ui & TAGMASK) {
-		selmon->sel->tags = arg->ui & TAGMASK;
-		focus(NULL);
-		arrange(selmon);
-	}
-}
-
-void
-tagmon(const Arg *arg)
-{
-	if (!selmon->sel || !mons->next)
-		return;
-	sendmon(selmon->sel, dirtomon(arg->i));
-}
-
-void
-tile(Monitor *m)
-{
-	unsigned int i, n, h, mw, my, ty, ns;
-	Client *c;
-
-	for (n = 0, c = nexttiled(m->clients); c; c = nexttiled(c->next), n++);
-	if (n == 0)
-		return;
-
-	if (n > m->nmaster) {
-		mw = m->nmaster ? m->ww * m->mfact : 0;
-        ns = m->nmaster > 0 ? 2 : 1;
-    } else {
-		mw = m->ww;
-        ns = 1;
-    }
-    for(i = 0, my = ty = gappx, c = nexttiled(m->clients); c; c = nexttiled(c->next), i++)
-		if (i < m->nmaster) {
-            h = (m->wh - my) / (MIN(n, m->nmaster) - i) - gappx;
-			resize(c, m->wx + gappx, m->wy + my, mw - (2*c->bw) - gappx*(5-ns)/2, h - (2*c->bw), False);
-			my += HEIGHT(c) + gappx;
-		} else {
-            h = (m->wh - ty) / (n - i) - gappx;
-			resize(c, m->wx + mw + gappx/ns, m->wy + ty, m->ww - mw - (2*c->bw) - gappx*(5-ns)/2, h - (2*c->bw), False);
-			ty += HEIGHT(c) + gappx;
-		}
-}
-
-void
-togglebar(const Arg *arg)
-{
-	selmon->showbar = !selmon->showbar;
-	updatebarpos(selmon);
-	XMoveResizeWindow(dpy, selmon->barwin, selmon->wx, selmon->by, selmon->ww, bh);
-	arrange(selmon);
-}
-
-void
-togglefloating(const Arg *arg)
-{
-	if (!selmon->sel)
-		return;
-	if (selmon->sel->isfullscreen) /* no support for fullscreen windows */
-		return;
-	selmon->sel->isfloating = !selmon->sel->isfloating || selmon->sel->isfixed;
-	if (selmon->sel->isfloating)
-		resize(selmon->sel, selmon->sel->x, selmon->sel->y,
-		       selmon->sel->w, selmon->sel->h, 0);
-	arrange(selmon);
-}
-
-void
-toggletag(const Arg *arg)
-{
-	unsigned int newtags;
-
-	if (!selmon->sel)
-		return;
-	newtags = selmon->sel->tags ^ (arg->ui & TAGMASK);
-	if (newtags) {
-		selmon->sel->tags = newtags;
-		focus(NULL);
-		arrange(selmon);
-	}
-}
-
-void
-toggleview(const Arg *arg)
-{
-	unsigned int newtagset = selmon->tagset[selmon->seltags] ^ (arg->ui & TAGMASK);
-
-	if (newtagset) {
-		selmon->tagset[selmon->seltags] = newtagset;
-		focus(NULL);
-		arrange(selmon);
-	}
-}
-
-void
-unfocus(Client *c, int setfocus)
-{
-	if (!c)
-		return;
-	grabbuttons(c, 0);
-	XSetWindowBorder(dpy, c->win, scheme[0].border->pix);
-	if (setfocus) {
-		XSetInputFocus(dpy, root, RevertToPointerRoot, CurrentTime);
-		XDeleteProperty(dpy, root, netatom[NetActiveWindow]);
-	}
-}
-
-void
-unmanage(Client *c, int destroyed)
-{
-	Monitor *m = c->mon;
-	XWindowChanges wc;
-
-	/* The server grab construct avoids race conditions. */
-	detach(c);
-	detachstack(c);
-	if (!destroyed) {
-		wc.border_width = c->oldbw;
-		XGrabServer(dpy);
-		XSetErrorHandler(xerrordummy);
-		XConfigureWindow(dpy, c->win, CWBorderWidth, &wc); /* restore border */
-		XUngrabButton(dpy, AnyButton, AnyModifier, c->win);
-		setclientstate(c, WithdrawnState);
-		XSync(dpy, False);
-		XSetErrorHandler(xerror);
-		XUngrabServer(dpy);
-	}
-	free(c);
-	focus(NULL);
-	updateclientlist();
-	arrange(m);
-}
-
-void
-unmapnotify(XEvent *e)
-{
-	Client *c;
-	XUnmapEvent *ev = &e->xunmap;
-
-	if ((c = wintoclient(ev->window))) {
-		if (ev->send_event)
-			setclientstate(c, WithdrawnState);
-		else
-			unmanage(c, 0);
-	}
-}
-
-void
-updatebars(void)
-{
-	Monitor *m;
-	XSetWindowAttributes wa = {
-		.override_redirect = True,
-		.background_pixmap = ParentRelative,
-		.event_mask = ButtonPressMask|ExposureMask
-	};
-	for (m = mons; m; m = m->next) {
-		if (m->barwin)
-			continue;
-		m->barwin = XCreateWindow(dpy, root, m->wx, m->by, m->ww, bh, 0, DefaultDepth(dpy, screen),
-		                          CopyFromParent, DefaultVisual(dpy, screen),
-		                          CWOverrideRedirect|CWBackPixmap|CWEventMask, &wa);
-		XDefineCursor(dpy, m->barwin, cursor[CurNormal]->cursor);
-		XMapRaised(dpy, m->barwin);
-	}
-}
-
-void
-updatebarpos(Monitor *m)
-{
-	m->wy = m->my;
-	m->wh = m->mh;
-	if (m->showbar) {
-		m->wh -= bh;
-		m->by = m->topbar ? m->wy : m->wy + m->wh;
-		m->wy = m->topbar ? m->wy + bh : m->wy;
-	} else
-		m->by = -bh;
-}
-
-void
-updateclientlist()
-{
-	Client *c;
-	Monitor *m;
-
-	XDeleteProperty(dpy, root, netatom[NetClientList]);
-	for (m = mons; m; m = m->next)
-		for (c = m->clients; c; c = c->next)
-			XChangeProperty(dpy, root, netatom[NetClientList],
-			                XA_WINDOW, 32, PropModeAppend,
-			                (unsigned char *) &(c->win), 1);
-}
-
-int
-updategeom(void)
-{
-	int dirty = 0;
-
-#ifdef XINERAMA
-	if (XineramaIsActive(dpy)) {
-		int i, j, n, nn;
-		Client *c;
-		Monitor *m;
-		XineramaScreenInfo *info = XineramaQueryScreens(dpy, &nn);
-		XineramaScreenInfo *unique = NULL;
-
-		for (n = 0, m = mons; m; m = m->next, n++);
-		/* only consider unique geometries as separate screens */
-		unique = ecalloc(nn, sizeof(XineramaScreenInfo));
-		for (i = 0, j = 0; i < nn; i++)
-			if (isuniquegeom(unique, j, &info[i]))
-				memcpy(&unique[j++], &info[i], sizeof(XineramaScreenInfo));
-		XFree(info);
-		nn = j;
-		if (n <= nn) {
-			for (i = 0; i < (nn - n); i++) { /* new monitors available */
-				for (m = mons; m && m->next; m = m->next);
-				if (m)
-					m->next = createmon();
-				else
-					mons = createmon();
-			}
-			for (i = 0, m = mons; i < nn && m; m = m->next, i++)
-				if (i >= n
-				|| (unique[i].x_org != m->mx || unique[i].y_org != m->my
-				    || unique[i].width != m->mw || unique[i].height != m->mh))
-				{
-					dirty = 1;
-					m->num = i;
-					m->mx = m->wx = unique[i].x_org;
-					m->my = m->wy = unique[i].y_org;
-					m->mw = m->ww = unique[i].width;
-					m->mh = m->wh = unique[i].height;
-					updatebarpos(m);
-				}
-		} else {
-			/* less monitors available nn < n */
-			for (i = nn; i < n; i++) {
-				for (m = mons; m && m->next; m = m->next);
-				while (m->clients) {
-					dirty = 1;
-					c = m->clients;
-					m->clients = c->next;
-					detachstack(c);
-					c->mon = mons;
-					attach(c);
-					attachstack(c);
-				}
-				if (m == selmon)
-					selmon = mons;
-				cleanupmon(m);
-			}
-		}
-		free(unique);
-	} else
-#endif /* XINERAMA */
-	/* default monitor setup */
-	{
-		if (!mons)
-			mons = createmon();
-		if (mons->mw != sw || mons->mh != sh) {
-			dirty = 1;
-			mons->mw = mons->ww = sw;
-			mons->mh = mons->wh = sh;
-			updatebarpos(mons);
-		}
-	}
-	if (dirty) {
-		selmon = mons;
-		selmon = wintomon(root);
-	}
-	return dirty;
-}
-
-void
-updatenumlockmask(void)
-{
-	unsigned int i, j;
-	XModifierKeymap *modmap;
-
-	numlockmask = 0;
-	modmap = XGetModifierMapping(dpy);
-	for (i = 0; i < 8; i++)
-		for (j = 0; j < modmap->max_keypermod; j++)
-			if (modmap->modifiermap[i * modmap->max_keypermod + j]
-			   == XKeysymToKeycode(dpy, XK_Num_Lock))
-				numlockmask = (1 << i);
-	XFreeModifiermap(modmap);
-}
-
-void
-updatesizehints(Client *c)
-{
-	long msize;
-	XSizeHints size;
-
-	if (!XGetWMNormalHints(dpy, c->win, &size, &msize))
-		/* size is uninitialized, ensure that size.flags aren't used */
-		size.flags = PSize;
-	if (size.flags & PBaseSize) {
-		c->basew = size.base_width;
-		c->baseh = size.base_height;
-	} else if (size.flags & PMinSize) {
-		c->basew = size.min_width;
-		c->baseh = size.min_height;
-	} else
-		c->basew = c->baseh = 0;
-	if (size.flags & PResizeInc) {
-		c->incw = size.width_inc;
-		c->inch = size.height_inc;
-	} else
-		c->incw = c->inch = 0;
-	if (size.flags & PMaxSize) {
-		c->maxw = size.max_width;
-		c->maxh = size.max_height;
-	} else
-		c->maxw = c->maxh = 0;
-	if (size.flags & PMinSize) {
-		c->minw = size.min_width;
-		c->minh = size.min_height;
-	} else if (size.flags & PBaseSize) {
-		c->minw = size.base_width;
-		c->minh = size.base_height;
-	} else
-		c->minw = c->minh = 0;
-	if (size.flags & PAspect) {
-		c->mina = (float)size.min_aspect.y / size.min_aspect.x;
-		c->maxa = (float)size.max_aspect.x / size.max_aspect.y;
-	} else
-		c->maxa = c->mina = 0.0;
-	c->isfixed = (c->maxw && c->minw && c->maxh && c->minh
-	             && c->maxw == c->minw && c->maxh == c->minh);
-}
-
-void
-updatetitle(Client *c)
-{
-	if (!gettextprop(c->win, netatom[NetWMName], c->name, sizeof c->name))
-		gettextprop(c->win, XA_WM_NAME, c->name, sizeof c->name);
-	if (c->name[0] == '\0') /* hack to mark broken clients */
-		strcpy(c->name, broken);
-}
-
-void
-updatestatus(void)
-{
-	if (!gettextprop(root, XA_WM_NAME, stext, sizeof(stext)))
-		strcpy(stext, "dwm-"VERSION);
-	drawbar(selmon);
-}
-
-void
-updatewindowtype(Client *c)
-{
-	Atom state = getatomprop(c, netatom[NetWMState]);
-	Atom wtype = getatomprop(c, netatom[NetWMWindowType]);
-
-	if (state == netatom[NetWMFullscreen])
-		setfullscreen(c, 1);
-	if (wtype == netatom[NetWMWindowTypeDialog])
-		c->isfloating = 1;
-}
-
-void
-updatewmhints(Client *c)
-{
-	XWMHints *wmh;
-
-	if ((wmh = XGetWMHints(dpy, c->win))) {
-		if (c == selmon->sel && wmh->flags & XUrgencyHint) {
-			wmh->flags &= ~XUrgencyHint;
-			XSetWMHints(dpy, c->win, wmh);
-		} else
-			c->isurgent = (wmh->flags & XUrgencyHint) ? 1 : 0;
-		if (wmh->flags & InputHint)
-			c->neverfocus = !wmh->input;
-		else
-			c->neverfocus = 0;
-		XFree(wmh);
-	}
-}
-
-void
-view(const Arg *arg)
-{
-	if ((arg->ui & TAGMASK) == selmon->tagset[selmon->seltags])
-		return;
-	selmon->seltags ^= 1; /* toggle sel tagset */
-	if (arg->ui & TAGMASK)
-		selmon->tagset[selmon->seltags] = arg->ui & TAGMASK;
-	focus(NULL);
-	arrange(selmon);
-}
-
-Client *
-wintoclient(Window w)
-{
-	Client *c;
-	Monitor *m;
-
-	for (m = mons; m; m = m->next)
-		for (c = m->clients; c; c = c->next)
-			if (c->win == w)
-				return c;
-	return NULL;
-}
-
-Monitor *
-wintomon(Window w)
-{
-	int x, y;
-	Client *c;
-	Monitor *m;
-
-	if (w == root && getrootptr(&x, &y))
-		return recttomon(x, y, 1, 1);
-	for (m = mons; m; m = m->next)
-		if (w == m->barwin)
-			return m;
-	if ((c = wintoclient(w)))
-		return c->mon;
-	return selmon;
-}
-
-/* There's no way to check accesses to destroyed windows, thus those cases are
- * ignored (especially on UnmapNotify's).  Other types of errors call Xlibs
- * default error handler, which may call exit.  */
-int
-xerror(Display *dpy, XErrorEvent *ee)
-{
-	if (ee->error_code == BadWindow
-	|| (ee->request_code == X_SetInputFocus && ee->error_code == BadMatch)
-	|| (ee->request_code == X_PolyText8 && ee->error_code == BadDrawable)
-	|| (ee->request_code == X_PolyFillRectangle && ee->error_code == BadDrawable)
-	|| (ee->request_code == X_PolySegment && ee->error_code == BadDrawable)
-	|| (ee->request_code == X_ConfigureWindow && ee->error_code == BadMatch)
-	|| (ee->request_code == X_GrabButton && ee->error_code == BadAccess)
-	|| (ee->request_code == X_GrabKey && ee->error_code == BadAccess)
-	|| (ee->request_code == X_CopyArea && ee->error_code == BadDrawable))
-		return 0;
-	fprintf(stderr, "dwm: fatal error: request code=%d, error code=%d\n",
-			ee->request_code, ee->error_code);
-	return xerrorxlib(dpy, ee); /* may call exit */
-}
-
-int
-xerrordummy(Display *dpy, XErrorEvent *ee)
-{
-	return 0;
-}
-
-/* Startup Error handler to check if another window manager
- * is already running. */
-int
-xerrorstart(Display *dpy, XErrorEvent *ee)
-{
-	die("dwm: another window manager is already running\n");
-	return -1;
-}
-
-void
-zoom(const Arg *arg)
-{
-	Client *c = selmon->sel;
-
-	if (!selmon->lt[selmon->sellt]->arrange
-	|| (selmon->sel && selmon->sel->isfloating))
-		return;
-	if (c == nexttiled(selmon->clients))
-		if (!c || !(c = nexttiled(c->next)))
-			return;
-	pop(c);
-}
-
-int
-main(int argc, char *argv[])
-{
-	if (argc == 2 && !strcmp("-v", argv[1]))
-		die("dwm-"VERSION "\n");
-	else if (argc != 1)
-		die("usage: dwm [-v]\n");
-	if (!setlocale(LC_CTYPE, "") || !XSupportsLocale())
-		fputs("warning: no locale support\n", stderr);
-	if (!(dpy = XOpenDisplay(NULL)))
-		die("dwm: cannot open display\n");
-	checkotherwm();
-	setup();
-	scan();
-	run();
-	cleanup();
-	XCloseDisplay(dpy);
-	return EXIT_SUCCESS;
-}
diff --git a/suckless/dwm-6.1/dwm.c.rej b/suckless/dwm-6.1/dwm.c.rej
deleted file mode 100644
index 21cdf3c..0000000
--- a/suckless/dwm-6.1/dwm.c.rej
+++ /dev/null
@@ -1,18 +0,0 @@
---- dwm.c
-+++ dwm.c
-@@ -723,11 +729,14 @@ drawbar(Monitor *m)
- 	}
- 	x = 0;
- 	for (i = 0; i < LENGTH(tags); i++) {
-+		/* do not draw vacant tags */
-+		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+			continue;
- 		w = TEXTW(tags[i]);
- 		drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
- 		drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
- 		drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
--		           occ & 1 << i, urg & 1 << i);
-+		           0, urg & 1 << i);
- 		x += w;
- 	}
- 	w = blw = TEXTW(m->ltsymbol);
diff --git a/suckless/dwm-6.1/dwm.o b/suckless/dwm-6.1/dwm.o
deleted file mode 100644
index 4a4c191..0000000
Binary files a/suckless/dwm-6.1/dwm.o and /dev/null differ
diff --git a/suckless/dwm-6.1/dwm.png b/suckless/dwm-6.1/dwm.png
deleted file mode 100644
index b1f9ba7..0000000
Binary files a/suckless/dwm-6.1/dwm.png and /dev/null differ
diff --git a/suckless/dwm-6.1/patches/hide.diff b/suckless/dwm-6.1/patches/hide.diff
deleted file mode 100644
index a0441a8..0000000
--- a/suckless/dwm-6.1/patches/hide.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/dwm.c b/dwm.c
-index 0362114..0da6e27 100644
---- a/dwm.c
-+++ b/dwm.c
-@@ -430,9 +430,15 @@ buttonpress(XEvent *e)
- 	}
- 	if (ev->window == selmon->barwin) {
- 		i = x = 0;
--		do
-+		unsigned int occ = 0;
-+		for(c = m->clients; c; c = c->next)
-+			occ |= c->tags;
-+		do {
-+			/* do not reserve space for vacant tags */
-+			if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+				continue;
- 			x += TEXTW(tags[i]);
--		while (ev->x >= x && ++i < LENGTH(tags));
-+		} while (ev->x >= x && ++i < LENGTH(tags));
- 		if (i < LENGTH(tags)) {
- 			click = ClkTagBar;
- 			arg.ui = 1 << i;
-@@ -717,11 +723,14 @@ drawbar(Monitor *m)
- 	}
- 	x = 0;
- 	for (i = 0; i < LENGTH(tags); i++) {
-+		/* do not draw vacant tags */
-+		if(!(occ & 1 << i || m->tagset[m->seltags] & 1 << i))
-+			continue;
- 		w = TEXTW(tags[i]);
- 		drw_setscheme(drw, m->tagset[m->seltags] & 1 << i ? &scheme[SchemeSel] : &scheme[SchemeNorm]);
- 		drw_text(drw, x, 0, w, bh, tags[i], urg & 1 << i);
- 		drw_rect(drw, x + 1, 1, dx, dx, m == selmon && selmon->sel && selmon->sel->tags & 1 << i,
--		           occ & 1 << i, urg & 1 << i);
-+		           0, urg & 1 << i);
- 		x += w;
- 	}
- 	w = blw = TEXTW(m->ltsymbol);
-
diff --git a/suckless/dwm-6.1/patches/moveresize.c b/suckless/dwm-6.1/patches/moveresize.c
deleted file mode 100644
index 061dd65..0000000
--- a/suckless/dwm-6.1/patches/moveresize.c
+++ /dev/null
@@ -1,64 +0,0 @@
-void
-moveresize(const Arg *arg) {
-	/* only floating windows can be moved */
-	Client *c;
-	c = selmon->sel;
-	int x, y, w, h, nx, ny, nw, nh, ox, oy, ow, oh;
-	char xAbs, yAbs, wAbs, hAbs;
-	int msx, msy, dx, dy, nmx, nmy;
-	unsigned int dui;
-	Window dummy;
-
-	if (!c || !arg)
-		return;
-	if (selmon->lt[selmon->sellt]->arrange && !c->isfloating)
-		return;
-	if(sscanf((char *)arg->v, "%d%c %d%c %d%c %d%c", &x, &xAbs, &y, &yAbs, &w, &wAbs, &h, &hAbs) != 8)
-		return;
-	/* compute new window position; prevent window from be positioned outside the current monitor */
-	nw = c->w + w;
-	if(wAbs == 'W')
-		nw = w < selmon->mw - 2 * c->bw ? w : selmon->mw - 2 * c->bw;
-
-	nh = c->h + h;
-	if(hAbs == 'H')
-		nh = h < selmon->mh - 2 * c->bw ? h : selmon->mh - 2 * c->bw;
-
-	nx = c->x + x;
-	if(xAbs == 'X') {
-		if(x < selmon->mx)
-			nx = selmon->mx;
-		else if(x > selmon->mx + selmon->mw)
-			nx = selmon->mx + selmon->mw - nw - 2 * c->bw;
-		else
-			nx = x;
-	}
-
-	ny = c->y + y;
-	if(yAbs == 'Y') {
-		if(y < selmon->my)
-			ny = selmon->my;
-		else if(y > selmon->my + selmon->mh)
-			ny = selmon->my + selmon->mh - nh - 2 * c->bw;
-		else
-			ny = y;
-	}
-
-	ox = c->x;
-	oy = c->y;
-	ow = c->w;
-	oh = c->h;
-
-	XRaiseWindow(dpy, c->win);
-	Bool xqp = XQueryPointer(dpy, root, &dummy, &dummy, &msx, &msy, &dx, &dy, &dui);
-	resize(c, nx, ny, nw, nh, True);
-
-	/* move cursor along with the window to avoid problems caused by the sloppy focus */
-	if (xqp && ox <= msx && (ox + ow) >= msx && oy <= msy && (oy + oh) >= msy)
-	{
-		nmx = c->x - ox + c->w - ow;
-		nmy = c->y - oy + c->h - oh;
-		XWarpPointer(dpy, None, None, 0, 0, 0, 0, nmx, nmy);
-	}
-}
-
diff --git a/suckless/dwm-6.1/patches/push.c b/suckless/dwm-6.1/patches/push.c
deleted file mode 100644
index 493613c..0000000
--- a/suckless/dwm-6.1/patches/push.c
+++ /dev/null
@@ -1,58 +0,0 @@
-static Client *
-prevtiled(Client *c) {
-	Client *p, *r;
-
-	for(p = selmon->clients, r = NULL; p && p != c; p = p->next)
-		if(!p->isfloating && ISVISIBLE(p))
-			r = p;
-	return r;
-}
-
-static void
-pushup(const Arg *arg) {
-	Client *sel = selmon->sel;
-	Client *c;
-
-	if(!sel || sel->isfloating)
-		return;
-	if((c = prevtiled(sel))) {
-		/* attach before c */
-		detach(sel);
-		sel->next = c;
-		if(selmon->clients == c)
-			selmon->clients = sel;
-		else {
-			for(c = selmon->clients; c->next != sel->next; c = c->next);
-			c->next = sel;
-		}
-	} else {
-		/* move to the end */
-		for(c = sel; c->next; c = c->next);
-		detach(sel);
-		sel->next = NULL;
-		c->next = sel;
-	}
-	focus(sel);
-	arrange(selmon);
-}
-
-static void
-pushdown(const Arg *arg) {
-	Client *sel = selmon->sel;
-	Client *c;
-
-	if(!sel || sel->isfloating)
-		return;
-	if((c = nexttiled(sel->next))) {
-		/* attach after c */
-		detach(sel);
-		sel->next = c->next;
-		c->next = sel;
-	} else {
-		/* move to the front */
-		detach(sel);
-		attach(sel);
-	}
-	focus(sel);
-	arrange(selmon);
-}
diff --git a/suckless/dwm-6.1/transient.c b/suckless/dwm-6.1/transient.c
deleted file mode 100644
index 040adb5..0000000
--- a/suckless/dwm-6.1/transient.c
+++ /dev/null
@@ -1,42 +0,0 @@
-/* cc transient.c -o transient -lX11 */
-
-#include <stdlib.h>
-#include <unistd.h>
-#include <X11/Xlib.h>
-#include <X11/Xutil.h>
-
-int main(void) {
-	Display *d;
-	Window r, f, t = None;
-	XSizeHints h;
-	XEvent e;
-
-	d = XOpenDisplay(NULL);
-	if (!d)
-		exit(1);
-	r = DefaultRootWindow(d);
-
-	f = XCreateSimpleWindow(d, r, 100, 100, 400, 400, 0, 0, 0);
-	h.min_width = h.max_width = h.min_height = h.max_height = 400;
-	h.flags = PMinSize | PMaxSize;
-	XSetWMNormalHints(d, f, &h);
-	XStoreName(d, f, "floating");
-	XMapWindow(d, f);
-
-	XSelectInput(d, f, ExposureMask);
-	while (1) {
-		XNextEvent(d, &e);
-
-		if (t == None) {
-			sleep(5);
-			t = XCreateSimpleWindow(d, r, 50, 50, 100, 100, 0, 0, 0);
-			XSetTransientForHint(d, t, f);
-			XStoreName(d, t, "transient");
-			XMapWindow(d, t);
-			XSelectInput(d, t, ExposureMask);
-		}
-	}
-
-	XCloseDisplay(d);
-	exit(0);
-}
diff --git a/suckless/dwm-6.1/util.c b/suckless/dwm-6.1/util.c
deleted file mode 100644
index 6b703e9..0000000
--- a/suckless/dwm-6.1/util.c
+++ /dev/null
@@ -1,33 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-#include <stdarg.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-
-#include "util.h"
-
-void *
-ecalloc(size_t nmemb, size_t size)
-{
-	void *p;
-
-	if (!(p = calloc(nmemb, size)))
-		perror(NULL);
-	return p;
-}
-
-void
-die(const char *fmt, ...) {
-	va_list ap;
-
-	va_start(ap, fmt);
-	vfprintf(stderr, fmt, ap);
-	va_end(ap);
-
-	if (fmt[0] && fmt[strlen(fmt)-1] == ':') {
-		fputc(' ', stderr);
-		perror(NULL);
-	}
-
-	exit(1);
-}
diff --git a/suckless/dwm-6.1/util.h b/suckless/dwm-6.1/util.h
deleted file mode 100644
index cded043..0000000
--- a/suckless/dwm-6.1/util.h
+++ /dev/null
@@ -1,8 +0,0 @@
-/* See LICENSE file for copyright and license details. */
-
-#define MAX(A, B)               ((A) > (B) ? (A) : (B))
-#define MIN(A, B)               ((A) < (B) ? (A) : (B))
-#define BETWEEN(X, A, B)        ((A) <= (X) && (X) <= (B))
-
-void die(const char *errstr, ...);
-void *ecalloc(size_t, size_t);
diff --git a/suckless/dwm-6.1/util.o b/suckless/dwm-6.1/util.o
deleted file mode 100644
index 17f90d6..0000000
Binary files a/suckless/dwm-6.1/util.o and /dev/null differ