Resolve conflicts

23 files changed, 235 insertions, 178 deletions

diff --git a/Browser/vimb/color-gen b/Browser/vimb/color-gen
index fec8b6d..6dce817 100755
--- a/Browser/vimb/color-gen
+++ b/Browser/vimb/color-gen
@@ -1,15 +1,15 @@
 #!/bin/sh
 . ~/.colors
 cp ~/.config/vimb/config.static ~/.config/vimb/config
-echo "set status-color-bg=$COLOR0" >> ~/.config/vimb/config
-echo "set status-color-fg=$COLOR11" >> ~/.config/vimb/config
-
-echo "set status-ssl-color-bg=$COLOR0" >> ~/.config/vimb/config
-echo "set status-ssl-color-fg=$COLOR11" >> ~/.config/vimb/config
-
-echo "set completion-bg-active=$COLOR0" >> ~/.config/vimb/config
-echo "set completion-bg-normal=$COLOR0" >> ~/.config/vimb/config
-echo "set completion-fg-active=$COLOR3" >> ~/.config/vimb/config
-echo "set completion-fg-normal=$COLOR11" >> ~/.config/vimb/config
-
+# echo "set status-color-bg=$COLOR0" >> ~/.config/vimb/config
+# echo "set status-color-fg=$COLOR11" >> ~/.config/vimb/config
+# 
+# echo "set status-ssl-color-bg=$COLOR0" >> ~/.config/vimb/config
+# echo "set status-ssl-color-fg=$COLOR11" >> ~/.config/vimb/config
+# 
+# echo "set completion-bg-active=$COLOR0" >> ~/.config/vimb/config
+# echo "set completion-bg-normal=$COLOR0" >> ~/.config/vimb/config
+# echo "set completion-fg-active=$COLOR3" >> ~/.config/vimb/config
+# echo "set completion-fg-normal=$COLOR11" >> ~/.config/vimb/config
+# 
 
diff --git a/Browser/vimb/config.static b/Browser/vimb/config.static
index 2062c57..bf4c8bc 100644
--- a/Browser/vimb/config.static
+++ b/Browser/vimb/config.static
@@ -3,16 +3,17 @@ set useragent=Mozilla/5.0 (Macintosh; Intel Mac OS X 10_11_1) AppleWebKit/601.2.
 set scripts=true
 
 set spacial-navigation=true
+set default-zoom=150
 
 shortcut-add wiki=https://en.wikipedia.org/w/index.php?search=$0
 shortcut-add gl=https://encrypted.google.com/search?hl=en&source=hp&biw=&bih=&q=$0&btnG=Google+Search&gbv=1
-shortcut-add dl=https://duckduckgo.com/lite/?q=$0
+shortcut-add dl=https://duckduckgo.com/?q=$0
 shortcut-add map=https://maps.google.com/maps?saddr=$0&daddr=$1
 shortcut-add gh=https://github.com/$0/$1
 shortcut-add arrp=https://www.archlinux.org/packages/?q=$0
 shortcut-add arwk=https://wiki.archlinux.org/index.php?title=Special%3ASearch&search=$0&go=Go
 shortcut-add aur=https://aur.archlinux.org/packages/?K=$0
-shortcut-default gl
+shortcut-default dl
 
 set download-path=~/Downloads
 
diff --git a/Editor/vimrc b/Editor/vimrc
index 19903e9..bd76cb7 100644
--- a/Editor/vimrc
+++ b/Editor/vimrc
@@ -1,6 +1,8 @@
 set nocompatible              " be iMproved, required
 filetype off                  " required
 
+set background=dark
+
 set rtp+=~/.vim/bundle/Vundle.vim
 call vundle#begin()
 
@@ -12,12 +14,21 @@ Plugin 'tpope/vim-abolish'
 Plugin 'tpope/vim-surround'
 Plugin 'tpope/vim-repeat'
 " fancy ass ide stuff
-Plugin 'Valloric/YouCompleteMe'
+Plugin 'Shougo/deoplete.nvim'
+Plugin 'zchee/deoplete-clang'
+"Plugin 'Valloric/YouCompleteMe'
 Plugin 'SirVer/ultisnips'
 Plugin 'honza/vim-snippets'
+" make it look good
+Plugin 'junegunn/goyo.vim'
+" neomutt support
+Plugin 'neomutt/neomutt.vim'
+" dissaprove indented code to far
+"Plugin 'dodie/vim-disapprove-deep-indentation'
 
 call vundle#end()            " required
 filetype plugin indent on    " required
+filetype plugin on
 
 "General
 syntax on
@@ -29,10 +40,10 @@ set ignorecase		" Do case insensitive matching
 set smartcase		" Do smart case matching
 set incsearch		" Incremental search
 set hlsearch
-set background=dark     " Fix hilight colours
 "set autowrite		" Automatically save before commands like :next and :make
 "set hidden             " Hide buffers when they are abandoned
 "set mouse=a		" Enable mouse usage (all modes)
+set laststatus=0        " Hide the useless statusbar
 
 set relativenumber
 set number
@@ -53,7 +64,6 @@ set nobackup
 au CursorHold,CursorHoldI * checktime
 au CursorHold,CursorHoldI * silent! wa
 set updatetime=2000
-filetype plugin on
 
 "Persisten-undo magic
 set undofile
@@ -110,16 +120,10 @@ let g:hardtime_default_on = 1
 let g:hardtime_showmsg = 0 
 let g:hardtime_allow_different_key = 1
 
-
-" YouCompleteMe
-let g:ycm_global_ycm_extra_conf = "~/.vim/ycm_extra_conf.py"
-let g:ycm_dont_warn_on_startup = 0
-let g:ycm_complete_in_comments = 1
-let g:ycm_complete_in_strings = 1
-let g:ycm_collect_identifiers_from_comments_and_strings = 1
-let g:ycm_filetype_blacklist = {}
-let g:ycm_key_list_select_completion   = ['<C-j>', '<C-n>', '<Down>']
-let g:ycm_key_list_previous_completion = ['<C-k>', '<C-p>', '<Up>']
+"Deoplete enable
+let g:deoplete#enable_at_startup = 1
+let g:deoplete#sources#clang#libclang_path = '/usr/lib/libclang.so'
+let g:deoplete#sources#clang#clang_header = '/usr/lib/clang/'
 
 " supertab
 let g:SuperTabDefaultCompletionType    = '<C-n>'
diff --git a/File_Manager/ranger/rifle.conf b/File_Manager/ranger/rifle.conf
index 9c19db3..256808d 100644
--- a/File_Manager/ranger/rifle.conf
+++ b/File_Manager/ranger/rifle.conf
@@ -147,6 +147,7 @@ ext xcf,                 X, flag f = gimp -- "$@"
 #-------------------------------------------
 # Documents
 #-------------------------------------------
+ext pdf, has chromium,     X, flag f = chromium --new-window --kiosk "$@"
 ext pdf, has llpp,     X, flag f = llpp "$@"
 ext pdf, has zathura,  X, flag f = zathura -- "$@"
 ext pdf, has mupdf,    X, flag f = mupdf -- "$@"
diff --git a/File_Manager/ranger/scope.sh b/File_Manager/ranger/scope.sh
index 64bab71..da7168e 100755
--- a/File_Manager/ranger/scope.sh
+++ b/File_Manager/ranger/scope.sh
@@ -16,42 +16,67 @@
 # 3    | fix width  | success. Don't reload when width changes
 # 4    | fix height | success. Don't reload when height changes
 # 5    | fix both   | success. Don't ever reload
+# 6    | image      | success. display the image $cached points to as an image preview
+# 7    | image      | success. display the file directly as an image
 
 # Meaningful aliases for arguments:
-path="$1"    # Full path of the selected file
-width="$2"   # Width of the preview pane (number of fitting characters)
-height="$3"  # Height of the preview pane (number of fitting characters)
+path="$1"            # Full path of the selected file
+width="$2"           # Width of the preview pane (number of fitting characters)
+height="$3"          # Height of the preview pane (number of fitting characters)
+cached="$4"          # Path that should be used to cache image previews
+preview_images="$5"  # "True" if image previews are enabled, "False" otherwise.
 
 maxln=200    # Stop after $maxln lines.  Can be used like ls | head -n $maxln
 
 # Find out something about the file:
 mimetype=$(file --mime-type -Lb "$path")
-extension=${path##*.}
+extension=$(/bin/echo "${path##*.}" | awk '{print tolower($0)}')
 
 # Functions:
 # runs a command and saves its output into $output.  Useful if you need
 # the return value AND want to use the output in a pipe
 try() { output=$(eval '"$@"'); }
 
-# writes the output of the previouosly used "try" command
-dump() { echo "$output"; }
+# writes the output of the previously used "try" command
+dump() { /bin/echo "$output"; }
 
 # a common post-processing function used after most commands
 trim() { head -n "$maxln"; }
 
 # wraps highlight to treat exit code 141 (killed by SIGPIPE) as success
-highlight() { command highlight "$@"; test $? = 0 -o $? = 141; }
+safepipe() { "$@"; test $? = 0 -o $? = 141; }
+
+# Image previews, if enabled in ranger.
+if [ "$preview_images" = "True" ]; then
+    case "$mimetype" in
+        # Image previews for SVG files, disabled by default.
+        ###image/svg+xml)
+        ###   convert "$path" "$cached" && exit 6 || exit 1;;
+        # Image previews for image files. w3mimgdisplay will be called for all
+        # image files (unless overriden as above), but might fail for
+        # unsupported types.
+        image/*)
+            exit 7;;
+        # Image preview for video, disabled by default.:
+        video/*)
+            ffmpegthumbnailer -i "$path" -o "$cached" -s 0 && exit 6 || exit 1;;
+    esac
+fi
 
 case "$extension" in
     # Archive extensions:
-    7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\
+    a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\
     rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip)
         try als "$path" && { dump | trim; exit 0; }
         try acat "$path" && { dump | trim; exit 3; }
         try bsdtar -lf "$path" && { dump | trim; exit 0; }
         exit 1;;
     rar)
+        # avoid password prompt by providing empty password
         try unrar -p- lt "$path" && { dump | trim; exit 0; } || exit 1;;
+    7z)
+        # avoid password prompt by providing empty password
+        try 7z -p l "$path" && { dump | trim; exit 0; } || exit 1;;
     # PDF documents:
     pdf)
         try pdftotext -l 10 -nopgbrk -q "$path" - && \
@@ -59,6 +84,9 @@ case "$extension" in
     # BitTorrent Files
     torrent)
         try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;;
+    # ODT Files
+    odt|ods|odp|sxw)
+        try odt2txt "$path" && { dump | trim; exit 5; } || exit 1;;
     # HTML Pages:
     htm|html|xhtml)
         try w3m    -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; }
@@ -70,7 +98,16 @@ esac
 case "$mimetype" in
     # Syntax highlight for text files:
     text/* | */xml)
-        try highlight --out-format=ansi "$path" && { dump | trim; exit 5; } || exit 2;;
+        if [ "$(tput colors)" -ge 256 ]; then
+            pygmentize_format=terminal256
+            highlight_format=xterm256
+        else
+            pygmentize_format=terminal
+            highlight_format=ansi
+        fi
+        try safepipe highlight --out-format=${highlight_format} "$path" && { dump | trim; exit 5; }
+        try safepipe pygmentize -f ${pygmentize_format} "$path" && { dump | trim; exit 5; }
+        exit 2;;
     # Ascii-previews of images:
     image/*)
         img2txt --gamma=0.6 --width="$width" "$path" && exit 4 || exit 1;;
diff --git a/Mail/msmtprc b/Mail/msmtprc
index 297afde..19ea47a 100644
--- a/Mail/msmtprc
+++ b/Mail/msmtprc
@@ -8,6 +8,16 @@ user v@skozl.com
 tls on
 tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
+account imperial 
+host smtp.office365.com
+port 587
+protocol smtp
+auth on
+from vasil.zlatanov15@imperial.ac.uk
+user vz215@ic.ac.uk
+tls on
+tls_starttls on
+tls_trust_file /etc/ssl/certs/ca-certificates.crt
 
 account bitmessage 
 host mail.bitmessage.ch
diff --git a/Mail/mutt/ftplugin/mail.vim b/Mail/mutt/ftplugin/mail.vim
new file mode 100644
index 0000000..9064c78
--- /dev/null
+++ b/Mail/mutt/ftplugin/mail.vim
@@ -0,0 +1,2 @@
+setl tw=72
+setl fo=aw
diff --git a/Mail/mutt/mailcap b/Mail/mutt/mailcap
index bc80a85..7daebc7 100644
--- a/Mail/mutt/mailcap
+++ b/Mail/mutt/mailcap
@@ -1,3 +1,5 @@
 application/*; mkdir -p /tmp/mutt \; cp %s /tmp/mutt \; rifle /tmp/mutt/$(basename %s) &
 text/html; chromium '%s' &; test=test -n "$DISPLAY"; needsterminal;
 text/html; w3m -I %{charset} -T text/html; copiousoutput;
+text/calendar; mutt-ical.py -i -e "vasil.zlatanov15@imperial.ac.uk" %s
+application/ics; mutt-ical.py -i -e "vasil.zlatanov15@imperial.ac.uk" %s
diff --git a/Mail/mutt/notify.sh b/Mail/mutt/notify.sh
index a628c52..d4c8d30 100755
--- a/Mail/mutt/notify.sh
+++ b/Mail/mutt/notify.sh
@@ -21,6 +21,7 @@ if [ $status -eq 0 ];then
 	touch ~/.mutt/newmail
 else 
 	xset -led 1
+	echo 'Ixlear' > /tmp/panel-fifo
 if [ -e ~/.mutt/newmail ];then 
 	rm ~/.mutt/newmail
 fi
diff --git a/Mail/muttrc b/Mail/muttrc
index b9c3369..045cb4e 100644
--- a/Mail/muttrc
+++ b/Mail/muttrc
@@ -1,14 +1,11 @@
 # GPG config 
 source ~/.mutt/crypto.rc
 
-#Load aliases
-#set alias_file=$HOME/.mutt/aliases.txt
-#source $alias_file
+set attribution="On %[!%a, %b %d, %G at %H:%M ], %n <%a> wrote:"
 
-
-#Offline Imap config
+#LocalMail config
 set mbox_type   = Maildir
-set sendmail    = /usr/bin/msmtp
+set sendmail    = msmtp
 
 set folder      = ~/.mail/
 set spoolfile   = "+dove/Inbox"
@@ -16,51 +13,26 @@ set mbox        = "+dove/Archive"
 set postponed   = "+dove/Drafts"
 set record      = "+dove/Sent"
 
-# Set maailboxes
+# Set mailboxes
 mailboxes =dove/Inbox =dove/Sent =dove/Drafts =dove/Trash =dove/Archive
 
-# Enable sidepanel
-#set sidebar_visible=yes
-#set sidebar_short_path=yes
-#set sidebar_format = "%B %?N?(%N)?%* %S"
-#set mail_check_stats = yes
-
 # Set search to notmuch
-
 bind index,pager / vfolder-from-query
 
-
-# View good/bad mails
-#    macro	index	S	"<limit>~h \"X-Spam-Flag: YES\"<enter><last-entry>"			"Show only SPAM"
-#    macro	index	s	"<limit>~h \"X-Spam-Status: No\"<enter><last-entry>"			"Hide SPAM"
-
-macro index D \
-    "<save-message>+dove/Trash<enter>" \
-    "move message to the trash"
-
-#macro index S \
-#    "<save-message>+dove/Spam<enter>" \
-#    "mark message as spam"
-
-# Dove conf
-set from = "v@skozl.com"
-set realname = "Vasil Zlatanov"
-
-# CardDav completion
+set query_command= "khard email --parsable %s"
 bind editor <Tab> complete-query
+bind editor ^T    complete
 
-# Save contact to CardDav
 macro index,pager A \
     "<pipe-message>khard add-email<return>" \
     "add the sender email address to khard"
 
-# Load from CardDav
-set query_command="khard email --parsable --search-in-source-files %s"
-
-
+# Dove conf
+set from = "v@skozl.com"
+set realname = "Vasil Zlatanov"
 
 # Change the following line to a different editor you prefer.
-set editor = "vim"
+set editor = "nvim"
 
 # Basic config, you can leave this as is
 set mail_check = 1
@@ -71,8 +43,8 @@ set message_cachedir=~/.muttlocal/cache/bodies
 set certificate_file=~/.muttlocal/certificates
 set move = no
 set include
-set sort = 'reverse-date-received'
-#set sort_aux = 'reverse-last-date-received'
+set sort = 'threads'
+set sort_aux = 'reverse-last-date-received'
 set auto_tag = yes
 ignore "Authentication-Results:"
 ignore "DomainKey-Signature:"
@@ -97,6 +69,53 @@ ignore x-no-junk-mail x-server-date x-phone x-mime-autoconverted
 ignore x-alt-email x-orcpt company division x-warning
 
 
+#----------------------------------------
+# Vi Keys
+#----------------------------------------
+
+# Moving around
+bind attach,browser,index,pager 	g noop
+bind attach,browser,index       gg  first-entry
+bind attach,browser,index       G   last-entry
+bind pager                      gg  top
+bind pager                      G   bottom
+bind pager                      k   previous-line
+bind pager                      j   next-line
+
+# Scrolling
+bind attach,browser,pager,index \CF next-page
+bind attach,browser,pager,index \CB previous-page
+bind attach,browser,pager,index \Cu half-up
+bind attach,browser,pager,index \Cd half-down
+bind browser,pager              \Ce next-line
+bind browser,pager              \Cy previous-line
+bind index                      \Ce next-line
+bind index                      \Cy previous-line
+
+# Change from address
+bind index F noop
+macro index Fi \
+	":set sendmail='msmtp -a imperial'; set from='vasil.zlatanov15@imperial.ac.uk<enter>" \
+	":set from to vasil.zlatanov15@imperial.ac.uk"
+
+macro index Fd \
+	":set sendmail='msmtp'; set from='v@skozl.com<enter>" \
+	"set from to v@skozl.com'
+
+bind index d noop
+macro index dd \
+    "<save-message>+dove/Trash<enter>" \
+    "move message to the trash"
+
+# Mail & Reply
+bind index R        group-reply
+
+# Search
+bind index,pager "n" next-unread
+bind index,pager "N" search-next
+bind index,pager \CN search-opposite
+
+
 # Gmail-style keyboard shortcuts
 macro index,pager gi "<change-folder>=dove/Inbox<enter>" "Go to inbox"
 macro index,pager ga "<change-folder>=dove/Archive<tab><enter>" "Go to all mail"
@@ -105,6 +124,11 @@ macro index,pager gj "<change-folder>=dove/Spam<enter>" "Go to spam"
 macro index,pager gt "<change-folder>=dove/Trash<enter>" "Go to trash"
 macro index,pager gd "<change-folder>=dove/Drafts<enter>" "Go to drafts"
 
+
+# Clear new email notification
+set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|"
+
+
 # Other config
 set delete 
 #set edit_headers
@@ -112,38 +136,17 @@ set fast_reply
 unset help
 set pager_stop
 
-# Bindings 
-bind index,pager "n" next-unread
-bind index,pager "N" search-next
-
-bind browser d half-down
-bind index d half-down
-bind pager d half-down
-
-bind browser u half-up
-bind index u half-up
-bind pager u half-up
-
-bind index gg       first-entry
-bind pager gg       top
-bind index G        last-entry
-bind pager G        bottom
-bind index R        group-reply
-
-
-# Write in Aliases when opening email
-#set display_filter='$HOME/.mutt/alias.sh'
+# Make hard wrap not so hard
+set text_flowed=yes
 
 # Remove + on wraps
 set markers=no
 set smart_wrap
 
-# Mutt LED notification 
-set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|"
-
 # Render silly html
 set mailcap_path 	= ~/.mutt/mailcap
 folder-hook . `rm -f /tmp/mutt/*`                        # delete tmp files created by mailcap
 auto_view text/html                                      # view html automatically
 alternative_order text/plain text/enriched text/html     # save html for last
 
+
diff --git a/Panel/lemonbar/batterymon b/Panel/lemonbar/batterymon
index 27ea7a6..9d8c74d 100755
--- a/Panel/lemonbar/batterymon
+++ b/Panel/lemonbar/batterymon
@@ -1,13 +1,14 @@
 #!/bin/sh
 while true;do
-if [ `battery -f '%i'` -lt 4 ] && ! [ -z ~/.dontshut ]; then                                                       
-touch ~/.dontshut
-zenity  --question --title "Battery"  --text "Battery if pretty fucking low, go to sleep?"                                                
-if [ $? -ne 1 ];then
-pm-suspend
-fi
-else
-rm ~/.dontshut
-fi
+	if [ `battery -f '%i'` -lt 4 ] && ! [ -z ~/.dontshut ]; then
+		touch ~/.dontshut
+		zenity  --question --title "Battery"  --text "Battery if pretty fucking low, go to sleep?"
+		if [ $? -ne 1 ];then
+			pm-suspend
+		fi
+	else
+	if [ -z ~/.dontshut ]
+		rm ~/.dontshut
+	fi
 sleep 180;
 done
diff --git a/Panel/lemonbar/music b/Panel/lemonbar/music
index d9e1d45..0ee2611 100755
--- a/Panel/lemonbar/music
+++ b/Panel/lemonbar/music
@@ -15,6 +15,6 @@ echo "K`mpc volume -h 127.0.0.1 | perl -pe 's/^volume://' | perl -pe 's/%$//' |
 mpc -h 127.0.0.1 idle > /dev/null
 if [ $? -ne 0 ];then
 echo 'mpd not alive';
-sleep 30;
+sleep 300;
 fi
 done
diff --git a/Panel/lemonbar/panel_bar b/Panel/lemonbar/panel_bar
index 40a2b27..64eed1d 100755
--- a/Panel/lemonbar/panel_bar
+++ b/Panel/lemonbar/panel_bar
@@ -1,7 +1,5 @@
 #! /bin/sh
 
-num_mon=$(bspc query -M | wc -l)
-
 . ./panel_colors
 . ./icons
 while read -r line ; do
@@ -45,7 +43,7 @@ while read -r line ; do
 			;;
 		K*)
 			# volume output
-			musicvol="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_MUSIC} ${line#?} %{B-}%{F-}"
+			#musicvol="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_MUSIC} ${line#?} %{B-}%{F-}"
 			;;
 	
 	
@@ -115,5 +113,5 @@ while read -r line ; do
 #						;;
 	esac
 #	printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos}             "
-	printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${notification}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}"
+	printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${notification}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${battery}${time_infos}"
 done
diff --git a/Panel/lemonbar/profile b/Panel/lemonbar/profile
index 3a2f726..fe9d7b1 100755
--- a/Panel/lemonbar/profile
+++ b/Panel/lemonbar/profile
@@ -1,8 +1,8 @@
 #!/bin/sh
 PANEL_FIFO=/tmp/panel-fifo
-PANEL_HEIGHT=24
+PANEL_HEIGHT=40
 
-FONT_FONT="fixed"
-ICON_FONT="FontAwesome-9"
+FONT_FONT="DejaVuSans-10"
+ICON_FONT="FontAwesome-10"
 
 export PANEL_FIFO PANEL_HEIGHT PANEL_FONT_FAMILY FONT_FONT ICON_FONT 
diff --git a/Panel/lemonbar/windows b/Panel/lemonbar/windows
index 108eeac..4af5a5c 100755
--- a/Panel/lemonbar/windows
+++ b/Panel/lemonbar/windows
@@ -1,3 +1,3 @@
 #!/bin/sh
 echo 'Wclear' > /tmp/panel-fifo
-ratpoison -c 'windows %s%n %t' | while read line;do echo "${line}" | cut -c -25 > /tmp/panel-fifo && sleep 0.004;done                   
+ratpoison -c 'windows %s%n %t' | cut -c -25 > /tmp/panel-fifo 
diff --git a/Shell/bash_aliases b/Shell/bash_aliases
index 3e60c1e..6dad212 100644
--- a/Shell/bash_aliases
+++ b/Shell/bash_aliases
@@ -1,11 +1,16 @@
 #if you wanna change timezone just copy one of /usr/share/zoneinfo/place to /etc/localtime
-# awesome perl echo 'one two three'| perl -lne 'print $2 if /one(.*)three/' 
 
-alias sp='spotify &e'
 
 #bauerbill
 alias bb='baurebill'
 
+alias mutt='neomutt'
+alias sp='spotify --force-device-scale-factor=2 &! exit'
+alias wa='chromium --app=https://web.whatsapp.com'
+alias serial='screen /dev/$(basename $(ls /dev/ttyAC*|tail -1)) 9600n'
+
+# bauerbill
+alias bb='bb-wrapper'
 #ip
 alias ip='ip -c'
 
@@ -17,8 +22,9 @@ alias ,.='!!'
 
 # mpv 
 alias mpvl='mpv --ytdl-format=43'
+alias mpvh='mpv --ytdl-format=137+251'
+alias mpv="mpv --ytdl-format 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'"
 
-#Micrcontroller 
 alias serial='micronucleus --run ~/Sync/Programming/serial.hex'
 
 alias yt='mpsyt'
@@ -30,10 +36,7 @@ alias remouse='sudo modprobe -r bcm5974'
 alias enmouse='sudo modprobe bcm5974 && ~/bin/mousefix'
 
 # Notes
-alias physics='vim ~/Sync/Notes/Physics/physics.txt'
-alias chemistry='vim ~/Sync/Notes/Chemistry/chemistry.txt'
-alias english='vim ~/Sync/Notes/English/english.txt'
-alias swedish='vim ~/Sync/Notes/Swedish/swedish.txt'
+alias notes='cd ~/Sync/Notes/EE2'
 
 #quiet
 alias quiet='sudo hdparm -y /dev/sda'
@@ -60,7 +63,9 @@ alias py='python3'
 alias scan='iwlist wlp2s0 scan'
 alias connect='sudo iwconfig wlan0 essid'
 alias home='cd /home/vasko'
-alias l='ls'
+alias l='ls --color=auto'
+alias ls='ls --color=auto'
+alias grep='grep --color=auto'
 alias d='ls'
 alias dm='ls | more'
 alias n='clear'
@@ -77,7 +82,8 @@ alias o='less'
 alias g='wget'
 alias x='tar -xvzf'
 alias a='tar -cvzf'
-alias i='yaourt -S'
+alias i='bb -S'
+alias ia='bb -S --aur'
 alias p='sudo pacman -Rs'
 alias clean='sudo pacman -Rsn $(pacman -Qdtq)'
 alias t='optirun'
@@ -89,7 +95,7 @@ alias iso='dd if=/dev/cdrom of=~/cdrom_image.iso'
 alias tglxspheres='vblank_mode=0 optirun -vv /opt/VirtualGL/bin/glxspheres64'
 alias pglxspheres='vblank_mode=0 primusrun /opt/VirtualGL/bin/glxspheres64'
 alias httpserve='python -m SimpleHTTPServer'
-alias pi='ping -4 google.com'
+alias pi='ping -4 skozl.com'
 alias pl='ping 8.8.8.8'
 alias def='sdcv'
 
@@ -180,4 +186,3 @@ alias matb='vim ~/Sync/Notes/EE2/Mathematics-2b.md                       '
 alias matc='vim ~/Sync/Notes/EE2/Mathematics-2c.md                       '
 alias pow='vim ~/Sync/Notes/EE2/Power-Engineering.md                    '
 alias sig='vim ~/Sync/Notes/EE2/Signals-and-Linear-Systems.md           '
-
diff --git a/Shell/zshrc b/Shell/zshrc
index 6568d91..8cde6c1 100644
--- a/Shell/zshrc
+++ b/Shell/zshrc
@@ -9,7 +9,7 @@ zstyle ':completion:*' menu select
 #zstyle ':completion:*' format '%BCompleting %d%b'
 # End of lines configured by zsh-newuser-install
 # The following lines were added by compinstall
-zstyle :compinstall filename '/home/vasko/.zshrc'
+zstyle :compinstall filename '/home/vsz/.zshrc'
 
 autoload -Uz compinit
 compinit
@@ -27,7 +27,7 @@ export PATH="$HOME/bin:$PATH"
 export EDITOR="vim"
 export LD_LIBRARY_PATH=/usr/local/lib
 
-PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}☢ "
+PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}▶ "
 #RPROMPT="[%{$fg_no_bold[yellow]%}%?%{$reset_color%}]"
 
 
@@ -57,23 +57,23 @@ export ANDROID_HOME=/opt/android-sdk
 
 
 
-case $TERM in
-  (*rxvt*)
-
-    # Write some info to terminal title.
-    # This is seen when the shell prompts for input.
-    function precmd {
-    print -Pn "\e]0;%(1j,%j job%(2j|s|); ,)%1~\a"
-    #timeout --signal=KILL 1s ~/dotfiles/Panel/lemonbar/windows 
-    }
-    # Write command and args to terminal title.
-    # This is seen while the shell waits for a command to complete.
-    function preexec {
-    printf "\033]0;%s\a" "$1"
-    }
-
-  ;;
-esac
+#case $TERM in
+#  (*rxvt*)
+#
+#    # Write some info to terminal title.
+#    # This is seen when the shell prompts for input.
+#    function precmd {
+#    print -Pn "\e]0;%(1j,%j job%(2j|s|); ,)%1~\a"
+#    #timeout --signal=KILL 1s ~/dotfiles/Panel/lemonbar/windows 
+#    }
+#    # Write command and args to terminal title.
+#    # This is seen while the shell waits for a command to complete.
+#    function preexec {
+#    printf "\033]0;%s\a" "$1"
+#    }
+#
+#  ;;
+#esac
 
 ## Fancy sysinfo
 #~/bin/sysinfo
diff --git a/Window_Manager/ratpoison/firesend b/Window_Manager/ratpoison/firesend
deleted file mode 100755
index 70ee78e..0000000
--- a/Window_Manager/ratpoison/firesend
+++ /dev/null
@@ -1,2 +0,0 @@
-#!/bin/bash
-vimb $@ > /dev/null 2>&1 &
diff --git a/Window_Manager/ratpoison/py/colorz.pyc b/Window_Manager/ratpoison/py/colorz.pyc
index 2e77075..586db45 100644
--- a/Window_Manager/ratpoison/py/colorz.pyc
+++ b/Window_Manager/ratpoison/py/colorz.pyc
diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf
index 8b00a30..702ab68 100644
--- a/Window_Manager/ratpoison/ratpoisonrc.conf
+++ b/Window_Manager/ratpoison/ratpoisonrc.conf
@@ -8,7 +8,8 @@ escape grave
 definekey top s-grave meta
 definekey top Arabic_dammatan meta
 
-#set quiet 1
+# Surpress 'Current Frame'
+set framemsgwait -1
 
 set historyexpansion 1
 
@@ -49,7 +50,7 @@ exec xsetroot -cursor_name left_ptr
 #exec nitrogen --restore
 
 #Border & Padding
-alias showpanel set padding 0 24 0 0
+alias showpanel set padding 0 40 0 0
 alias hidepanel set padding 0 0 0 0
 showpanel
 
@@ -121,15 +122,8 @@ bind W exec sudo connman_dmenu
 bind g exec ~/bin/safeimg
 bind P exec ~/bin/safepaste
 
-alias bordtoggle exec ~/.config/ratpoison/bordtoggle
-alias bordscript exec ~/.config/ratpoison/borderscript
 alias paneltoggle exec ~/.config/ratpoison/paneltoggle
 
-
-
-
-#addhook key bordscript
-
 definekey top s-b bordtoggle
 definekey top s-p paneltoggle
 
@@ -141,7 +135,7 @@ alias cont exec pkill -CONT
 
 
 # b : Open url
-alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 vimb
+alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 chromium-dev --start-fullscreen  --new-window https://google.com
 alias browse colon browse_cmd 
 bind b browse
 # B : open a new firefox tab and browse to the X clipboard selection
@@ -167,7 +161,7 @@ definekey top s-h exec ~/.config/vimb/history-search
 #definekey top s-g exec gvim
 #definekey top s-l exec libreoffice
 
-definekey top s-m exec mbsync -a
+definekey top s-m exec mbsync -a && notmuch new && ratpoison -c 'echo Mail Synced'
 
 #-----------------------------------------------------
 # Voice control
@@ -177,8 +171,6 @@ definekey top KP_Enter exec ~/Dropbox/speech/run-duplex.sh
 #-------------------------------------------------------------
 # Volume Control
 #-------------------------------------------------------------
-# Up
-#alias volup exec amixer -D pulse -q set Master 5+ && ratpoison -c "echo `$HOME/.config/ratpoison/volind`" & volume -f 'V%i' > /tmp/panel-fifo
 alias volup exec pactl set-sink-volume `pactl list sinks short | perl -ne '/^(\d*)/; $x=$1; END { print $x }'` +2% && volume -f 'V%i' > /tmp/panel-fifo
 alias voldown exec pactl set-sink-volume `pactl list sinks short | perl -ne '/^(\d*)/; $x=$1; END { print $x }'` -2% && volume -f 'V%i' > /tmp/panel-fifo
 
@@ -195,16 +187,13 @@ definekey top XF86AudioStop exec dbus-send --print-reply --dest=org.mpris.MediaP
 definekey top XF86AudioNext exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Next 
 definekey top XF86AudioPrev exec dbus-send --print-reply --dest=org.mpris.MediaPlayer2.spotify /org/mpris/MediaPlayer2 org.mpris.MediaPlayer2.Player.Previous 
 
-# Down
-#alias voldown exec amixer -D pulse -q set Master 5- && ratpoison -c "echo `$HOME/.config/ratpoison/volind`" & volume -f 'V%i' > /tmp/panel-fifo
-
 definekey top XF86AudioLowerVolume voldown
 definekey top M-XF86AudioLowerVolume spvoldown
 definekey top s-Next voldown
 definekey top s-a voldown
 
 # Mute
-alias voltoggle exec amixer -D pulse set Master toggle && ratpoison -c "echo Sound: `amixer get Master|awk '/Mono:/ {print $6}'`"
+alias voltoggle exec amixer set Master toggle && ratpoison -c "echo Sound: `amixer -D sysdefault get Master|awk '/Mono:/ {print $6}'`"
 
 definekey top XF86AudioMute voltoggle
 definekey top s-Pause voltoggle
@@ -212,8 +201,8 @@ definekey top s-Pause voltoggle
 #-------------------------------------------------------------
 # Brightness Control
 #-------------------------------------------------------------
-alias brightup exec xbacklight -inc 2
-alias brightdown exec xbacklight -dec 2
+alias brightup exec light -A 2
+alias brightdown exec light -U 2
 
 definekey top XF86MonBrightnessUp brightup
 definekey top XF86MonBrightnessDown brightdown
diff --git a/Xinit/Xdefaults b/Xinit/Xdefaults
index 0f56be6..e84e05f 100644
--- a/Xinit/Xdefaults
+++ b/Xinit/Xdefaults
@@ -2,7 +2,7 @@
 ! Xft settings
 !-------------------------------------------------------------------------------
  
-Xft.dpi: 96
+Xft.dpi: 161
 Xft.antialias: true
 Xft.rgba: rgb
 Xft.hinting: true
@@ -18,10 +18,10 @@ URxvt.lineSpace: 0
  
 ! Fonts
 URxvt.allow_bold: true
-URxvt.font: xft:DejaVu Sans Mono:pixelsize=11
+URxvt.font: xft:DejaVu Sans Mono:pixelsize=22
  
 ! Fix font space
-URxvt*letterSpace: -1
+URxvt*letterSpace: -2
  
 ! Scrollbar
 URxvt.scrollStyle: rxvt
@@ -33,7 +33,7 @@ URxvt.matcher.button: 1
 URxvt.urlLauncher: vimb
  
 ! Cursor
-URxvt.cursorBlink: true
+URxvt.cursorBlink: false
 URxvt.cursorColor: #657b83
 URxvt.cursorUnderline: false
 
@@ -48,5 +48,4 @@ URxvt.keysym.M-s: perl:keyboard-select:search
 ! M-u to select open copy links
 !URxvt.perl-ext-common: ...,url-select
 URxvt.keysym.M-u: perl:url-select:select_next
-URxvt.url-select.launcher: /home/vasko/.tools/firesend
-
+URxvt.url-select.launcher: chromium-dev
diff --git a/Xinit/Xresources b/Xinit/Xresources
index 3fa2ad8..fe0210e 100644
--- a/Xinit/Xresources
+++ b/Xinit/Xresources
@@ -13,7 +13,7 @@ urxvt.scrollBar :false
 xterm.scrollBar :false
 
 xterm*faceName: DejaVu Sans Mono Book
-xterm*faceSize: 11
+xterm*faceSize: 16
 
 ! Enable copy paste
 xterm*metaSendsEscape: true
diff --git a/Xinit/xinitrc b/Xinit/xinitrc
index 5b6cec9..ccad526 100755
--- a/Xinit/xinitrc
+++ b/Xinit/xinitrc
@@ -15,7 +15,7 @@ fi
 xsetroot -cursor_name left_ptr 
 
 # An2linux
-~/bin/an2linux.py &
+#~/bin/an2linux.py &
 statnot ~/dotfiles/Panel/statnot/config &
 
 # Background
@@ -24,6 +24,10 @@ statnot ~/dotfiles/Panel/statnot/config &
 # Init clipboard
 ~/.tools/clipboard init
 
+# Toutchpad config
+xinput --set-prop 12 "libinput Natural Scrolling Enabled" 1
+xinput --set-prop 12 "libinput Tapping Enabled" 1
+
 # Keyboard bindings
 xset r 64
 xset r 133
@@ -32,13 +36,15 @@ xset m 0 0
 xset -b
 
 # Launch locking program
-xautolock -detectsleep -locker '~/.tools/lock' -time 11 -corners 0-00 &
+#xautolock -detectsleep -locker '~/.tools/lock' -time 11 -corners 0-00 &
 
 # Load xterm colors
 xrdb -merge ~/.Xresources
 xrdb -merge ~/.Xdefaults
 
 # Automount
-#udiskie -N &
+udiskie -N  -T -q --no-appindicator -a &
 
+xrandr --dpi 161
+compton --no-fading-openclose --daemon
 ratpoison