dotfiles

commit d57c71cce3aa8ff5e10f9856382f349f02a5b898
parent 81f7f44461aa834461f226f9bcfe8486731dd2cf
Author: pyratebeard <root@pyratebeard.net>
Date:   Sat, 15 Jul 2017 00:23:48 +0100

fixed merge issues

Diffstat:
M
awesome/.config/awesome/themes/boneyard/theme.lua
 | 
2
+-
A
bin/bin/colorbars
 | 
38
++++++++++++++++++++++++++++++++++++++
A
bin/bin/colorscheme
 | 
27
+++++++++++++++++++++++++++
A
bin/bin/emote
 | 
125
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
bin/bin/food
 | 
337
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
bin/bin/ghosts
 | 
32
++++++++++++++++++++++++++++++++
A
bin/bin/pipes
 | 
123
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
bin/bin/pipesx
 | 
194
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
A
bin/bin/sysinfo
 | 
115
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
R
tmux/bin/tmux-status -> bin/bin/tmux-status
 | 
0

R
tmux/bin/tmuxinator -> bin/bin/tmuxinator
 | 
0

M
qutebrowser/.config/qutebrowser/qutebrowser.conf
 | 
1217
++++++++++++++++++++++++++++++++++++++++++++++---------------------------------
M
urxvt/.Xdefaults
 | 
2
+-
D
zsh/.zsh/custom-prompt.zsh
 | 
40
----------------------------------------
D
zsh/.zsh/dual-line-prompt._zsh
 | 
19
-------------------
D
zsh/.zsh/minimal-prompt.zsh
 | 
15
---------------
D
zsh/.zsh/ninja-prompt._zsh
 | 
22
----------------------
A
zsh/.zsh/prompt.zsh
 | 
94
+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++

18 files changed, 1804 insertions(+), 598 deletions(-)
diff --git a/awesome/.config/awesome/themes/boneyard/theme.lua b/awesome/.config/awesome/themes/boneyard/theme.lua
@@ -47,7 +47,7 @@ else
 end
 --}}}
 
-theme.font          = "tamsyn 10"
+theme.font          = "tamzen 9"
 
 theme.bg_normal     = "#121212"
 theme.bg_focus      = "#212121"
diff --git a/bin/bin/colorbars b/bin/bin/colorbars
@@ -0,0 +1,38 @@
+#!/bin/sh
+#
+# colorbars - smpte color bars in sh
+# http://git.io/colorbars 
+
+echo
+
+for y in $(seq 0 13); do
+  printf %s '           '
+  for color in 7 3 6 2 5 1 4; do
+    tput setab ${color}
+    printf %s '        '
+  done
+  tput sgr0
+  echo
+done
+
+for y in 0 1; do
+  printf %s '           '
+  for color in 4 0 5 0 6 0 7; do
+    tput setab ${color}
+    printf %s '        '
+  done
+  tput sgr0
+  echo
+done
+
+for y in $(seq 0 4); do
+  printf %s '           '
+  for color in 4 4 4 4 4 7 7 7 7 7 5 5 5 5 5 0 0 0 0 0 0 0 0 0 0 0 0 0; do
+    tput setab ${color}
+    printf %s '  '
+  done
+  tput sgr0
+  echo
+done
+
+echo
diff --git a/bin/bin/colorscheme b/bin/bin/colorscheme
@@ -0,0 +1,27 @@
+#!/bin/bash
+#
+#   This file echoes a bunch of color codes to the 
+#   terminal to demonstrate what's available.  Each 
+#   line is the color code of one forground color,
+#   out of 17 (default + 16 escapes), followed by a 
+#   test use of that color on all nine background 
+#   colors (default + 8 escapes).
+#
+
+T='niX'   # The test text
+
+echo -e "\n                 40m     41m     42m     43m\
+     44m     45m     46m     47m";
+
+for FGs in '    m' '   1m' '  30m' '1;30m' '  31m' '1;31m' '  32m' \
+           '1;32m' '  33m' '1;33m' '  34m' '1;34m' '  35m' '1;35m' \
+           '  36m' '1;36m' '  37m' '1;37m';
+  do FG=${FGs// /}
+  echo -en " $FGs \033[$FG  $T  "
+  for BG in 40m 41m 42m 43m 44m 45m 46m 47m;
+    do echo -en "$EINS \033[$FG\033[$BG  $T  \033[0m";
+  done
+  echo;
+done
+echo
+
diff --git a/bin/bin/emote b/bin/bin/emote
@@ -0,0 +1,125 @@
+#!/bin/sh
+#
+# created from https://redd.it/2skqh9
+# in case kori REALLY registered the "emote" name... DID YOU DO THAT ?
+# emoth - 2015 (c) wtfpl z3bra.org
+
+usage() {
+    echo "$(basename $0) <name>"
+    exit 1
+}
+
+case $1 in
+    shrug)
+      printf "┐('-')┌"
+    ;;
+    shrug2)
+      printf "┐('~'; )┌"
+    ;;
+    rage)
+      printf "(╯°□°)╯︵ ┻━┻"
+    ;;
+    bear)
+      printf "ʕ •ᴥ•ʔ"
+    ;;
+    dissaprove)
+      printf "(ಠ_ಠ)"
+    ;;
+    thatguy)
+      printf "(¬_¬)"
+    ;;
+    lenny)
+      printf "( ͡° ͜ʖ ͡°)"
+    ;;
+    satan)
+      printf "ψ(｀∇´)ψ"
+    ;;
+    yuno)
+      printf "ლ(ಠ益ಠლ)"
+    ;;
+    whistle)
+      printf "♪(´ε｀ )"
+    ;;
+    dance)
+      printf "~(^3^)~"
+    ;;
+    party)
+      printf "└[∵]┐└[∵]┘┌[∵]┘└[∵]┐└[∵]┘┌[∵]┘"
+    ;;
+    stare)
+      printf "( ´_⊃｀)"
+    ;;
+    kiss)
+      printf "( ˘ ³˘)♥"
+    ;;
+    shades)
+      printf "(•_•) ( •_•)>⌐■-■ (⌐■_■)"
+    ;;
+    magic)
+      printf "(∩｀-´)⊃━☆ﾟ.*･｡ﾟ"
+    ;;
+    magic2)
+      printf "▒▒▓█▇▅▂∩( ✧Д✧)∩▂▅▇█▓▒▒"
+    ;;
+    shame)
+      printf "(◞‸◟；)"
+    ;;
+    fu)
+      printf "┌∩┐(◣_◢)┌∩┐"
+    ;;
+    mad)
+      printf "(⇀‸↼‶)"
+    ;;
+    flex)
+      printf "ᕙ(⇀‸↼‶)ᕗ"
+    ;;     
+    trip)
+      printf "｡.*:・’ﾟ:。'(((＋_＋)))｡.*:ﾟ･’ﾟﾟ:。’･ﾟ"
+    ;;
+    drown)
+      printf "︵‿︵‿︵‿︵‿︵‿︵‿︵‿ヽ(゜□゜ )ノ︵‿︵‿︵‿︵‿︵‿"
+    ;;
+    squid)
+      printf "<コ:彡"
+    ;;
+    walrus)
+      printf "(:3 っ)っ"
+    ;;
+    fish)
+      printf "<º)))><"
+    ;;
+    psp)
+      printf "(+[__]∙:∙)"
+    ;;
+    nes)
+      printf "[+=••]"
+    ;;     
+    sad)
+      printf "(╥﹏╥)"
+    ;;
+    cry)
+      printf "(　-̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥᷄◞ω◟-̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥̥᷅ )"
+    ;;
+    lol)
+      printf "┐(^0^)┌"
+    ;;
+    smoke)
+      printf "(_̅_̅_̅_̅_̅м̅a̅я̅i̅j̅u̅a̅n̅a̅_̅_̅_̅ () ด้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็้้้้้้้้็็็็็้้้้้็็็็็"
+    ;;
+    loot)
+      printf "[̲̅$̲̅(̲̅ ͡° ͜ʖ ͡°̲̅)̲̅$̲̅]"
+    ;;
+    infinitesadness)
+      printf "Ỏ̷͖͈̞̩͎̻̫̫̜͉̠̫͕̭̭̫̫̹̗̹͈̼̠̖͍͚̥͈̮̼͕̠̤̯̻̥̬̗̼̳̤̳̬̪̹͚̞̼̠͕̼̠̦͚̫͔̯̹͉͉̘͎͕̼̣̝͙̱̟̹̩̟̳̦̭͉̮̖̭̣̣̞̙̗̜̺̭̻̥͚͙̝̦̲̱͉͖͉̰̦͎̫̣̼͎͍̠̮͓̹̹͉̤̰̗̙͕͇͔̱͕̭͈̳̗̭͔̘̖̺̮̜̠͖̘͓̳͕̟̠̱̫̤͓͔̘̰̲͙͍͇̙͎̣̼̗̖͙̯͉̠̟͈͍͕̪͓̝̩̦̖̹̼̠̘̮͚̟͉̺̜͍͓̯̳̱̻͕̣̳͉̻̭̭̱͍̪̩̭̺͕̺̼̥̪͖̦̟͎̻̰_Ỏ̷͖͈̞̩͎̻̫̫̜͉̠̫͕̭̭̫̫̹̗̹͈̼̠̖͍͚̥͈̮̼͕̠̤̯̻̥̬̗̼̳̤̳̬̪̹͚̞̼̠͕̼̠̦͚̫͔̯̹͉͉̘͎͕̼̣̝͙̱̟̹̩̟̳̦̭͉̮̖̭̣̣̞̙̗̜̺̭̻̥͚͙̝̦̲̱͉͖͉̰̦͎̫̣̼͎͍̠̮͓̹̹͉̤̰̗̙͕͇͔̱͕̭͈̳̗̭͔̘̖̺̮̜̠͖̘͓̳͕̟̠̱̫̤͓͔̘̰̲͙͍͇̙͎̣̼̗̖͙̯͉̠̟͈͍͕̪͓̝̩̦̖̹̼̠̘̮͚̟͉̺̜͍͓̯̳̱̻͕̣̳͉̻̭̭̱͍̪̩̭̺͕̺̼̥̪͖̦̟͎̻̰"
+    ;;
+    shit)
+      printf "▄█▀ █▬█ █ ▀█▀"
+    ;;
+    iotek)
+      printf "⇌"
+    ;;
+    # add more as you please
+    *)
+      usage
+    ;;
+esac
diff --git a/bin/bin/food b/bin/bin/food
@@ -0,0 +1,337 @@
+#!/bin/sh
+# food: {ascii/ansi} art food in your terminal
+#
+#    ████                        ██
+#   ░██░                        ░██
+#  ██████  ██████   ██████      ░██
+# ░░░██░  ██░░░░██ ██░░░░██  ██████
+#   ░██  ░██   ░██░██   ░██ ██░░░██
+#   ░██  ░██   ░██░██   ░██░██  ░██
+#   ░██  ░░██████ ░░██████ ░░██████
+#   ░░    ░░░░░░   ░░░░░░   ░░░░░░
+#
+#  ▓▓▓▓▓▓▓▓▓▓
+# ░▓ author ▓ xero <x@xero.nu>
+# ░▓ code   ▓ http://code.xero.nu/dotfiles
+# ░▓ mirror ▓ http://git.io/.files
+# ░▓▓▓▓▓▓▓▓▓▓
+# ░░░░░░░░░░
+
+usage() {
+printf "usage: `basename $0` \n\
+   [--burger burger]       curl -L git.io/burger\n\
+   [--coffee coffee]       curl -L git.io/coffee\n\
+   [--hotcoffee hotcoffee] curl -Ls git.io/hotcoffee | sh\n\
+   [--pancakes pancakes]   curl -L git.io/pancakes\n\
+   [--pizza pizza]         curl -L git.io/pizzza\n\
+   [--pizza2 pizza2]       curl -L git.io/pizzza\n\
+   [--poptart poptart]     curl -L git.io/poptart\n\
+   [--rice rice]           curl -L git.io/rice\n\
+   [--vburger vburger]     curl -L git.io/vburger\n\
+   [--waffles waffles]     curl -L git.io/waffles\n\
+   [--help help]\n"
+}
+
+taco() {
+cat << TACO
+                                  
+             ▄▄▄▄ ▄▄ ▄▄▄▄▄▄      
+         ▄▄▄▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄      
+      ▄▄▄▄ ▄ ▄▄▄▄▄ ▄ ▄ ▄   ▄▄▄   
+   ▄▄▄▄▄  ▄▄▄▄▄   ▄   ▄   ▄ ▄▄▄  
+   ▀▄▄▄▄▄▄▄▄▄    ▄  ▄  ▄   ▄     
+  ▄▄▄ ▄ ▄▄   ▄  ▄ ▄   ▄  ▄  ▄▄   
+   ▄▄▄▄▄▄  ▄    ▄   ▄  ▄▄▄▄▄     
+▄▄▄▄▄▄▄▄▄     ▄▄ ▄  ▄▄▄▄ ▄▄▄▄ ▄  
+  ▄▄ ▄▄▄   ▄▄   ▄▄▄▄ ▄▄▄▄ ▄▄▀▀   
+ ▀▄ ▄  ▄    ▄▄▄▄ ▄▄▄▄ ▄▄▀▀       
+   ▄▄  ▄▄▄▄▄ ▄▄▄▄ ▄▄▀▀           
+   ▄▄▄▄ ▄▄▄▄▄ ▄▄▀▀               
+  ▀▀▀▄▄▄▄▄▄▀▀▀                   
+                                 
+TACO
+}
+
+pizza() {
+cat << PIZZA
+             ▄▄▀▀▀▀▀▄              
+          ▄▄▀ ▀▀▀▀▀▀▀              
+       ▄▀▀   ▀▀▀▀▀▀▀▀ ▀▄           
+    ▄▀▀▀  ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄          
+ ▄▀▀ ▀▀ ▀▀▀▀▀  ▀▀▀▀ ▀▀▀▀▀▄         
+  ▀▀▀▀▀ ▀ ▀▀▀▀▀▀▀  ▀▀ ▀▀▀▀         
+  ▀▀ ▀▀▀ ▀▀▀▀▀▀▀▀  ▀▀▀  ▀▀         
+ ▀▀▀▀   ▀▀ ▀▀▀   ▀▀▀▀▀   ▀ ▀▀▄     
+   ▀▀▀▀▀▀▀▀ ▀▀ ▀▀  ▀    ▀▀ ▀▀▀▀▄   
+         ▀▀▀▀ ▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀      
+           ▀▀▀▀▀    ▀▀▀▀▀  ▀▀▀▀▀▀▄ 
+                  ▀▀   ▀▀▀▀▀▀▀▀▀▀▀▄
+                ▀▀▄ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀ 
+                     ▀▀   ▀▀▀▀▀▀▀▀▀
+                ▀▀                 
+                     ▄▀▀           
+                                   
+                      ▀▀           
+PIZZA
+}
+
+pizza2() {
+cat << PIZZA
+          ▄▄▄▄▄▄▄▄▄▄              
+       ▄▄▄▄▄ ▄▄ ▄▄               
+     ▄▄ ▄▄ ▄▄ ▄▄▄▄ ▄             
+   ▄▄   ▄ ▄▄ ▄ ▄▄▄▄▄▄            
+▄▄▄ ▄ ▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄          
+   ▄ ▄ ▄▄▄▄  ▄ ▄▄  ▄▄            
+▀▄   ▄▄▄▄▄▄▄▄ ▄▄▄ ▄ ▄ ▄          
+  ▀▄▄▄▄▄▄▄▄▄▄▄▄ ▄   ▄ ▄▄▄        
+    ▀▀▄▄▄▄ ▄ ▄ ▄▄▄ ▄▄▄▄          
+        ▀▄▄  ▄▄▄  ▄▄▄  ▄▄▄       
+          ▀▀▄▄▄▄▄▄   ▄▄ ▄ ▄      
+             ▀▄▄▄▄▄▄▄ ▄          
+               ▀▀▄▄▄▄▄▄  ▄▄▄     
+                   ▀▄▄▄▄         
+                      ▀▄▄▄▄▄▄    
+                         ▀▀▄     
+PIZZA
+}
+
+pancakes() {
+cat << PANCAKES
+         ▄▄▄▄▄▄▀▄▄▄▄▄▄▄            
+   ▄▄▄▄▀▀▀▀        ▀▀▀▀▀▀▄▄▄       
+ ▄▄ ▀ ▀   ▀  ▀▀▀▀▀▀▀     ▀  ▀▄     
+▄▀▀     ▀▀   ▀▀▀▀▀▀▀   ▀▀ ▀   ▄    
+       ▀      ▀▀ ▀ ▀▀▀▀▀▀▀▀▀ ▀     
+▀▀ ▀▀▀▀  ▀▀    ▀▀ ▀▀▀▀   ▀▀▀▀ ▀▄   
+  ▀    ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀   ▀▀     
+     ▀▀▀▀              ▀▀▀▀  ▀     
+     ▀▀  ▀▀▀ ▀▀▀▀ ▀▀▀▀▀  ▀▀▀ ▀▀▀   
+    ▀  ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀  ▀  
+      ▀▀▀                   ▀▀▀    
+     ▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀   ▀▀▀  
+     ▀ ▀    ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀   ▀▀▀▀ 
+      ▀▀▀▀  ▀▀▀▀▀▀▀▀▀▀▀▀▀▀  ▀▀▀▀   
+          ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀       
+PANCAKES
+}
+
+poptart() {
+cat << POPTART
+  ▄▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄       
+  ▀ ▀▀ ▀  ▀▀▀▀▀▀▀▀▀▀▀▀▀  ▀ ▀▀▄     
+ ▀   ▀▀▀      ▀▀       ▀▀▀▀▀ ▀▀▀▄  
+ ▀▀ ▀▀▀                  ▀▀▀▀▀  ▀▄ 
+  ▀      ▀▀          ▀     ▀▀▀ ▀▀  
+         ▀▀                     ▀▀ 
+ ▀▀     ▀                 ▀▀▀▀▀ ▀  
+ ▀▀                       ▀  ▀▀▀▀  
+ ▀                          ▀▀▀▀ ▀ 
+ ▀▀  ▀▀        ▀ ▀       ▀▀ ▀▀▀▀▀▀ 
+ ▀                       ▀▀        
+             ▀       ▀          ▀▀ 
+ ▀▀      ▀▀                    ▀▀▀ 
+ ▀▀   ▀ ▀▀▀             ▀▀▀        
+      ▀          ▀      ▀▀         
+ ▀▀   ▀▀▀▀      ▀▀▀                
+     ▀▀▀▀▀▀  ▀                     
+  ▀ ▀▀ ▀▀▀ ▀▀▀▀▀▀▀ ▀▀   ▀▀▀▀ ▀▀▀   
+  ▀   ▀▀                    ▀      
+   ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀     
+  ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀  
+POPTART
+}
+
+waffles() {
+cat << WAFFLES
+   ▄▄▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄    
+ ▄▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀   ▀▀ ▀▀▀  ▀▀▄  
+▄▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀   ▀▀▀▀▀▀▀ ▀▄ 
+   ▀    ▀ ▀ ▀▀      ▀   ▀    ▀▀▀   
+ ▀ ▀▀  ▀▀ ▀▀  ▀ ▀ ▀▀▀ ▀  ▀  ▀▀▀▀   
+ ▀▀▀▀▀▀ ▀▀▀ ▀   ▀▀▀▀▀▀▀▀ ▀▀▀▀▀ ▀   
+  ▀▀▀   ▀   ▀   ▀▀▀     ▀▀    ▀▀   
+ ▀     ▀▀  ▀▀  ▀ ▀▀ ▀   ▀  ▀▀▀ ▀   
+ ▀ ▀    ▀    ▀ ▀▀       ▀    ▀     
+ ▀▀ ▀  ▀▀▀▀▀▀▀    ▀▀▀    ▀  ▀▀▀▀   
+    ▀▀▀▀▀  ▀ ▀ ▀ ▀▀ ▀    ▀▀▀▀▀     
+ ▀ ▀▀▀▀▀▀▀ ▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀   
+ ▀     ▀▀        ▀▀ ▀      ▀▀▀     
+   ▀   ▀▀    ▀    ▀     ▀   ▀▀     
+▀▀ ▀▀▀▀▀▀▀  ▀ ▀▀▀▀▀▀▀ ▀  ▀▀▀▀▀▀▀▀▀ 
+ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀  
+   ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀    
+WAFFLES
+}
+
+burger() {
+cat << BURGER
+           ▄▄▄▄▀▀▀▀▀▀▄▄▄▄          
+       ▄▄▀▀▀▀▀ ▀  ▀▀▀▀▀▀▀▀▀▄▄      
+     ▄▀  ▀  ▀  ▀▀▀ ▀ ▀▀▀ ▀▀ ▀▀▄    
+   ▄▀▀  ▀▀   ▀▀▀▀ ▀  ▀▀ ▀▀  ▀▀▀▄   
+  ▄▀  ▀ ▀   ▀  ▀▀▀ ▀   ▀▀▀ ▀▀▀▀ ▄  
+ ▄▀▀▀▀▀▀▀▀▀  ▀  ▀   ▀▀  ▀▀▀▀▀      
+  ▀▀▀▀ ▀▀ ▀▀ ▀  ▀ ▀  ▀ ▀▀▀▀ ▀▀▀ ▀  
+   ▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▄▄ 
+▄▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀
+▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀ ▀▀▀▀▀▀▀ ▀▀▀  
+    ▀▀▀▀▀▀▀▀         ▀▀▀ ▀ ▀▀▀▀▀▀▄ 
+ ▄▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ 
+▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀ ▀▀   
+    ▀▀▀▀▀▀▀ ▀▀▀▀▀▀ ▀  ▀   ▀▀▀▀▀    
+     ▀▀▀▀▀▀▀▀▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀    
+     ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀     
+     ▀▀▀ ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀     
+        ▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀▀        
+BURGER
+}
+
+vburger() {
+cat << VBURGER
+            ▄▄▄▄▄▄▄▄▄▄            
+      ▄▄▄▄▄▄ ▄▄  ▄▄▄▄ ▄▄▄▄▄      
+   ▄▄▄▄▄ ▄▄  ▄▄▄ ▄▄▄  ▄    ▄▄    
+ ▄▄▄▄  ▄▄        ▄  ▄   ▄▄▄ ▄▄   
+▄▄▄ ▄  ▄        ▄▄ ▄  ▄  ▄▄▄     
+    ▄▄ ▄ ▄ ▄▄▄  ▄ ▄ ▄▄▄▄ ▄▄ ▄▀   
+▀▄  ▄ ▄▄▄    ▄ ▄ ▄▄▄ ▄▄ ▄▄▄▄▄▄▄▄ 
+▄▄▄▄▄▄   ▄▄▄▄▄▄▄▄▄ ▄▄▄▄▄▄▄▄ ▄▄▀  
+▀▄ ▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄  ▄▄   ▄▄    
+▀▄▄▄ ▄▄ ▄▄▄▄▄▄ ▄ ▄ ▄▄▄▄▄▄▄       
+ ▀▄ ▄  ▄▄ ▄▄▄▄ ▄ ▄▄ ▄ ▄  ▄ ▄     
+  ▄▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄▄ ▄▄▄▄▄     
+    ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▄▄▄▀ 
+    ▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄  ▄ ▄▄▄▄ ▀  
+   ▀▄▄▄▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▀▀    
+       ▀▀▀▀▄▄▄▄▄▄▄▄▄▄▀▀▀         
+VBURGER
+}
+
+rice() {
+cat << RICE
+             ▄▄▄▄▄▄              
+         ▄▄▄▄ ▄  ▄ ▄▄▄▄          
+    ▄▄▄▄▄ ▄▄ ▄      ▄ ▄▄▄▄▄▄     
+  ▄▄▄ ▄▄ ▄  ▄  ▄ ▄ ▄    ▄▄ ▄▄▄   
+   ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄   
+  ▀▄ ▄▄  ▄▄▄▄▄▄▄▄▄▄▄▄▄▄  ▄▄ ▄▀   
+   ▀▄  ▄▄▄▄▄▄      ▄▄▄▄▄▄  ▄▀    
+    ▀▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▀     
+      ▀▄ ▄▄▄▄▄▄▄▄▄▄▄▄▄▄ ▄▀       
+        ▀▀▄▄▄  ▄   ▄▄▄▀▀         
+            ▀▀▀▀▀▀▀▀             
+RICE
+}
+
+coffee() {
+cat << COFFEE
+      ▄▄▄▄▄▄▄▄▄▄           
+      ▀▀▀ ▀  ▀▀▀  ▄        
+   ▀▀  ▀▀▀▀      ▀▀        
+    ▀▀▀▀▀    ▀▀▀▀▀▀        
+       ▀▀▀▀▀▀▀▀▀        ▄  
+                    ▀ ▀ ▀  
+    ▀            ▀▀     ▀  
+       ▀▀▀▀▀▀▀▀▀        ▀  
+   ▀                       
+   ▀                 ▀▀▀▀  
+   ▀                ▀▀     
+  ▀                ▀   ▄▄  
+   ▀▀▀▀        ▀▀▀▀  ▀▀▀   
+      ▀▀▀▀▀▀▀▀▀▀▀▀▀        
+COFFEE
+}
+
+steam(){
+case "$1" in
+"0")
+cat << X0
+    :  :  :  :  :  
+     :  :  :  :  : 
+     :  :  :  :  : 
+    :  :  :  :  :  
+X0
+;;
+"1")
+cat << X0
+     :  :  :  :  : 
+     :  :  :  :  : 
+    :  :  :  :  :  
+    :  :  :  :  :  
+X0
+;;
+"2")
+cat << X0
+     :  :  :  :  : 
+    :  :  :  :  :  
+    :  :  :  :  :  
+     :  :  :  :  : 
+X0
+;;
+"3")
+cat << X0
+    :  :  :  :  :  
+    :  :  :  :  :  
+     :  :  :  :  : 
+     :  :  :  :  : 
+X0
+;;
+esac
+}
+
+hotcoffee() {
+  steam 1
+  coffee
+
+  x=0
+  while :; do
+cat << X0
+
+X0
+    steam $x
+    coffee
+    [ "$x" -le "2" ] && x=$((x+1)) || x=0
+    sleep 0.25
+  done
+}
+
+case "$1" in
+  *--burger|burger)
+    burger
+  ;;
+  *--vburger|vburger)
+    vburger
+  ;;
+  *--poptart|poptart)
+    poptart
+  ;;
+  *--rice|rice)
+    rice
+  ;;
+  *--waffles|waffles)
+    waffles
+  ;;
+  *--pancakes|pancakes)
+    pancakes
+  ;;
+  *--pizza2|pizza2)
+    pizza2
+  ;;
+	*--pizza|pizza)
+    pizza
+  ;;
+	*--taco|taco)
+		taco
+	;;
+  *--coffee|coffee)
+    coffee
+  ;;
+  *--hotcoffee|hotcoffee)
+    hotcoffee
+  ;;
+  *)
+    taco
+    usage
+  ;;
+esac
diff --git a/bin/bin/ghosts b/bin/bin/ghosts
@@ -0,0 +1,31 @@
+#!/bin/bash
+#
+# ANSI color scheme script by pfh
+#
+# Initializing mod by lolilolicon from Archlinux
+#
+
+f=3 b=4
+for j in f b; do
+  for i in {0..7}; do
+    printf -v $j$i %b "\e[${!j}${i}m"
+  done
+done
+bld=$'\e[1m'
+rst=$'\e[0m'
+inv=$'\e[7m'
+cat << EOF
+
+$f1    ▄▄▄      $f2    ▄▄▄      $f3    ▄▄▄      $f4    ▄▄▄      $f5    ▄▄▄      $f6    ▄▄▄     
+$f1   ▀█▀██  ▄  $f2   ▀█▀██  ▄  $f3   ▀█▀██  ▄  $f4   ▀█▀██  ▄  $f5   ▀█▀██  ▄  $f6   ▀█▀██  ▄ 
+$f1 ▀▄██████▀   $f2 ▀▄██████▀   $f3 ▀▄██████▀   $f4 ▀▄██████▀   $f5 ▀▄██████▀   $f6 ▀▄██████▀  
+$f1    ▀█████   $f2    ▀█████   $f3    ▀█████   $f4    ▀█████   $f5    ▀█████   $f6    ▀█████  
+$f1       ▀▀▀▀▄ $f2       ▀▀▀▀▄ $f3       ▀▀▀▀▄ $f4       ▀▀▀▀▄ $f5       ▀▀▀▀▄ $f6       ▀▀▀▀▄
+$bld
+$f1    ▄▄▄      $f2    ▄▄▄      $f3    ▄▄▄      $f4    ▄▄▄      $f5    ▄▄▄      $f6    ▄▄▄     
+$f1   ▀█▀██  ▄  $f2   ▀█▀██  ▄  $f3   ▀█▀██  ▄  $f4   ▀█▀██  ▄  $f5   ▀█▀██  ▄  $f6   ▀█▀██  ▄ 
+$f1 ▀▄██████▀   $f2 ▀▄██████▀   $f3 ▀▄██████▀   $f4 ▀▄██████▀   $f5 ▀▄██████▀   $f6 ▀▄██████▀  
+$f1    ▀█████   $f2    ▀█████   $f3    ▀█████   $f4    ▀█████   $f5    ▀█████   $f6    ▀█████  
+$f1       ▀▀▀▀▄ $f2       ▀▀▀▀▄ $f3       ▀▀▀▀▄ $f4       ▀▀▀▀▄ $f5       ▀▀▀▀▄ $f6       ▀▀▀▀▄
+$rst
+EOF
+\ No newline at end of file
diff --git a/bin/bin/pipes b/bin/bin/pipes
@@ -0,0 +1,122 @@
+#!/usr/bin/env bash
+# pipes.sh: Animated pipes terminal screensaver.
+#
+# This modified version is maintained at:
+#
+#   https://github.com/livibetter/pipes.sh
+
+# options:
+# s = straight [5-15]
+# f = rate [20-100]
+# t = style [0-5]
+# r = ttl
+
+VERSION=0.1.0
+
+M=32768
+p=1
+f=75 s=13 r=2000 t=0
+w=$(tput cols) h=$(tput lines)
+# ab -> idx = a*4 + b
+# 0: up, 1: right, 2: down, 3: left
+# 00 means going up   , then going up   -> ┃
+# 12 means going right, then going down -> ┓
+sets=(
+    "┃┏ ┓┛━┓  ┗┃┛┗ ┏━"
+    "│╭ ╮╯─╮  ╰│╯╰ ╭─"
+    "│┌ ┐┘─┐  └│┘└ ┌─"
+    "║╔ ╗╝═╗  ╚║╝╚ ╔═"
+    "|+ ++-+  +|++ +-"
+    "|/ \/-\  \|/\ /-"
+)
+v=()
+RNDSTART=0
+NOCOLOR=0
+
+OPTIND=1
+while getopts "p:t:f:s:r:RChv" arg; do
+case $arg in
+    p) ((p=(OPTARG>0)?OPTARG:p));;
+    t) ((OPTARG>=0 && OPTARG<${#sets[@]})) && V+=($OPTARG);;
+    f) ((f=(OPTARG>19 && OPTARG<101)?OPTARG:f));;
+    s) ((s=(OPTARG>4 && OPTARG<16 )?OPTARG:s));;
+    r) ((r=(OPTARG>=0)?OPTARG:r));;
+    R) RNDSTART=1;;
+    C) NOCOLOR=1;;
+    h) echo -e "Usage: $(basename $0) [OPTION]..."
+        echo -e "Animated pipes terminal screensaver.\n"
+        echo -e " -p [1-]\tnumber of pipes (D=1)."
+        echo -e " -t [0-$((${#sets[@]} - 1))]\ttype of pipes, can be used more than once (D=0)."
+        echo -e " -f [20-100]\tframerate (D=75)."
+        echo -e " -s [5-15]\tprobability of a straight fitting (D=13)."
+        echo -e " -r LIMIT\treset after x characters, 0 if no limit (D=2000)."
+        echo -e " -R \t\trandom starting point."
+        echo -e " -C \t\tno color."
+        echo -e " -h\t\thelp (this screen)."
+        echo -e " -v\t\tprint version number.\n"
+        exit 0;;
+    v) echo "$(basename -- "$0") $VERSION"
+        exit 0
+    esac
+done
+
+# set default values if not by options
+((${#V[@]})) || V=(0)
+
+# Attempt to workaround for Bash versions < 4, such as 3.2 on Mac:
+#   https://gist.github.com/livibetter/4689307/#comment-892368
+# Untested--in conduction of using shebang `env bash`--should fall back to
+# `sleep`
+printf -v SLEEP "read -t0.0$((1000/f)) -n 1"
+if $SLEEP &>/dev/null; (($? != 142)); then
+  printf -v SLEEP "sleep 0.0$((1000/f))"
+fi
+
+cleanup() {
+    # clear up standard input
+    read -t 0 && cat </dev/stdin>/dev/null
+
+    tput rmcup
+    tput cnorm
+    stty echo
+    exit 0
+}
+trap cleanup SIGHUP SIGINT SIGTERM
+
+for (( i=1; i<=p; i++ )); do
+    c[i]=$((i%8)) n[i]=0 l[i]=0
+    ((x[i]=RNDSTART==1?RANDOM*w/32768:w/2))
+    ((y[i]=RNDSTART==1?RANDOM*h/32768:h/2))
+    v[i]=${V[${#V[@]} * RANDOM / M]}
+done
+
+stty -echo
+tput smcup
+tput reset
+tput civis
+# any key press exits the loop and this script
+while $SLEEP; (($? > 128)) || [[ $SLEEP = sleep* ]] && (($? == 0)); do
+    for (( i=1; i<=p; i++ )); do
+        # New position:
+        ((${l[i]}%2)) && ((x[i]+=-${l[i]}+2,1)) || ((y[i]+=${l[i]}-1))
+
+        # Loop on edges (change color on loop):
+        ((${x[i]}>w||${x[i]}<0||${y[i]}>h||${y[i]}<0)) && ((c[i]=RANDOM%8, v[i]=V[${#V[@]}*RANDOM/M]))
+        ((x[i]=(x[i]+w)%w))
+        ((y[i]=(y[i]+h)%h))
+
+        # New random direction:
+        ((n[i]=RANDOM%s-1))
+        ((n[i]=(${n[i]}>1||${n[i]}==0)?${l[i]}:${l[i]}+${n[i]}))
+        ((n[i]=(${n[i]}<0)?3:${n[i]}%4))
+
+        # Print:
+        tput cup ${y[i]} ${x[i]}
+        [[ $NOCOLOR == 0 ]] && echo -ne "\033[1;3${c[i]}m"
+        echo -n "${sets[v[i]]:l[i]*4+n[i]:1}"
+        l[i]=${n[i]}
+    done
+    ((r>0 && t*p>=r)) && tput reset && tput civis && t=0 || ((t++))
+done
+
+cleanup
+\ No newline at end of file
diff --git a/bin/bin/pipesx b/bin/bin/pipesx
@@ -0,0 +1,193 @@
+#!/bin/bash
+# Animated pipes.sh terminal screensaver at an angle.
+# Copyright (C) 2013, 2014 by Yu-Jie Lin
+#
+# 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.
+#
+# Website: https://github.com/livibetter/pipesX.sh
+
+VERSION=0.1.0
+
+W=$(tput cols) H=$(tput lines)
+# maximal random value + 1
+M=32768
+
+SETS=('╱╲' '/\')
+COLORS=(31 32 33 34 35 36 37)
+
+# default values
+N=1
+T=()
+I=0.05
+P=25
+R=$((W * H / 4))
+
+HELP="Usage: $(basename $0) [OPTIONS]
+Animated pipes.sh terminal screensaver at an angle.
+
+Options:
+
+  -n [1-]     number of pipes. (Default: $N)
+  -t [0-$((${#SETS[@]} - 1))]    types of pipes, can be used more than once. (Default: $T)
+  -i [float]  piping interval or maze generation interval. (Default: $I)
+  -P [0-100]  probability of a turning pipe or of \\ in maze generation. (Default: $P)
+  -r [LIMIT]  reset after x characters, 0 if no limit. (Default: $R)
+  -R          random starting point.
+  -C          no color.
+  -X          maze generation.
+  -h          this help message.
+  -v          print version number.
+"
+
+while getopts "n:t:i:P:r:RCXhv" arg; do
+  case $arg in
+    n)
+      ((N = OPTARG > 0 ? OPTARG : N))
+      ;;
+    t)
+      T+=($(((OPTARG >= 0 && OPTARG < ${#SETS[@]}) ? OPTARG : T)))
+      ;;
+    i)
+      I=$OPTARG
+      ;;
+    P)
+      ((P = (OPTARG >= 0 && OPTARG <= 100) ? OPTARG : P))
+      ;;
+    r)
+      ((R = OPTARG >= 0 ? OPTARG : R))
+      ;;
+    R)
+      RNDSTART=1
+      ;;
+    C)
+      NOCOLOR=1
+      ;;
+    X)
+      MAZE=1
+      ;;
+    h)
+      echo -e "$HELP"
+      exit 0
+      ;;
+    v)
+      echo "$(basename -- "$0") $VERSION"
+      exit 0
+  esac
+done
+
+# set to default values if not by options
+((${#T[@]})) || T=(0)
+
+do_exit() {
+  # Show cursor and echo stdin
+  echo -ne "\e[?25h"
+  stty echo
+  clear
+  exit 0
+  }
+trap do_exit INT TERM
+
+# No echo stdin and hide the cursor
+stty -echo
+echo -ne "\e[?25l"
+
+# maze geneartion
+while [[ $MAZE ]] && clear; do
+  [[ $NOCOLOR ]] || echo -ne "\e[1;${COLORS[${#COLORS[@]} * RANDOM / M]}m"
+  for ((i = 0; i < W * H; i++ )); do
+    echo -ne ${SETS[T]:100 * RANDOM / M < P:1}
+  done
+  read -t $I -n 1 && [[ $REPLY =~ q|Q ]] && do_exit
+done
+
+# initialze values
+for ((n = 0; n < N; n++)); do
+  ((X[n] = RNDSTART ? (W + 2) * RANDOM / M : W / 2))
+  ((Y[n] = RNDSTART ? (H + 2) * RANDOM / M : H / 2))
+  D[n]=$((4 * RANDOM / M))
+  C[n]=${COLORS[${#COLORS[@]} * RANDOM / M]}
+  t[n]=${T[${#T[@]} * RANDOM / M]}
+done
+
+clear
+while :; do
+  for ((n = 0; n < N; n++, CC = 0)); do
+    x=${X[n]} y=${Y[n]}
+    d=${D[n]} c=${C[n]}
+
+    # calculate new direction `d`
+    # 1  0
+    #  \/  4 directions 0 to 3
+    #  /\
+    # 2  3
+    # valid directions: d: dd', d' is the new direction
+    # d
+    # 0:  / 00 \  01          03
+    #    /     /           /\
+    # 1:  / 10 \  11    12
+    #     \     \    /\
+    # 2:       \/ 21  / 22  / 23
+    #                /      \
+    # 3: \/ 30       \  32 \  33
+    #                /      \
+    ((d = (100 * RANDOM / M) < P ? ((d + 1) + 2 * (RANDOM % 2)) % 4 : d))
+    ((e = (d + 1) % 4))
+
+    # calculate new position
+    # d'  x'  y'
+    # 0: x+1 y-1
+    # 1: x-1 y-1
+    # 2: x-1 y+1
+    # 3: x+1 y+1
+    ((xn = e < 2 ? x + 1 : x - 1))
+    ((yn = d < 2 ? y - 1 : y + 1))
+    
+    # adjust position and change color?
+    ((d < 2 && y == 0)) && ((yn--, CC=1))
+    ((e > 1 && x == 0)) && ((xn--, CC=1))
+    ((d > 1 && y == H)) && ((yn++, CC=1))
+    ((e < 2 && x == W)) && ((xn++, CC=1))
+    ((CC)) && c=${COLORS[${#COLORS[@]} * RANDOM / M]}
+    ((CC)) && t[n]=${T[${#T[@]} * RANDOM / M]}
+
+    # warp pipe
+    ((xn = (xn + W + 1) % (W + 1)))
+    ((yn = (yn + H + 1) % (H + 1)))
+
+    # calculate position in terminal
+    # d'  xt   yt
+    # 0: x'   y'+1
+    # 1: x'+1 y'+1
+    # 2: x'+1 y'
+    # 3: x'   y'
+    ((xt = e < 2 ? xn : xn + 1))
+    ((yt = d < 2 ? yn + 1 : yn))
+
+    echo -ne "\e[${yt};${xt}H"
+    [[ $NOCOLOR ]] || echo -ne "\e[1;${c}m"
+    echo -n "${SETS[t[n]]:d%2:1}"
+
+    X[n]=$xn Y[n]=$yn
+    D[n]=$d C[n]=$c
+  done
+  read -t $I -n 1 && [[ $REPLY =~ q|Q ]] && do_exit
+  ((R)) && ((r += N, r >= R)) && r=0 && clear
+done
+
+do_exit
+\ No newline at end of file
diff --git a/bin/bin/sysinfo b/bin/bin/sysinfo
@@ -0,0 +1,115 @@
+#!/bin/sh
+#█▓▒░ vars
+#FULL=▓
+#EMPTY=░
+FULL=━
+#EMPTY=━
+#EMPTY=─
+#FULL=┅
+EMPTY=┄
+
+name=$USER
+host=$(hostname)
+battery=/sys/class/power_supply/BAT1
+distro="arch linux"
+kernel=$(uname -r)
+pkgs=$(pacman -Qqs | wc -l)
+colors='boneyard'
+font='tamzen 9'
+wm='awesome'
+
+#█▓▒░ progress bar
+draw()
+{
+  perc=$1
+  size=$2
+  inc=$(( perc * size / 100 ))
+  out=
+  if [ -z $3 ]
+  then
+    color="36"
+  else
+    color="$3"
+  fi 
+  for v in `seq 0 $(( size - 1 ))`; do
+    test "$v" -le "$inc"   \
+    && out="${out}\e[1;${color}m${FULL}" \
+    || out="${out}\e[0;${color}m${EMPTY}"
+  done
+  printf $out
+}
+
+#█▓▒░ colors
+printf "\n"
+i=0
+while [ $i -le 6 ]
+do
+  printf "\e[$((i+41))m\e[$((i+30))m█▓▒░"
+  i=$(($i+1))
+done
+printf "\e[37m█\e[0m▒░\n\n"
+
+
+#█▓▒░ greets
+printf " \e[0m  hello \e[36m$name\033[0m, i'm \e[34m$host\n"
+printf " \e[0m\n"
+
+#█▓▒░ environment
+printf " \e[1;33m      distro \e[0m$distro\n"
+printf " \e[1;33m      kernel \e[0m$kernel\n"
+printf " \e[1;33m    packages \e[0m$pkgs\n"
+printf " \e[1;33m          wm \e[0m$wm\n"
+printf " \e[1;33m        font \e[0m$font\n"
+printf " \e[1;33m      colors \e[0m$colors\n"
+printf " \e[0m\n"
+
+#█▓▒░ cpu
+cpu=$(grep 'cpu ' /proc/stat | awk '{usage=($2+$4)*100/($2+$4+$5)} END {print usage}')
+c_lvl=`printf "%.0f" $cpu`
+printf "   \e[0;36m%-4s \e[1;36m%-5s %-25s \n" " cpu" "$c_lvl%" `draw $c_lvl 15` 
+
+#█▓▒░ ram
+ram=`free | awk '/Mem:/ {print int($3/$2 * 100.0)}'`
+printf "   \e[0;36m%-4s \e[1;36m%-5s %-25s \n" " ram" "$ram%" `draw $ram 15` 
+
+#█▓▒░ battery
+b_full=$battery/charge_full
+b_now=$battery/charge_now
+bf=`cat $b_full`
+bn=`cat $b_now`
+charge=`printf $(( 100 * $bn / $bf ))`
+
+case 1 in
+  $(($charge <= 15)))
+    color='31'
+    ;;
+  *)
+    color='36'
+    ;;
+esac
+printf "   \e[0;${color}m%-4s \e[1;${color}m%-5s %-25s \n" " bat" "$charge%" `draw $charge 15 $color`
+
+#█▓▒░ volume
+vol=`amixer get Master | awk '$0~/%/{print $4}' | tr -d '[]%'`
+if amixer get Master | grep -q '\[off\]' 
+then
+  color='31'
+else
+  color='36'
+fi
+printf "   \e[0;${color}m%-4s \e[1;${color}m%-5s %-25s \n" " vol" "$vol%" `draw $vol 15 $color` 
+
+#█▓▒░ temperature
+temp=`sensors | awk '/Core\ 0/ {gsub(/\+/,"",$3); gsub(/\..+/,"",$3)    ; print $3}'`
+case 1 in
+  $(($temp <= 50)))
+    color='34'
+    ;;
+  $(($temp >= 75)))
+    color='31'
+    ;;
+  *)
+    color='36'
+    ;;
+esac
+printf "   \e[0;${color}m%-4s \e[1;${color}m%-5s %-25s \n\n" "temp" "$temp°c " `draw $temp 15 $color`
diff --git a/tmux/bin/tmux-status b/bin/bin/tmux-status
diff --git a/tmux/bin/tmuxinator b/bin/bin/tmuxinator
diff --git a/qutebrowser/.config/qutebrowser/qutebrowser.conf b/qutebrowser/.config/qutebrowser/qutebrowser.conf
@@ -1,12 +1,3 @@
-# :'#######::'##::::'##:'########:'########:'########::'########:::'#######::'##:::::'##::'######::'########:'########::
-# '##.... ##: ##:::: ##:... ##..:: ##.....:: ##.... ##: ##.... ##:'##.... ##: ##:'##: ##:'##... ##: ##.....:: ##.... ##:
-#  ##:::: ##: ##:::: ##:::: ##:::: ##::::::: ##:::: ##: ##:::: ##: ##:::: ##: ##: ##: ##: ##:::..:: ##::::::: ##:::: ##:
-#  ##:::: ##: ##:::: ##:::: ##:::: ######::: ########:: ########:: ##:::: ##: ##: ##: ##:. ######:: ######::: ########::
-#  ##:'## ##: ##:::: ##:::: ##:::: ##...:::: ##.... ##: ##.. ##::: ##:::: ##: ##: ##: ##::..... ##: ##...:::: ##.. ##:::
-#  ##:.. ##:: ##:::: ##:::: ##:::: ##::::::: ##:::: ##: ##::. ##:: ##:::: ##: ##: ##: ##:'##::: ##: ##::::::: ##::. ##::
-# . ##### ##:. #######::::: ##:::: ########: ########:: ##:::. ##:. #######::. ###. ###::. ######:: ########: ##:::. ##:
-# :.....:..:::.......::::::..:::::........::........:::..:::::..:::.......::::...::...::::......:::........::..:::::..::
-#
 # vim: ft=dosini
 
 # Configfile for qutebrowser.
@@ -33,25 +24,43 @@
 #   - # at the start of the line (at the first position of the key) (\#)
 #   - $ in a value ($$)
 
-[general]
+
 # General/miscellaneous options.
-#
+[general]
+
 # ignore-case (IgnoreCase):
 #     Whether to find text on a page case-insensitively.
 #         true: Search case-insensitively
 #         false: Search case-sensitively
 #         smart: Search case-sensitively if there are capital chars
 #     Default: smart
-#
-# startpage (List):
+ignore-case = smart
+
+# startpage (List of String):
 #     The default page(s) to open at the start, separated by commas.
-#     Default: https://duckduckgo.com
-#
+#     Default: https://start.duckduckgo.com
+startpage = https://start.duckduckgo.com
+
+# yank-ignored-url-parameters (List of String):
+#     The URL parameters to strip with :yank url, separated by commas.
+#     Default:
+#     ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
+yank-ignored-url-parameters = ref,utm_source,utm_medium,utm_campaign,utm_term,utm_content
+
+# default-open-dispatcher (String):
+#     The default program used to open downloads. Set to an empty string
+#     to use the default internal handler.
+#     Any {} in the string will be expanded to the filename, else the
+#     filename will be appended.
+#     Default:
+default-open-dispatcher = 
+
 # default-page (FuzzyUrl):
 #     The page to open if :open -t/-b/-w is used without URL. Use
 #     `about:blank` for a blank page.
 #     Default: ${startpage}
-#
+default-page = ${startpage}
+
 # auto-search (AutoSearch):
 #     Whether to start a search when something else than a URL is
 #     entered.
@@ -59,46 +68,57 @@
 #         dns: Use DNS requests (might be slow!).
 #         false: Never search automatically.
 #     Default: naive
-#
+auto-search = naive
+
 # auto-save-config (Bool):
 #     Whether to save the config automatically on quit.
 #     Valid values: true, false
 #     Default: true
-#
+auto-save-config = true
+
 # auto-save-interval (Int):
 #     How often (in milliseconds) to auto-save config/cookies/etc.
 #     Default: 15000
-#
+auto-save-interval = 15000
+
 # editor (ShellCommand):
 #     The editor (and arguments) to use for the `open-editor` command.
 #     The arguments get split like in a shell, so you can use `"` or `'`
 #     to quote them.
 #     `{}` gets replaced by the filename of the file to be edited.
 #     Default: gvim -f "{}"
-#
+editor = gvim -f "{}"
+
 # editor-encoding (Encoding):
 #     Encoding to use for editor.
 #     Default: utf-8
-#
+editor-encoding = utf-8
+
 # private-browsing (Bool):
-#     Do not record visited pages in the history or store web page
-#     icons.
+#     Open new windows in private browsing mode which does not record
+#     visited pages.
 #     Valid values: true, false
 #     Default: false
-#
+private-browsing = false
+
 # developer-extras (Bool):
 #     Enable extra tools for Web developers.
 #     This needs to be enabled for `:inspector` to work and also adds an
-#     _Inspect_ entry to the context menu.
+#     _Inspect_ entry to the context menu. For QtWebEngine, see
+#     'qutebrowser --help' instead.
 #     Valid values: true, false
 #     Default: false
-#
+developer-extras = false
+
 # print-element-backgrounds (Bool):
 #     Whether the background color and images are also drawn when the
 #     page is printed.
+#     This setting only works with Qt 5.8 or newer when using the
+#     QtWebEngine backend.
 #     Valid values: true, false
 #     Default: true
-#
+print-element-backgrounds = true
+
 # xss-auditing (Bool):
 #     Whether load requests should be monitored for cross-site scripting
 #     attempts.
@@ -107,19 +127,15 @@
 #     performance.
 #     Valid values: true, false
 #     Default: false
-#
-# site-specific-quirks (Bool):
-#     Enable workarounds for broken sites.
-#     Valid values: true, false
-#     Default: true
-#
+xss-auditing = false
+
 # default-encoding (String):
 #     Default encoding to use for websites.
 #     The encoding must be a string describing an encoding such as
-#     _utf-8_, _iso-8859-1_, etc. If left empty a default value will be
-#     used.
-#     Default:
-#
+#     _utf-8_, _iso-8859-1_, etc.
+#     Default: iso-8859-1
+default-encoding = iso-8859-1
+
 # new-instance-open-target (String):
 #     How to open links in an existing instance if a new one is
 #     launched.
@@ -133,80 +149,93 @@
 #     window without activating the window.
 #         window: Open in a new window.
 #     Default: tab
-#
+new-instance-open-target = tab
+
+# new-instance-open-target.window (String):
+#     Which window to choose when opening links as new tabs.
+#         first-opened: Open new tabs in the first (oldest) opened
+#     window.
+#         last-opened: Open new tabs in the last (newest) opened window.
+#         last-focused: Open new tabs in the most recently focused
+#     window.
+#         last-visible: Open new tabs in the most recently visible
+#     window.
+#     Default: last-focused
+new-instance-open-target.window = last-focused
+
 # log-javascript-console (String):
 #     How to log javascript console messages.
 #         none: Don't log messages.
 #         debug: Log messages with debug level.
 #         info: Log messages with info level.
 #     Default: debug
-#
+log-javascript-console = debug
+
 # save-session (Bool):
 #     Whether to always save the open pages.
 #     Valid values: true, false
 #     Default: false
-#
+save-session = true
+
 # session-default-name (SessionName):
 #     The name of the session to save by default, or empty for the last
 #     loaded session.
 #     Default:
-#
+session-default-name = 
+
 # url-incdec-segments (FlagList):
 #     The URL segments where `:navigate increment/decrement` will search
 #     for a number.
 #     Valid values: host, path, query, anchor
 #     Default: path,query
-ignore-case = smart
-startpage = https://duckduckgo.com
-default-page = ${startpage}
-auto-search = naive
-auto-save-config = true
-auto-save-interval = 15000
-editor = gvim -f "{}"
-editor-encoding = utf-8
-private-browsing = false
-developer-extras = false
-print-element-backgrounds = true
-xss-auditing = false
-site-specific-quirks = true
-default-encoding = 
-new-instance-open-target = tab
-log-javascript-console = debug
-save-session = true
-session-default-name = 
 url-incdec-segments = path,query
 
-[ui]
+
 # General options related to the user interface.
-#
-# zoom-levels (PercList):
+[ui]
+
+# history-session-interval (Int):
+#     The maximum time in minutes between two history items for them to
+#     be considered being from the same session. Use -1 to disable
+#     separation.
+#     Default: 30
+history-session-interval = 30
+
+# zoom-levels (List of Perc):
 #     The available zoom levels, separated by commas.
 #     Default:
 #     25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500%
-#
+zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500%
+
 # default-zoom (Perc):
 #     The default zoom level.
 #     Default: 100%
-#
+default-zoom = 100%
+
 # downloads-position (VerticalPosition):
 #     Where to show the downloaded files.
 #     Valid values: top, bottom
 #     Default: top
-#
+downloads-position = bottom
+
 # status-position (VerticalPosition):
 #     The position of the status bar.
 #     Valid values: top, bottom
 #     Default: bottom
-#
+status-position = bottom
+
 # message-timeout (Int):
 #     Time (in ms) to show messages in the statusbar for.
+#     Set to 0 to never clear messages.
 #     Default: 2000
-#
+message-timeout = 2000
+
 # message-unfocused (Bool):
 #     Whether to show messages in unfocused windows.
 #     Valid values: true, false
 #     Default: false
-#
+message-unfocused = false
+
 # confirm-quit (ConfirmQuit):
 #     Whether to confirm quitting the application.
 #         always: Always show a confirmation.
@@ -215,48 +244,58 @@ url-incdec-segments = path,query
 #         downloads: Show a confirmation if downloads are running
 #         never: Never show a confirmation.
 #     Default: never
-#
+confirm-quit = never
+
 # zoom-text-only (Bool):
 #     Whether the zoom factor on a frame applies only to the text or to
 #     all content.
 #     Valid values: true, false
 #     Default: false
-#
+zoom-text-only = false
+
 # frame-flattening (Bool):
 #     Whether to  expand each subframe to its contents.
 #     This will flatten all the frames to become one scrollable page.
 #     Valid values: true, false
 #     Default: false
-#
-# user-stylesheet (UserStyleSheet):
-#     User stylesheet to use (absolute filename, filename relative to
-#     the config directory or CSS string). Will expand environment
-#     variables.
-#     Default: ::-webkit-scrollbar { width: 0px; height: 0px; }
-#
-# css-media-type (String):
-#     Set the CSS media type.
+frame-flattening = false
+
+# user-stylesheet (File):
+#     User stylesheet to use (absolute filename or filename relative to
+#     the config directory). Will expand environment variables.
 #     Default:
-#
+user-stylesheet = 
+
+# hide-scrollbar (Bool):
+#     Hide the main scrollbar.
+#     Valid values: true, false
+#     Default: true
+hide-scrollbar = true
+
 # smooth-scrolling (Bool):
-#     Whether to enable smooth scrolling for webpages.
+#     Whether to enable smooth scrolling for web pages. Note smooth
+#     scrolling does not work with the :scroll-px command.
 #     Valid values: true, false
 #     Default: false
-#
+smooth-scrolling = false
+
 # remove-finished-downloads (Int):
 #     Number of milliseconds to wait before removing finished downloads.
 #     Will not be removed if value is -1.
 #     Default: -1
-#
+remove-finished-downloads = -1
+
 # hide-statusbar (Bool):
 #     Whether to hide the statusbar unless a message is shown.
 #     Valid values: true, false
 #     Default: false
-#
+hide-statusbar = false
+
 # statusbar-padding (Padding):
 #     Padding for statusbar (top, bottom, left, right).
 #     Default: 1,1,0,0
-#
+statusbar-padding = 1,1,0,0
+
 # window-title-format (FormatString):
 #     The format to use for the window title. The following placeholders
 #     are defined:
@@ -268,61 +307,61 @@ url-incdec-segments = path,query
 #     * `{id}`: The internal window ID of this window.
 #     * `{scroll_pos}`: The page scroll position.
 #     * `{host}`: The host of the current web page.
+#     * `{backend}`: Either 'webkit' or 'webengine'
+#     * `{private}` : Indicates when private mode is enabled.
 #     Default: {perc}{title}{title_sep}qutebrowser
-#
-# hide-mouse-cursor (Bool):
-#     Whether to hide the mouse cursor.
-#     Valid values: true, false
-#     Default: false
-#
+window-title-format = {perc}{title}{title_sep}qutebrowser
+
 # modal-js-dialog (Bool):
 #     Use standard JavaScript modal dialog for alert() and confirm()
 #     Valid values: true, false
 #     Default: false
-#
+modal-js-dialog = false
+
 # hide-wayland-decoration (Bool):
 #     Hide the window decoration when using wayland (requires restart)
 #     Valid values: true, false
 #     Default: false
-#
-# keyhint-blacklist (List):
+hide-wayland-decoration = false
+
+# keyhint-blacklist (List of String):
 #     Keychains that shouldn't be shown in the keyhint dialog
 #     Globs are supported, so ';*' will blacklist all keychainsstarting
 #     with ';'. Use '*' to disable keyhints
 #     Default:
-zoom-levels = 25%,33%,50%,67%,75%,90%,100%,110%,125%,150%,175%,200%,250%,300%,400%,500%
-default-zoom = 100%
-downloads-position = bottom
-status-position = bottom
-message-timeout = 2000
-message-unfocused = false
-confirm-quit = never
-zoom-text-only = false
-frame-flattening = false
-user-stylesheet = ::-webkit-scrollbar { width: 0px; height: 0px; }
-css-media-type = 
-smooth-scrolling = false
-remove-finished-downloads = -1
-hide-statusbar = false
-statusbar-padding = 1,1,0,0
-window-title-format = {perc}{title}{title_sep}qutebrowser
-hide-mouse-cursor = false
-modal-js-dialog = false
-hide-wayland-decoration = false
 keyhint-blacklist = 
 
-[network]
+# keyhint-delay (Int):
+#     Time from pressing a key to seeing the keyhint dialog (ms)
+#     Default: 500
+keyhint-delay = 500
+
+# prompt-radius (Int):
+#     The rounding radius for the edges of prompts.
+#     Default: 8
+prompt-radius = 8
+
+# prompt-filebrowser (Bool):
+#     Show a filebrowser in upload/download prompts.
+#     Valid values: true, false
+#     Default: true
+prompt-filebrowser = true
+
+
 # Settings related to the network.
-#
+[network]
+
 # do-not-track (Bool):
 #     Value to send in the `DNT` header.
 #     Valid values: true, false
 #     Default: true
-#
+do-not-track = true
+
 # accept-language (String):
 #     Value to send in the `accept-language` header.
 #     Default: en-US,en
-#
+accept-language = en-US,en
+
 # referer-header (String):
 #     Send the Referer header
 #         always: Always send.
@@ -331,11 +370,13 @@ keyhint-blacklist =
 #         same-domain: Only send for the same domain. This will still
 #     protect your privacy, but shouldn't break any sites.
 #     Default: same-domain
-#
+referer-header = same-domain
+
 # user-agent (UserAgent):
 #     User agent to send. Empty to send the default.
 #     Default:
-#
+user-agent = 
+
 # proxy (Proxy):
 #     The proxy to use.
 #     In addition to the listed values, you can use a `socks://...` or
@@ -343,144 +384,150 @@ keyhint-blacklist =
 #         system: Use the system wide proxy.
 #         none: Don't use any proxy
 #     Default: system
-#
+proxy = system
+
 # proxy-dns-requests (Bool):
 #     Whether to send DNS requests over the configured proxy.
 #     Valid values: true, false
 #     Default: true
-#
+proxy-dns-requests = true
+
 # ssl-strict (BoolAsk):
 #     Whether to validate SSL handshakes.
 #     Valid values: true, false, ask
 #     Default: ask
-#
+ssl-strict = ask
+
 # dns-prefetch (Bool):
 #     Whether to try to pre-fetch DNS entries to speed up browsing.
 #     Valid values: true, false
 #     Default: true
-#
+dns-prefetch = true
+
 # custom-headers (HeaderDict):
 #     Set custom headers for qutebrowser HTTP requests.
 #     Default:
-do-not-track = true
-accept-language = en-US,en
-referer-header = same-domain
-user-agent = 
-proxy = system
-proxy-dns-requests = true
-ssl-strict = ask
-dns-prefetch = true
 custom-headers = 
 
-[completion]
+# netrc-file (File):
+#     Set location of a netrc-file for HTTP authentication. If empty,
+#     ~/.netrc is used.
+#     Default:
+netrc-file = 
+
+
 # Options related to completion and command history.
-#
-# auto-open (Bool):
-#     Automatically open completion when typing.
-#     Valid values: true, false
-#     Default: true
-#
+[completion]
+
+# show (String):
+#     When to show the autocompletion window.
+#         always: Whenever a completion is available.
+#         auto: Whenever a completion is requested.
+#         never: Never.
+#     Default: always
+show = never
+
 # download-path-suggestion (String):
 #     What to display in the download filename input.
 #         path: Show only the download path.
 #         filename: Show only download filename.
 #         both: Show download path and filename.
 #     Default: path
-#
+download-path-suggestion = path
+
 # timestamp-format (TimestampTemplate):
 #     How to format timestamps (e.g. for history)
 #     Default: %Y-%m-%d
-#
-# show (Bool):
-#     Whether to show the autocompletion window.
-#     Valid values: true, false
-#     Default: true
-#
+timestamp-format = %Y-%m-%d
+
 # height (PercOrInt):
 #     The height of the completion, in px or as percentage of the
 #     window.
 #     Default: 50%
-#
+height = 50%
+
 # cmd-history-max-items (Int):
 #     How many commands to save in the command history.
 #     0: no history / -1: unlimited
 #     Default: 100
-#
+cmd-history-max-items = 100
+
 # web-history-max-items (Int):
 #     How many URLs to show in the web history.
 #     0: no history / -1: unlimited
 #     Default: 1000
-#
+web-history-max-items = 1000
+
 # quick-complete (Bool):
 #     Whether to move on to the next part when there's only one possible
 #     completion left.
 #     Valid values: true, false
 #     Default: true
-#
+quick-complete = true
+
 # shrink (Bool):
 #     Whether to shrink the completion to be smaller than the configured
 #     size if there are no scrollbars.
 #     Valid values: true, false
 #     Default: false
-#
+shrink = false
+
 # scrollbar-width (Int):
 #     Width of the scrollbar in the completion window (in px).
 #     Default: 12
-#
+scrollbar-width = 12
+
 # scrollbar-padding (Int):
 #     Padding of scrollbar handle in completion window (in px).
 #     Default: 2
-auto-open = false
-download-path-suggestion = path
-timestamp-format = %Y-%m-%d
-show = false
-height = 50%
-cmd-history-max-items = 100
-web-history-max-items = 1000
-quick-complete = true
-shrink = false
-scrollbar-width = 12
 scrollbar-padding = 2
 
-[input]
+
 # Options related to input modes.
-#
+[input]
+
 # timeout (Int):
-#     Timeout for ambiguous key bindings.
+#     Timeout (in milliseconds) for ambiguous key bindings.
 #     If the current input forms both a complete match and a partial
 #     match, the complete match will be executed after this time.
 #     Default: 500
-#
+timeout = 500
+
 # partial-timeout (Int):
-#     Timeout for partially typed key bindings.
+#     Timeout (in milliseconds) for partially typed key bindings.
 #     If the current input forms only partial matches, the keystring
 #     will be cleared after this time.
 #     Default: 5000
-#
+partial-timeout = 5000
+
 # insert-mode-on-plugins (Bool):
 #     Whether to switch to insert mode when clicking flash and other
 #     plugins.
 #     Valid values: true, false
 #     Default: false
-#
+insert-mode-on-plugins = false
+
 # auto-leave-insert-mode (Bool):
 #     Whether to leave insert mode if a non-editable element is clicked.
 #     Valid values: true, false
 #     Default: true
-#
+auto-leave-insert-mode = true
+
 # auto-insert-mode (Bool):
 #     Whether to automatically enter insert mode if an editable element
 #     is focused after page load.
 #     Valid values: true, false
 #     Default: false
-#
+auto-insert-mode = false
+
 # forward-unbound-keys (String):
 #     Whether to forward unbound keys to the webview in normal mode.
 #         all: Forward all unbound keys.
 #         auto: Forward unbound non-alphanumeric keys.
 #         none: Don't forward any keys.
 #     Default: auto
-#
+forward-unbound-keys = auto
+
 # spatial-navigation (Bool):
 #     Enables or disables the Spatial Navigation feature.
 #     Spatial navigation consists in the ability to navigate between
@@ -491,64 +538,65 @@ scrollbar-padding = 2
 #     the right and which element he probably wants.
 #     Valid values: true, false
 #     Default: false
-#
+spatial-navigation = false
+
 # links-included-in-focus-chain (Bool):
 #     Whether hyperlinks should be included in the keyboard focus chain.
 #     Valid values: true, false
 #     Default: true
-#
+links-included-in-focus-chain = true
+
 # rocker-gestures (Bool):
 #     Whether to enable Opera-like mouse rocker gestures. This disables
 #     the context menu.
 #     Valid values: true, false
 #     Default: false
-#
+rocker-gestures = false
+
 # mouse-zoom-divider (Int):
 #     How much to divide the mouse wheel movements to translate them
 #     into zoom increments.
 #     Default: 512
-timeout = 500
-partial-timeout = 5000
-insert-mode-on-plugins = false
-auto-leave-insert-mode = true
-auto-insert-mode = false
-forward-unbound-keys = auto
-spatial-navigation = false
-links-included-in-focus-chain = true
-rocker-gestures = false
 mouse-zoom-divider = 512
 
-[tabs]
+
 # Configuration of the tab bar.
-#
+[tabs]
+
 # background-tabs (Bool):
 #     Whether to open new tabs (middleclick/ctrl+click) in background.
 #     Valid values: true, false
 #     Default: false
-#
+background-tabs = true
+
 # select-on-remove (SelectOnRemove):
 #     Which tab to select when the focused tab is removed.
-#         left: Select the tab on the left.
-#         right: Select the tab on the right.
-#         previous: Select the previously selected tab.
-#     Default: right
-#
+#         prev: Select the tab which came before the closed one (left in
+#     horizontal, above in vertical).
+#         next: Select the tab which came after the closed one (right in
+#     horizontal, below in vertical).
+#         last-used: Select the previously selected tab.
+#     Default: next
+select-on-remove = next
+
 # new-tab-position (NewTabPosition):
 #     How new tabs are positioned.
-#         left: On the left of the current tab.
-#         right: On the right of the current tab.
-#         first: At the left end.
-#         last: At the right end.
-#     Default: right
-#
+#         prev: Before the current tab.
+#         next: After the current tab.
+#         first: At the beginning.
+#         last: At the end.
+#     Default: next
+new-tab-position = next
+
 # new-tab-position-explicit (NewTabPosition):
 #     How new tabs opened explicitly are positioned.
-#         left: On the left of the current tab.
-#         right: On the right of the current tab.
-#         first: At the left end.
-#         last: At the right end.
+#         prev: Before the current tab.
+#         next: After the current tab.
+#         first: At the beginning.
+#         last: At the end.
 #     Default: last
-#
+new-tab-position-explicit = last
+
 # last-close (String):
 #     Behavior when the last tab is closed.
 #         ignore: Don't do anything.
@@ -557,7 +605,8 @@ mouse-zoom-divider = 512
 #         default-page: Load the default page.
 #         close: Close the window.
 #     Default: ignore
-#
+last-close = ignore
+
 # show (String):
 #     When to show the tab bar
 #         always: Always show the tab bar.
@@ -565,53 +614,74 @@ mouse-zoom-divider = 512
 #         multiple: Hide the tab bar if only one tab is open.
 #         switching: Show the tab bar when switching tabs.
 #     Default: always
-#
+show = always
+
 # show-switching-delay (Int):
 #     Time to show the tab bar before hiding it when tabs->show is set
 #     to 'switching'.
 #     Default: 800
-#
+show-switching-delay = 800
+
 # wrap (Bool):
 #     Whether to wrap when changing tabs.
 #     Valid values: true, false
 #     Default: true
-#
+wrap = true
+
 # movable (Bool):
 #     Whether tabs should be movable.
 #     Valid values: true, false
 #     Default: true
-#
+movable = true
+
 # close-mouse-button (String):
 #     On which mouse button to close tabs.
 #         right: Close tabs on right-click.
 #         middle: Close tabs on middle-click.
 #         none: Don't close tabs using the mouse.
 #     Default: middle
-#
+close-mouse-button = middle
+
 # position (Position):
 #     The position of the tab bar.
 #     Valid values: top, bottom, left, right
 #     Default: top
-#
+position = top
+
 # show-favicons (Bool):
 #     Whether to show favicons in the tab bar.
 #     Valid values: true, false
 #     Default: true
-#
+show-favicons = true
+
+# favicon-scale (Float):
+#     Scale for favicons in the tab bar. The tab size is unchanged, so
+#     big favicons also require extra `tabs->padding`.
+#     Default: 1.0
+favicon-scale = 1.0
+
 # width (PercOrInt):
 #     The width of the tab bar if it's vertical, in px or as percentage
 #     of the window.
 #     Default: 20%
-#
+width = 20%
+
+# pinned-width (Int):
+#     The width for pinned tabs with a horizontal tabbar, in px.
+#     Default: 43
+pinned-width = 43
+
 # indicator-width (Int):
 #     Width of the progress indicator (0 to disable).
 #     Default: 3
-#
+indicator-width = 3
+
 # tabs-are-windows (Bool):
 #     Whether to open windows instead of tabs.
 #     Valid values: true, false
 #     Default: false
-#
+tabs-are-windows = false
+
 # title-format (FormatString):
 #     The format to use for the tab title. The following placeholders
 #     are defined:
@@ -624,65 +694,62 @@ mouse-zoom-divider = 512
 #     * `{id}`: The internal tab ID of this tab.
 #     * `{scroll_pos}`: The page scroll position.
 #     * `{host}`: The host of the current web page.
+#     * `{backend}`: Either 'webkit' or 'webengine'
+#     * `{private}` : Indicates when private mode is enabled.
 #     Default: {index}: {title}
-#
+title-format = {index}: {title}
+
+# title-format-pinned (FormatString):
+#     The format to use for the tab title for pinned tabs. The same
+#     placeholders like for title-format are defined.
+#     Default: {index}
+title-format-pinned = {index}
+
 # title-alignment (TextAlignment):
 #     Alignment of the text inside of tabs
 #     Valid values: left, right, center
 #     Default: left
-#
+title-alignment = left
+
 # mousewheel-tab-switching (Bool):
 #     Switch between tabs using the mouse wheel.
 #     Valid values: true, false
 #     Default: true
-#
+mousewheel-tab-switching = true
+
 # padding (Padding):
 #     Padding for tabs (top, bottom, left, right).
 #     Default: 0,0,5,5
-#
+padding = 0,0,5,5
+
 # indicator-padding (Padding):
 #     Padding for indicators (top, bottom, left, right).
 #     Default: 2,2,0,4
-background-tabs = true
-select-on-remove = right
-new-tab-position = right
-new-tab-position-explicit = last
-last-close = ignore
-show = always
-show-switching-delay = 800
-wrap = true
-movable = true
-close-mouse-button = middle
-position = top
-show-favicons = true
-width = 20%
-indicator-width = 3
-tabs-are-windows = false
-title-format = {index}: {title}
-title-alignment = left
-mousewheel-tab-switching = true
-padding = 0,0,5,5
 indicator-padding = 2,2,0,4
 
-[storage]
+
 # Settings related to cache and storage.
-#
+[storage]
+
 # download-directory (Directory):
 #     The directory to save downloads to. An empty value selects a
 #     sensible os-specific default. Will expand environment variables.
 #     Default:
-#
+download-directory = /home/pyratebeard/tmp
+
 # prompt-download-directory (Bool):
 #     Whether to prompt the user for the download location.
 #     If set to false, 'download-directory' will be used.
 #     Valid values: true, false
 #     Default: true
-#
+prompt-download-directory = false
+
 # remember-download-directory (Bool):
 #     Whether to remember the last used download directory.
 #     Valid values: true, false
 #     Default: true
-#
+remember-download-directory = true
+
 # maximum-pages-in-cache (Int):
 #     The maximum number of pages to hold in the global memory page
 #     cache.
@@ -691,34 +758,10 @@ indicator-padding = 2,2,0,4
 #     resuming up to _n_ pages.
 #     For more information about the feature, please refer to:
 #     http://webkit.org/blog/427/webkit-page-cache-i-the-basics/
-#     Default:
-#
-# object-cache-capacities (WebKitBytesList):
-#     The capacities for the global memory cache for dead objects such
-#     as stylesheets or scripts. Syntax: cacheMinDeadCapacity,
-#     cacheMaxDead, totalCapacity.
-#     The _cacheMinDeadCapacity_ specifies the minimum number of bytes
-#     that dead objects should consume when the cache is under pressure.
-#     _cacheMaxDead_ is the maximum number of bytes that dead objects
-#     should consume when the cache is *not* under pressure.
-#     _totalCapacity_ specifies the maximum number of bytes that the
-#     cache should consume *overall*.
-#     Default:
-#
-# offline-storage-default-quota (WebKitBytes):
-#     Default quota for new offline storage databases.
-#     Default:
-#
-# offline-web-application-cache-quota (WebKitBytes):
-#     Quota for the offline web application cache.
-#     Default:
-#
-# offline-storage-database (Bool):
-#     Whether support for the HTML 5 offline storage feature is enabled.
-#     Valid values: true, false
-#     Default: true
-#
-# offline-web-application-storage (Bool):
+#     Default: 0
+maximum-pages-in-cache = 0
+
+# offline-web-application-cache (Bool):
 #     Whether support for the HTML 5 web application cache feature is
 #     enabled.
 #     An application cache acts like an HTTP cache in some sense. For
@@ -729,11 +772,13 @@ indicator-padding = 2,2,0,4
 #     http://dev.w3.org/html5/spec/Overview.html#appcache
 #     Valid values: true, false
 #     Default: true
-#
+offline-web-application-cache = true
+
 # local-storage (Bool):
-#     Whether support for the HTML 5 local storage feature is enabled.
+#     Whether support for HTML 5 local storage and Web SQL is enabled.
 #     Valid values: true, false
 #     Default: true
+<<<<<<< HEAD
 #
 # cache-size (Int):
 #     Size of the HTTP network cache.
@@ -747,91 +792,116 @@ offline-storage-default-quota =
 offline-web-application-cache-quota = 
 offline-storage-database = true
 offline-web-application-storage = true
+=======
+>>>>>>> refs/remotes/origin/master
 local-storage = true
+
+# cache-size (Int):
+#     Size of the HTTP network cache. Empty to use the default value.
+#     Default:
 cache-size = 52428800
 
-[content]
+
 # Loaded plugins/scripts and allowed actions.
-#
+[content]
+
 # allow-images (Bool):
 #     Whether images are automatically loaded in web pages.
 #     Valid values: true, false
 #     Default: true
-#
+allow-images = true
+
 # allow-javascript (Bool):
 #     Enables or disables the running of JavaScript programs.
 #     Valid values: true, false
 #     Default: true
-#
+allow-javascript = true
+
 # allow-plugins (Bool):
 #     Enables or disables plugins in Web pages.
 #     Qt plugins with a mimetype such as "application/x-qt-plugin" are
 #     not affected by this setting.
 #     Valid values: true, false
 #     Default: false
-#
+allow-plugins = false
+
 # webgl (Bool):
 #     Enables or disables WebGL.
 #     Valid values: true, false
-#     Default: false
-#
-# css-regions (Bool):
-#     Enable or disable support for CSS regions.
-#     Valid values: true, false
 #     Default: true
-#
+webgl = false
+
 # hyperlink-auditing (Bool):
 #     Enable or disable hyperlink auditing (<a ping>).
 #     Valid values: true, false
 #     Default: false
-#
+hyperlink-auditing = false
+
 # geolocation (BoolAsk):
 #     Allow websites to request geolocations.
 #     Valid values: true, false, ask
 #     Default: ask
-#
+geolocation = ask
+
 # notifications (BoolAsk):
 #     Allow websites to show notifications.
 #     Valid values: true, false, ask
 #     Default: ask
-#
-# javascript-can-open-windows (Bool):
-#     Whether JavaScript programs can open new windows.
+notifications = ask
+
+# media-capture (BoolAsk):
+#     Allow websites to record audio/video.
+#     Valid values: true, false, ask
+#     Default: ask
+media-capture = ask
+
+# javascript-can-open-windows-automatically (Bool):
+#     Whether JavaScript programs can open new windows without user
+#     interaction.
 #     Valid values: true, false
 #     Default: false
-#
+javascript-can-open-windows-automatically = false
+
 # javascript-can-close-windows (Bool):
 #     Whether JavaScript programs can close windows.
 #     Valid values: true, false
 #     Default: false
-#
+javascript-can-close-windows = false
+
 # javascript-can-access-clipboard (Bool):
 #     Whether JavaScript programs can read or write to the clipboard.
+#     With QtWebEngine, writing the clipboard as response to a user
+#     interaction is always allowed.
 #     Valid values: true, false
 #     Default: false
-#
+javascript-can-access-clipboard = false
+
 # ignore-javascript-prompt (Bool):
 #     Whether all javascript prompts should be ignored.
 #     Valid values: true, false
 #     Default: false
-#
+ignore-javascript-prompt = false
+
 # ignore-javascript-alert (Bool):
 #     Whether all javascript alerts should be ignored.
 #     Valid values: true, false
 #     Default: false
-#
+ignore-javascript-alert = false
+
 # local-content-can-access-remote-urls (Bool):
 #     Whether locally loaded documents are allowed to access remote
 #     urls.
 #     Valid values: true, false
 #     Default: false
-#
+local-content-can-access-remote-urls = false
+
 # local-content-can-access-file-urls (Bool):
 #     Whether locally loaded documents are allowed to access other local
 #     urls.
 #     Valid values: true, false
 #     Default: true
-#
+local-content-can-access-file-urls = true
+
 # cookies-accept (String):
 #     Control which cookies to accept.
 #         all: Accept all cookies.
@@ -840,13 +910,16 @@ cache-size = 52428800
 #     unless a cookie is already set for the domain.
 #         never: Don't accept cookies at all.
 #     Default: no-3rdparty
-#
+cookies-accept = no-3rdparty
+
 # cookies-store (Bool):
-#     Whether to store cookies.
+#     Whether to store cookies. Note this option needs a restart with
+#     QtWebEngine on Qt < 5.9.
 #     Valid values: true, false
 #     Default: true
-#
-# host-block-lists (UrlList):
+cookies-store = true
+
+# host-block-lists (List of Url):
 #     List of URLs of lists which contain hosts to block.
 #     The file can be in one of the following formats:
 #     - An '/etc/hosts'-like file
@@ -854,131 +927,127 @@ cache-size = 52428800
 #     - A zip-file of any of the above, with either only one file, or a
 #     file named 'hosts' (with any extension).
 #     Default:
-#     http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext
-#
+#     https://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,https://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext
+host-block-lists = http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext
+
 # host-blocking-enabled (Bool):
 #     Whether host blocking is enabled.
 #     Valid values: true, false
 #     Default: true
-#
-# host-blocking-whitelist (List):
+host-blocking-enabled = true
+
+# host-blocking-whitelist (List of String):
 #     List of domains that should always be loaded, despite being
 #     ad-blocked.
 #     Domains may contain * and ? wildcards and are otherwise required
 #     to exactly match the requested domain.
 #     Local domains are always exempt from hostblocking.
 #     Default: piwik.org
-#
+host-blocking-whitelist = piwik.org
+
 # enable-pdfjs (Bool):
 #     Enable pdf.js to view PDF files in the browser.
 #     Note that the files can still be downloaded by clicking the
 #     download button in the pdf.js viewer.
 #     Valid values: true, false
 #     Default: false
-allow-images = true
-allow-javascript = true
-allow-plugins = false
-webgl = false
-css-regions = true
-hyperlink-auditing = false
-geolocation = ask
-notifications = ask
-javascript-can-open-windows = false
-javascript-can-close-windows = false
-javascript-can-access-clipboard = false
-ignore-javascript-prompt = false
-ignore-javascript-alert = false
-local-content-can-access-remote-urls = false
-local-content-can-access-file-urls = true
-cookies-accept = no-3rdparty
-cookies-store = true
-host-block-lists = http://www.malwaredomainlist.com/hostslist/hosts.txt,http://someonewhocares.org/hosts/hosts,http://winhelp2002.mvps.org/hosts.zip,http://malwaredomains.lehigh.edu/files/justdomains.zip,http://pgl.yoyo.org/adservers/serverlist.php?hostformat=hosts&mimetype=plaintext
-host-blocking-enabled = true
-host-blocking-whitelist = piwik.org
 enable-pdfjs = false
 
-[hints]
+
 # Hinting settings.
-#
+[hints]
+
 # border (String):
 #     CSS border value for hints.
 #     Default: 1px solid #E3BE23
-#
-# opacity (Float):
-#     Opacity for hints.
-#     Default: 0.7
-#
+border = 1px solid #0b0b0b
+
 # mode (String):
 #     Mode to use for hints.
-#         number: Use numeric hints.
+#         number: Use numeric hints. (In this mode you can also type
+#     letters form the hinted element to filter and reduce the number of
+#     elements that are hinted.)
 #         letter: Use the chars in the hints -> chars setting.
 #         word: Use hints words based on the html elements and the extra
 #     words.
 #     Default: letter
-#
+mode = letter
+
 # chars (UniqueCharString):
 #     Chars used for hint strings.
 #     Default: asdfghjkl
-#
+chars = asdfghjkl
+
 # min-chars (Int):
 #     Minimum number of chars used for hint strings.
 #     Default: 1
-#
+min-chars = 1
+
 # scatter (Bool):
 #     Whether to scatter hint key chains (like Vimium) or not (like
 #     dwb). Ignored for number hints.
 #     Valid values: true, false
 #     Default: true
-#
+scatter = true
+
 # uppercase (Bool):
 #     Make chars in hint strings uppercase.
 #     Valid values: true, false
 #     Default: false
-#
+uppercase = false
+
 # dictionary (File):
 #     The dictionary file to be used by the word hints.
 #     Default: /usr/share/dict/words
-#
-# auto-follow (Bool):
-#     Follow a hint immediately when the hint text is completely
-#     matched.
-#     Valid values: true, false
-#     Default: true
-#
+dictionary = /usr/share/dict/words
+
+# auto-follow (String):
+#     Controls when a hint can be automatically followed without the
+#     user pressing Enter.
+#         always: Auto-follow whenever there is only a single hint on a
+#     page.
+#         unique-match: Auto-follow whenever there is a unique non-empty
+#     match in either the hint string (word mode) or filter (number
+#     mode).
+#         full-match: Follow the hint when the user typed the whole hint
+#     (letter, word or number mode) or the element's text (only in
+#     number mode).
+#         never: The user will always need to press Enter to follow a
+#     hint.
+#     Default: unique-match
+auto-follow = unique-match
+
 # auto-follow-timeout (Int):
-#     A timeout to inhibit normal-mode key bindings after a
-#     successfulauto-follow.
+#     A timeout (in milliseconds) to inhibit normal-mode key bindings
+#     after a successful auto-follow.
 #     Default: 0
-#
-# next-regexes (RegexList):
+auto-follow-timeout = 0
+
+# next-regexes (List of Regex):
 #     A comma-separated list of regexes to use for 'next' links.
 #     Default:
 #     \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
-#
-# prev-regexes (RegexList):
+next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
+
+# prev-regexes (List of Regex):
 #     A comma-separated list of regexes to use for 'prev' links.
 #     Default: \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
-#
+prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
+
 # find-implementation (String):
 #     Which implementation to use to find elements to hint.
 #         javascript: Better but slower
 #         python: Slightly worse but faster
-#     Default: javascript
-border = 1px solid #0b0b0b
-opacity = 0.7
-mode = letter
-chars = asdfghjkl
-min-chars = 1
-scatter = true
-uppercase = false
-dictionary = /usr/share/dict/words
-auto-follow = true
-auto-follow-timeout = 0
-next-regexes = \bnext\b,\bmore\b,\bnewer\b,\b[>→≫]\b,\b(>>|»)\b,\bcontinue\b
-prev-regexes = \bprev(ious)?\b,\bback\b,\bolder\b,\b[<←≪]\b,\b(<<|«)\b
+#     Default: python
 find-implementation = javascript
 
-[searchengines]
+# hide-unmatched-rapid-hints (Bool):
+#     Controls hiding unmatched hints in rapid mode.
+#     Valid values: true, false
+#     Default: true
+hide-unmatched-rapid-hints = true
+
+
 # Definitions of search engines which can be used via the address bar.
 # The searchengine named `DEFAULT` is used when `general -> auto-search`
 # is true and something else than a URL was entered to be opened. Other
@@ -986,15 +1055,17 @@ find-implementation = javascript
 # search term, e.g. `:open google qutebrowser`. The string `{}` will be
 # replaced by the search term, use `{{` and `}}` for literal `{`/`}`
 # signs.
+[searchengines]
 DEFAULT = https://duckduckgo.com/?q={}
 
-[aliases]
+
 # Aliases for commands.
 # By default, no aliases are defined. Example which adds a new command
 # `:qtb` to open qutebrowsers website:
-# `qtb = open http://www.qutebrowser.org/`
+# `qtb = open https://www.qutebrowser.org/`
+[aliases]
+
 
-[colors]
 # Colors used in the UI.
 # A value can be in one of the following format:
 #  * `#RGB`/`#RRGGBB`/`#RRRGGGBBB`/`#RRRRGGGGBBBB`
@@ -1008,207 +1079,249 @@ DEFAULT = https://duckduckgo.com/?q={}
 # regardless of how they are defined in the options. Valid values are
 # 'rgb', 'hsv', and 'hsl'.
 # The `hints.*` values are a special case as they're real CSS colors, not Qt-CSS colors. There, for a gradient, you need to use `-webkit-gradient`, see https://www.webkit.org/blog/175/introducing-css-gradients/[the WebKit documentation].
-#
+[colors]
+
 # completion.fg (QtColor):
 #     Text color of the completion widget.
 #     Default: white
-#
+completion.fg = #d9d9d9
+
 # completion.bg (QssColor):
 #     Background color of the completion widget.
 #     Default: #333333
-#
+completion.bg = #333333
+
 # completion.alternate-bg (QssColor):
 #     Alternating background color of the completion widget.
 #     Default: #444444
-#
+completion.alternate-bg = #444444
+
 # completion.category.fg (QtColor):
 #     Foreground color of completion widget category headers.
 #     Default: white
-#
+completion.category.fg = #d9d9d9
+
 # completion.category.bg (QssColor):
 #     Background color of the completion widget category headers.
 #     Default: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #888888,
 #     stop:1 #505050)
-#
+completion.category.bg = qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 #888888, stop:1 #505050)
+
 # completion.category.border.top (QssColor):
 #     Top border color of the completion widget category headers.
 #     Default: black
-#
+completion.category.border.top = #0b0b0b
+
 # completion.category.border.bottom (QssColor):
 #     Bottom border color of the completion widget category headers.
 #     Default: ${completion.category.border.top}
-#
+completion.category.border.bottom = ${completion.category.border.top}
+
 # completion.item.selected.fg (QtColor):
 #     Foreground color of the selected completion item.
 #     Default: black
-#
+completion.item.selected.fg = #0b0b0b
+
 # completion.item.selected.bg (QssColor):
 #     Background color of the selected completion item.
 #     Default: #e8c000
-#
+completion.item.selected.bg = #e8c000
+
 # completion.item.selected.border.top (QssColor):
 #     Top border color of the completion widget category headers.
 #     Default: #bbbb00
-#
+completion.item.selected.border.top = #bbbb00
+
 # completion.item.selected.border.bottom (QssColor):
 #     Bottom border color of the selected completion item.
 #     Default: ${completion.item.selected.border.top}
-#
+completion.item.selected.border.bottom = ${completion.item.selected.border.top}
+
 # completion.match.fg (QssColor):
 #     Foreground color of the matched text in the completion.
 #     Default: #ff4444
-#
+completion.match.fg = cyan
+
 # completion.scrollbar.fg (QssColor):
 #     Color of the scrollbar handle in completion view.
 #     Default: ${completion.fg}
-#
+completion.scrollbar.fg = ${completion.fg}
+
 # completion.scrollbar.bg (QssColor):
 #     Color of the scrollbar in completion view
 #     Default: ${completion.bg}
-#
+completion.scrollbar.bg = ${completion.bg}
+
 # statusbar.fg (QssColor):
 #     Foreground color of the statusbar.
 #     Default: white
-#
+statusbar.fg = #d9d9d9
+
 # statusbar.bg (QssColor):
 #     Background color of the statusbar.
 #     Default: black
-#
-# statusbar.fg.error (QssColor):
-#     Foreground color of the statusbar if there was an error.
-#     Default: ${statusbar.fg}
-#
-# statusbar.bg.error (QssColor):
-#     Background color of the statusbar if there was an error.
-#     Default: red
-#
-# statusbar.fg.warning (QssColor):
-#     Foreground color of the statusbar if there is a warning.
-#     Default: ${statusbar.fg}
-#
-# statusbar.bg.warning (QssColor):
-#     Background color of the statusbar if there is a warning.
-#     Default: darkorange
-#
-# statusbar.fg.prompt (QssColor):
-#     Foreground color of the statusbar if there is a prompt.
+statusbar.bg = #0b0b0b
+
+# statusbar.fg.private (QssColor):
+#     Foreground color of the statusbar in private browsing mode.
 #     Default: ${statusbar.fg}
-#
-# statusbar.bg.prompt (QssColor):
-#     Background color of the statusbar if there is a prompt.
-#     Default: darkblue
-#
+statusbar.fg.private = ${statusbar.fg}
+
+# statusbar.bg.private (QssColor):
+#     Background color of the statusbar in private browsing mode.
+#     Default: #666666
+statusbar.bg.private = #666666
+
 # statusbar.fg.insert (QssColor):
 #     Foreground color of the statusbar in insert mode.
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.insert = ${statusbar.fg}
+
 # statusbar.bg.insert (QssColor):
 #     Background color of the statusbar in insert mode.
 #     Default: darkgreen
-#
+statusbar.bg.insert = darkgreen
+
 # statusbar.fg.command (QssColor):
 #     Foreground color of the statusbar in command mode.
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.command = ${statusbar.fg}
+
 # statusbar.bg.command (QssColor):
 #     Background color of the statusbar in command mode.
 #     Default: ${statusbar.bg}
-#
+statusbar.bg.command = ${statusbar.bg}
+
+# statusbar.fg.command.private (QssColor):
+#     Foreground color of the statusbar in private browsing + command
+#     mode.
+#     Default: ${statusbar.fg.private}
+statusbar.fg.command.private = ${statusbar.fg.private}
+
+# statusbar.bg.command.private (QssColor):
+#     Background color of the statusbar in private browsing + command
+#     mode.
+#     Default: ${statusbar.bg.private}
+statusbar.bg.command.private = ${statusbar.bg.private}
+
 # statusbar.fg.caret (QssColor):
 #     Foreground color of the statusbar in caret mode.
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.caret = ${statusbar.fg}
+
 # statusbar.bg.caret (QssColor):
 #     Background color of the statusbar in caret mode.
 #     Default: purple
-#
+statusbar.bg.caret = purple
+
 # statusbar.fg.caret-selection (QssColor):
 #     Foreground color of the statusbar in caret mode with a selection
 #     Default: ${statusbar.fg}
-#
+statusbar.fg.caret-selection = ${statusbar.fg}
+
 # statusbar.bg.caret-selection (QssColor):
 #     Background color of the statusbar in caret mode with a selection
 #     Default: #a12dff
-#
+statusbar.bg.caret-selection = #a12dff
+
 # statusbar.progress.bg (QssColor):
 #     Background color of the progress bar.
 #     Default: white
-#
+statusbar.progress.bg = #d9d9d9
+
 # statusbar.url.fg (QssColor):
 #     Default foreground color of the URL in the statusbar.
 #     Default: ${statusbar.fg}
-#
+statusbar.url.fg = ${statusbar.fg}
+
 # statusbar.url.fg.success (QssColor):
 #     Foreground color of the URL in the statusbar on successful load
 #     (http).
 #     Default: white
-#
+statusbar.url.fg.success = #d9d9d9
+
 # statusbar.url.fg.success.https (QssColor):
 #     Foreground color of the URL in the statusbar on successful load
 #     (https).
 #     Default: lime
-#
+statusbar.url.fg.success.https = lime
+
 # statusbar.url.fg.error (QssColor):
 #     Foreground color of the URL in the statusbar on error.
 #     Default: orange
-#
+statusbar.url.fg.error = orange
+
 # statusbar.url.fg.warn (QssColor):
 #     Foreground color of the URL in the statusbar when there's a
 #     warning.
 #     Default: yellow
-#
+statusbar.url.fg.warn = yellow
+
 # statusbar.url.fg.hover (QssColor):
 #     Foreground color of the URL in the statusbar for hovered links.
 #     Default: aqua
-#
+statusbar.url.fg.hover = aqua
+
 # tabs.fg.odd (QtColor):
 #     Foreground color of unselected odd tabs.
 #     Default: white
-#
+tabs.fg.odd = #d9d9d9
+
 # tabs.bg.odd (QtColor):
 #     Background color of unselected odd tabs.
 #     Default: grey
-#
+tabs.bg.odd = grey
+
 # tabs.fg.even (QtColor):
 #     Foreground color of unselected even tabs.
 #     Default: white
-#
+tabs.fg.even = #d9d9d9
+
 # tabs.bg.even (QtColor):
 #     Background color of unselected even tabs.
 #     Default: darkgrey
-#
+tabs.bg.even = darkgrey
+
 # tabs.fg.selected.odd (QtColor):
 #     Foreground color of selected odd tabs.
 #     Default: white
-#
+tabs.fg.selected.odd = #d9d9d9
+
 # tabs.bg.selected.odd (QtColor):
 #     Background color of selected odd tabs.
 #     Default: black
-#
+tabs.bg.selected.odd = #0b0b0b
+
 # tabs.fg.selected.even (QtColor):
 #     Foreground color of selected even tabs.
 #     Default: ${tabs.fg.selected.odd}
-#
+tabs.fg.selected.even = ${tabs.fg.selected.odd}
+
 # tabs.bg.selected.even (QtColor):
 #     Background color of selected even tabs.
 #     Default: ${tabs.bg.selected.odd}
-#
+tabs.bg.selected.even = ${tabs.bg.selected.odd}
+
 # tabs.bg.bar (QtColor):
 #     Background color of the tab bar.
 #     Default: #555555
-#
+tabs.bg.bar = #555555
+
 # tabs.indicator.start (QtColor):
 #     Color gradient start for the tab indicator.
 #     Default: #0000aa
-#
+tabs.indicator.start = #0000aa
+
 # tabs.indicator.stop (QtColor):
 #     Color gradient end for the tab indicator.
 #     Default: #00aa00
-#
+tabs.indicator.stop = #00aa00
+
 # tabs.indicator.error (QtColor):
 #     Color for the tab indicator on errors..
 #     Default: #ff0000
-#
+tabs.indicator.error = #ff0000
+
 # tabs.indicator.system (ColorSystem):
 #     Color gradient interpolation system for the tab indicator.
 #         rgb: Interpolate in the RGB color system.
@@ -1216,40 +1329,50 @@ DEFAULT = https://duckduckgo.com/?q={}
 #         hsl: Interpolate in the HSL color system.
 #         none: Don't show a gradient.
 #     Default: rgb
-#
-# hints.fg (CssColor):
+tabs.indicator.system = rgb
+
+# hints.fg (QssColor):
 #     Font color for hints.
 #     Default: black
-#
-# hints.bg (CssColor):
-#     Background color for hints.
-#     Default: -webkit-gradient(linear, left top, left bottom,
-#     color-stop(0%,#FFF785), color-stop(100%,#FFC542))
-#
-# hints.fg.match (CssColor):
+hints.fg = #d9d9d9
+
+# hints.bg (QssColor):
+#     Background color for hints. Note that you can use a `rgba(...)`
+#     value for transparency.
+#     Default: qlineargradient(x1:0, y1:0, x2:0, y2:1, stop:0 rgba(255,
+#     247, 133, 0.8), stop:1 rgba(255, 197, 66, 0.8))
+hints.bg = #656565
+
+# hints.fg.match (QssColor):
 #     Font color for the matched part of hints.
 #     Default: green
-#
+hints.fg.match = cyan
+
 # downloads.bg.bar (QssColor):
 #     Background color for the download bar.
 #     Default: black
-#
+downloads.bg.bar = #0b0b0b
+
 # downloads.fg.start (QtColor):
 #     Color gradient start for download text.
 #     Default: white
-#
+downloads.fg.start = #d9d9d9
+
 # downloads.bg.start (QtColor):
 #     Color gradient start for download backgrounds.
 #     Default: #0000aa
-#
+downloads.bg.start = blue
+
 # downloads.fg.stop (QtColor):
 #     Color gradient end for download text.
 #     Default: ${downloads.fg.start}
-#
+downloads.fg.stop = ${downloads.fg.start}
+
 # downloads.bg.stop (QtColor):
 #     Color gradient stop for download backgrounds.
 #     Default: #00aa00
-#
+downloads.bg.stop = #00aa00
+
 # downloads.fg.system (ColorSystem):
 #     Color gradient interpolation system for download text.
 #         rgb: Interpolate in the RGB color system.
@@ -1257,7 +1380,8 @@ DEFAULT = https://duckduckgo.com/?q={}
 #         hsl: Interpolate in the HSL color system.
 #         none: Don't show a gradient.
 #     Default: rgb
-#
+downloads.fg.system = rgb
+
 # downloads.bg.system (ColorSystem):
 #     Color gradient interpolation system for download backgrounds.
 #         rgb: Interpolate in the RGB color system.
@@ -1265,31 +1389,38 @@ DEFAULT = https://duckduckgo.com/?q={}
 #         hsl: Interpolate in the HSL color system.
 #         none: Don't show a gradient.
 #     Default: rgb
-#
+downloads.bg.system = rgb
+
 # downloads.fg.error (QtColor):
 #     Foreground color for downloads with errors.
 #     Default: white
-#
+downloads.fg.error = black
+
 # downloads.bg.error (QtColor):
 #     Background color for downloads with errors.
 #     Default: red
-#
+downloads.bg.error = red
+
 # webpage.bg (QtColor):
 #     Background color for webpages if unset (or empty to use the
 #     theme's color)
 #     Default: white
-#
+webpage.bg = #d9d9d9
+
 # keyhint.fg (QssColor):
 #     Text color for the keyhint widget.
 #     Default: #FFFFFF
-#
+keyhint.fg = #FFFFFF
+
 # keyhint.fg.suffix (CssColor):
 #     Highlight color for keys to complete the current keychain
 #     Default: #FFFF00
-#
+keyhint.fg.suffix = #FFFF00
+
 # keyhint.bg (QssColor):
 #     Background color of the keyhint widget.
 #     Default: rgba(0, 0, 0, 80%)
+<<<<<<< HEAD
 completion.fg = #d9d9d9
 completion.bg = #333333
 completion.alternate-bg = #444444
@@ -1357,100 +1488,186 @@ keyhint.fg = #FFFFFF
 keyhint.fg.suffix = #FFFF00
 keyhint.bg = rgba(0, 0, 0, 80%)
 
-[fonts]
+# messages.fg.error (QssColor):
+#     Foreground color of an error message.
+#     Default: white
+messages.fg.error = ${statusbar.fg}
+
+# messages.bg.error (QssColor):
+#     Background color of an error message.
+#     Default: red
+messages.bg.error = red
+
+# messages.border.error (QssColor):
+#     Border color of an error message.
+#     Default: #bb0000
+messages.border.error = #bb0000
+
+# messages.fg.warning (QssColor):
+#     Foreground color a warning message.
+#     Default: white
+messages.fg.warning = ${statusbar.fg}
+
+# messages.bg.warning (QssColor):
+#     Background color of a warning message.
+#     Default: darkorange
+messages.bg.warning = darkorange
+
+# messages.border.warning (QssColor):
+#     Border color of an error message.
+#     Default: #d47300
+messages.border.warning = #d47300
+
+# messages.fg.info (QssColor):
+#     Foreground color an info message.
+#     Default: white
+messages.fg.info = white
+
+# messages.bg.info (QssColor):
+#     Background color of an info message.
+#     Default: black
+messages.bg.info = black
+
+# messages.border.info (QssColor):
+#     Border color of an info message.
+#     Default: #333333
+messages.border.info = #333333
+
+# prompts.fg (QssColor):
+#     Foreground color for prompts.
+#     Default: white
+prompts.fg = ${statusbar.fg}
+
+# prompts.bg (QssColor):
+#     Background color for prompts.
+#     Default: darkblue
+prompts.bg = darkblue
+
+# prompts.selected.bg (QssColor):
+#     Background color for the selected item in filename prompts.
+#     Default: #308cc6
+prompts.selected.bg = #308cc6
+
+
 # Fonts used for the UI, with optional style/weight/size.
 #  * Style: `normal`/`italic`/`oblique`
 #  * Weight: `normal`, `bold`, `100`..`900`
 #  * Size: _number_ `px`/`pt`
-#
+[fonts]
+
 # _monospace (Font):
 #     Default monospace fonts.
-#     Default: Terminus, Monospace, "DejaVu Sans Mono", Monaco,
-#     "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier,
-#     "Liberation Mono", monospace, Fixed, Consolas, Terminal
-#
+#     Default: xos4 Terminus, Terminus, Monospace, "DejaVu Sans Mono",
+#     Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New",
+#     Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
+_monospace = tamzen, Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
+
 # completion (Font):
 #     Font used in the completion widget.
 #     Default: 8pt ${_monospace}
-#
+completion = 9pt ${_monospace}
+
+# completion.category (Font):
+#     Font used in the completion categories.
+#     Default: bold ${completion}
+completion.category = bold ${completion}
+
 # tabbar (QtFont):
 #     Font used in the tab bar.
 #     Default: 8pt ${_monospace}
-#
+tabbar = 9pt ${_monospace}
+
 # statusbar (Font):
 #     Font used in the statusbar.
 #     Default: 8pt ${_monospace}
-#
+statusbar = 9pt ${_monospace}
+
 # downloads (Font):
 #     Font used for the downloadbar.
 #     Default: 8pt ${_monospace}
-#
+downloads = 9pt ${_monospace}
+
 # hints (Font):
 #     Font used for the hints.
-#     Default: bold 13px Monospace
-#
+#     Default: bold 13px ${_monospace}
+hints = 12px ${_monospace}
+
 # debug-console (QtFont):
 #     Font used for the debugging console.
 #     Default: 8pt ${_monospace}
-#
+debug-console = 9pt ${_monospace}
+
 # web-family-standard (FontFamily):
 #     Font family for standard fonts.
 #     Default:
-#
+web-family-standard = 
+
 # web-family-fixed (FontFamily):
 #     Font family for fixed fonts.
 #     Default:
-#
+web-family-fixed = 
+
 # web-family-serif (FontFamily):
 #     Font family for serif fonts.
 #     Default:
-#
+web-family-serif = 
+
 # web-family-sans-serif (FontFamily):
 #     Font family for sans-serif fonts.
 #     Default:
-#
+web-family-sans-serif = 
+
 # web-family-cursive (FontFamily):
 #     Font family for cursive fonts.
 #     Default:
-#
+web-family-cursive = 
+
 # web-family-fantasy (FontFamily):
 #     Font family for fantasy fonts.
 #     Default:
-#
+web-family-fantasy = 
+
 # web-size-minimum (Int):
 #     The hard minimum font size.
-#     Default:
-#
+#     Default: 0
+web-size-minimum = 0
+
 # web-size-minimum-logical (Int):
 #     The minimum logical font size that is applied when zooming out.
-#     Default:
-#
+#     Default: 6
+web-size-minimum-logical = 6
+
 # web-size-default (Int):
 #     The default font size for regular text.
-#     Default:
-#
+#     Default: 16
+web-size-default = 16
+
 # web-size-default-fixed (Int):
 #     The default font size for fixed-pitch text.
-#     Default:
-#
+#     Default: 13
+web-size-default-fixed = 13
+
 # keyhint (Font):
 #     Font used in the keyhint widget.
 #     Default: 8pt ${_monospace}
-_monospace = tamzen, Terminus, Monospace, "DejaVu Sans Mono", Monaco, "Bitstream Vera Sans Mono", "Andale Mono", "Courier New", Courier, "Liberation Mono", monospace, Fixed, Consolas, Terminal
-completion = 10pt ${_monospace}
-tabbar = 10pt ${_monospace}
-statusbar = 10pt ${_monospace}
-downloads = 10pt ${_monospace}
-hints = 12px ${_monospace}
-debug-console = 10pt ${_monospace}
-web-family-standard = 
-web-family-fixed = 
-web-family-serif = 
-web-family-sans-serif = 
-web-family-cursive = 
-web-family-fantasy = 
-web-size-minimum = 
-web-size-minimum-logical = 
-web-size-default = 
-web-size-default-fixed = 
 keyhint = 8pt ${_monospace}
+
+# messages.error (Font):
+#     Font used for error messages.
+#     Default: 8pt ${_monospace}
+messages.error = 8pt ${_monospace}
+
+# messages.warning (Font):
+#     Font used for warning messages.
+#     Default: 8pt ${_monospace}
+messages.warning = 8pt ${_monospace}
+
+# messages.info (Font):
+#     Font used for info messages.
+#     Default: 8pt ${_monospace}
+messages.info = 8pt ${_monospace}
+
+# prompts (Font):
+#     Font used for prompts.
+#     Default: 8pt sans-serif
+prompts = 8pt sans-serif
diff --git a/urxvt/.Xdefaults b/urxvt/.Xdefaults
@@ -14,7 +14,7 @@
 !urxvt*geometry: 80x45
 
 ! Fonts
-urxvt*font: xft:tamsyn:size=10:antialias=false, \
+urxvt*font: xft:tamzen:size=9:antialias=false
 urxvt*boldFont: 
 urxvt*italicFont: 
 urxvt*bolditalicFont: 
diff --git a/zsh/.zsh/custom-prompt.zsh b/zsh/.zsh/custom-prompt.zsh
@@ -1,40 +0,0 @@
-#                 ██      
-#                ░██      
-#  ██████  ██████░██      
-# ░░░░██  ██░░░░ ░██████  
-#    ██  ░░█████ ░██░░░██ 
-#   ██    ░░░░░██░██  ░██ 
-#  ██████ ██████ ░██  ░██ 
-# ░░░░░░ ░░░░░░  ░░   ░░  
-#
-#  ▓▓▓▓▓▓▓▓▓▓
-# ░▓ author ▓ xero <x@xero.nu>
-# ░▓ code   ▓ http://code.xero.nu/dotfiles
-# ░▓ mirror ▓ http://git.io/.files
-# ░▓▓▓▓▓▓▓▓▓▓
-# ░░░░░░░░░░
-#
-#█▓▒░ colors for permissions
-if [[ "$EUID" -ne "0" ]]
-then  # if user is not root
-	USER_LEVEL="%F{cyan}"
-else # root!
-	USER_LEVEL="%F{red}"
-fi
-
-#█▓▒░ allow functions in the prompt
-setopt PROMPT_SUBST
-
-#█▓▒░ autoload zsh functions
-fpath=(~/.zsh/functions $fpath)
-autoload -U ~/.zsh/functions/*(:t)
- 
-#█▓▒░ enable auto-execution of functions
-typeset -ga preexec_functions
-typeset -ga precmd_functions
-typeset -ga chpwd_functions
- 
-#█▓▒░ prepend git functions needed for prompt
-preexec_functions+='preexec_update_git_vars'
-precmd_functions+='precmd_update_git_vars'
-chpwd_functions+=('chpwd_update_git_vars', 'chpwd_auto_cd')
diff --git a/zsh/.zsh/dual-line-prompt._zsh b/zsh/.zsh/dual-line-prompt._zsh
@@ -1,19 +0,0 @@
-#                 ██      
-#                ░██      
-#  ██████  ██████░██      
-# ░░░░██  ██░░░░ ░██████  
-#    ██  ░░█████ ░██░░░██ 
-#   ██    ░░░░░██░██  ░██ 
-#  ██████ ██████ ░██  ░██ 
-# ░░░░░░ ░░░░░░  ░░   ░░  
-#
-#  ▓▓▓▓▓▓▓▓▓▓
-# ░▓ author ▓ xero <x@xero.nu>
-# ░▓ code   ▓ http://code.xero.nu/dotfiles
-# ░▓ mirror ▓ http://git.io/.files
-# ░▓▓▓▓▓▓▓▓▓▓
-# ░░░░░░░░░░
-#
-#█▓▒░dual line prompt
-PROMPT='${USER_LEVEL}┌[%F{white}%n@%M${USER_LEVEL}]─[%F{white}%~${USER_LEVEL}]$(prompt_git_info)
-${USER_LEVEL}└─ - %F{white}'
diff --git a/zsh/.zsh/minimal-prompt.zsh b/zsh/.zsh/minimal-prompt.zsh
@@ -1,15 +0,0 @@
-# '########::'######::'##::::'##:
-# ..... ##::'##... ##: ##:::: ##:
-# :::: ##::: ##:::..:: ##:::: ##:
-# ::: ##::::. ######:: #########:
-# :: ##::::::..... ##: ##.... ##:
-# : ##::::::'##::: ##: ##:::: ##:
-#  ########:. ######:: ##:::: ##:
-# ........:::......:::..:::::..::
-#
-# AUTHOR  pyratebeard <root@pyratebeard.net>
-# CODE    http://github.com/pyratebeard/dotfiles
-#
-# Minimal prompt
-#PROMPT='${USER_LEVEL}[%F{white}%1~${USER_LEVEL}]$(prompt_git_info)── -%f '
-PROMPT='%F{cyan}${USERNAME}@%F{white}[$HOSTNAME] : %~# '
diff --git a/zsh/.zsh/ninja-prompt._zsh b/zsh/.zsh/ninja-prompt._zsh
@@ -1,22 +0,0 @@
-#                 ██      
-#                ░██      
-#  ██████  ██████░██      
-# ░░░░██  ██░░░░ ░██████  
-#    ██  ░░█████ ░██░░░██ 
-#   ██    ░░░░░██░██  ░██ 
-#  ██████ ██████ ░██  ░██ 
-# ░░░░░░ ░░░░░░  ░░   ░░  
-#
-#  ▓▓▓▓▓▓▓▓▓▓
-# ░▓ author ▓ xero <x@xero.nu>
-# ░▓ code   ▓ http://code.xero.nu/dotfiles
-# ░▓ mirror ▓ http://git.io/.files
-# ░▓▓▓▓▓▓▓▓▓▓
-# ░░░░░░░░░░
-#
-#█▓▒░ ninja prompt
-PROMPT='%F{white}        ▟▙  ${USER_LEVEL}%~%F{white}$(prompt_git_info) %F{white}
-▟▒${USER_LEVEL}░░░░░░░%F{white}▜▙▜████████████████████████████████▛
-▜▒${USER_LEVEL}░░░░░░░%F{white}▟▛▟▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▒▛
-        ▜▛  
-            %F{white}'
diff --git a/zsh/.zsh/prompt.zsh b/zsh/.zsh/prompt.zsh
@@ -0,0 +1,94 @@
+#ICO_DIRTY="⚡"
+#ICO_DIRTY="↯"
+ICO_DIRTY="*"
+#ICO_AHEAD="↑"
+ICO_AHEAD="🠙"
+#ICO_AHEAD="▲"
+#ICO_BEHIND="↓"
+ICO_BEHIND="🠛"
+#ICO_BEHIND="▼"
+ICO_DIVERGED="⥮"
+COLOR_ROOT="%F{red}"
+COLOR_USER="%F{cyan}"
+COLOR_NORMAL="%F{white}"
+PROMPT_STYLE="classic"
+
+#█▓▒░ allow functions in the prompt
+setopt PROMPT_SUBST
+autoload -Uz colors && colors
+
+#█▓▒░ colors for permissions
+if [[ "$EUID" -ne "0" ]]
+then  # if user is not root
+	USER_LEVEL="${COLOR_USER}"
+else # root!
+	USER_LEVEL="${COLOR_ROOT}"
+fi
+
+#█▓▒░ git prompt
+GIT_PROMPT() {
+  test=$(git rev-parse --is-inside-work-tree 2> /dev/null)
+  if [ ! "$test" ]
+  then
+    case "$PROMPT_STYLE" in
+      ascii)
+        echo "$reset_color%F{cyan}▒░"
+      ;;
+      arrows)
+        echo "$reset_color%F{cyan}"
+      ;;
+    esac
+    return
+  fi
+  ref=$(git name-rev --name-only HEAD | sed 's!remotes/!!' 2> /dev/null)
+  dirty="" && [[ $(git diff --shortstat 2> /dev/null | tail -n1) != "" ]] && dirty=$ICO_DIRTY
+  stat=$(git status | sed -n 2p)
+  case "$stat" in
+    *ahead*)
+      stat=$ICO_AHEAD
+    ;;
+    *behind*)
+      stat=$ICO_BEHIND
+    ;;
+    *diverged*)
+      stat=$ICO_DIVERGED
+    ;;
+    *)
+      stat=""
+    ;;
+  esac
+  case "$PROMPT_STYLE" in
+    ninja)
+      echo "${COLOR_NORMAL}${ref}${dirty}${stat}"
+    ;;
+    ascii)
+      echo "%{$bg[magenta]%}%F{cyan}▓▒░ %F{black}${ref}${dirty}${stat} $reset_color%F{magenta}▒░"
+    ;;
+    arrows)
+      echo "%{$bg[magenta]%}%F{cyan} %F{black}${ref}${dirty}${stat} $reset_color%F{magenta}"
+    ;;
+    *)
+    echo "${USER_LEVEL}─[${COLOR_NORMAL}"${ref}${dirty}${stat}"${USER_LEVEL}]"
+    ;;
+  esac
+}
+case "$PROMPT_STYLE" in
+# ascii
+ascii)
+PROMPT='%{$bg[cyan]%} %F{black}%~ $(GIT_PROMPT)$reset_color 
+%f'
+;;
+# dual line
+dual)
+PROMPT='${USER_LEVEL}┌[${COLOR_NORMAL}%~${USER_LEVEL}]$(GIT_PROMPT)
+${USER_LEVEL}└─ - %f'
+;;
+# mini
+mini)
+PROMPT='${USER_LEVEL}[${COLOR_NORMAL}%~${USER_LEVEL}]$(GIT_PROMPT)── - %f'
+;;
+# classic
+*)
+PROMPT='%F{cyan}${USERNAME}@%F{white}[archee]$(GIT_PROMPT)%F{white} : %~# '
+;;
+esac