Commit: be5debb100c81936037120f8ba0e8dd45de4db92 - dots (git)

Commit MetaInfo

• Revisão: be5debb100c81936037120f8ba0e8dd45de4db92 (tree)
• Hora: 2019-07-15 08:38:42
• Autor: creio <mailcreio@gmai...>
• Commiter: creio

Mensagem de Log

2019.07.15 Update pisdata thema

Mudança Sumário

• modified: .Xresources
• modified: .alias_zsh
• modified: .bin/xfce-theme.sh
• modified: .colors/ll
• modified: .colors/ln
• add: .colors/materia
• modified: .config/Thunar/accels.scm
• modified: .config/dconf/user
• modified: .config/i3/config
• modified: .config/mpd/pid
• modified: .config/mpd/state
• modified: .config/openbox/autostart
• modified: .config/polybar/duicfg
• modified: .config/qt5ct/qt5ct.conf
• modified: .config/ranger/history
• modified: .config/ranger/rc.conf
• modified: .config/sublime-text-3/Packages/User/Package Control.last-run
• modified: .config/sublime-text-3/Packages/User/Package Control.merged-ca-bundle
• modified: .config/sublime-text-3/Packages/User/Package Control.sublime-settings
• modified: .config/sublime-text-3/Packages/User/Preferences.sublime-settings
• add: .config/sublime-text-3/Packages/User/SublimeCodeIntel.sublime-settings
• modified: .config/sublime-text-3/Packages/User/Terminal.sublime-settings
• add: .config/sublime-text-3/Packages/User/snippet/sh-sn.sublime-snippet
• modified: .config/tint2/my_ob.tint2rc
• add: .config/tint2/my_ob.tint2rc.backup.1562873320
• add: .config/tint2/my_ob.tint2rc.backup.1562873696
• modified: .config/tint2/tray.tint2rc
• add: .config/tint2/tray.tint2rc.backup.1562874061
• add: .config/tint2/tray.tint2rc.backup.1562874413
• modified: .config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
• modified: .dotsrc
• modified: .tmux.conf
• modified: .zshrc
• delete: root/etc/pulse/daemon.conf
• add: root/etc/pulse/default.pa

Diff

--- a/.Xresources
+++ b/.Xresources
@@ -6,7 +6,7 @@ Xft.autohint: false
 Xft.hintstyle: hintslight
 Xft.lcdfilter: lcddefault
 
-#include ".colors/ln"
+#include ".colors/materia"
 
 !URxvt.font: -*-rissole-*
 URxvt.font: xft:Hack Nerd Font Mono:size=9
@@ -48,4 +48,4 @@ URxvt.keysym.Control-Left:  \033[1;5D
 URxvt.keysym.Control-Right: \033[1;5C
 
 URxvt*transparent:false
-URxvt*depth: 32
\ No newline at end of file
+URxvt*depth: 32

--- a/.alias_zsh
+++ b/.alias_zsh
@@ -26,54 +26,54 @@ alias run="dmenu_run -i -x 30 -y 30 -l 10 -w 400 -p 'Search:' -fn 'Clear Sans Me
 
 # blur img: blur 4 .wall/wl3.jpg blur.jpg
 function blur() {
-	convert -filter Gaussian -blur 0x$1 $2 $3
+  convert -filter Gaussian -blur 0x$1 $2 $3
 }
 
 function tbg() {
-	urxvt -bg '[0]red' -b 0 -depth 32 +sb -name urxvt_bg &
+  urxvt -bg '[0]red' -b 0 -depth 32 +sb -name urxvt_bg &
 }
 
 # fzf
 zzh() {
-	du -a ~/ | awk '{print $2}' | fzf | xargs -r $EDITOR
+  du -a ~/ | awk '{print $2}' | fzf | xargs -r $EDITOR
 }
 zz() {
-	du -a . | awk '{print $2}' | fzf | xargs -r $EDITOR
+  du -a . | awk '{print $2}' | fzf | xargs -r $EDITOR
 }
 
 # зависимость source-highlight
 hcat () {
-	/usr/bin/src-hilite-lesspipe.sh "$1" | less -m -N
+  /usr/bin/src-hilite-lesspipe.sh "$1" | less -m -N
 }
 
 # share vbox В локальной машине mkdir vboxshare
 # в виртуалке uid={имя пользователя} git={группа}
 vboxshare () {
-	mkdir vboxshare
-	sudo mount -t vboxsf -o rw,uid=1000,gid=1000 vboxshare vboxshare
-	# sudo mount -t vboxsf -o rw,uid=st,gid=users vboxshare vboxshare
+  mkdir vboxshare
+  sudo mount -t vboxsf -o rw,uid=1000,gid=1000 vboxshare vboxshare
+  # sudo mount -t vboxsf -o rw,uid=st,gid=users vboxshare vboxshare
 }
 
 # aur pkg
 aget () {
-	git clone https://aur.archlinux.org/"$1".git
-	# curl -fO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz
-	cd $1
-	makepkg -s
-	cd ..
+  git clone https://aur.archlinux.org/"$1".git
+  # curl -fO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz
+  cd $1
+  makepkg -s
+  cd ..
 }
 
 # build and install pkg from aur
 abuild () {
-	cd ~/.build
-	git clone https://aur.archlinux.org/"$1".git
-	# curl -fO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz
-	# tar -xvf $1.tar.gz
-	cd $1
-	makepkg -si --skipinteg
-	cd ~
-	# rm -rf ~/.build/$1 ~/.build/$1.tar.gz
-	rm -rf ~/.build/$1
+  cd ~/.build
+  git clone https://aur.archlinux.org/"$1".git
+  # curl -fO https://aur.archlinux.org/cgit/aur.git/snapshot/"$1".tar.gz
+  # tar -xvf $1.tar.gz
+  cd $1
+  makepkg -si --skipinteg
+  cd ~
+  # rm -rf ~/.build/$1 ~/.build/$1.tar.gz
+  rm -rf ~/.build/$1
 }
 
 alias neoa="neofetch --ascii ~/.config/neofetch/mario"
@@ -86,11 +86,11 @@ alias neo="neofetch --w3m ~/.config/neofetch/cn.jpg"
 # alias wtr="curl 'wttr.in/Москва?M&lang=ru' | sed -n '1,17p'"
 # alias wtr="curl 'wttr.in/?M1npQ&lang=ru'"
 wtr () {
-	# curl "wttr.in/?M$1npQ&lang=ru"
-	curl "wttr.in/Gomel?M$1npQ&lang=ru"
+  # curl "wttr.in/?M$1npQ&lang=ru"
+  curl "wttr.in/Gomel?M$1npQ&lang=ru"
 }
 wts () {
-	curl "wttr.in/$1?M&lang=ru"
+  curl "wttr.in/$1?M&lang=ru"
 }
 alias moon="curl 'wttr.in/Moon'"
 
@@ -109,8 +109,8 @@ alias .l="dirs -v"
 
 alias mk="mkdir"
 mkcd () {
-	mkdir -p "$1"
-	cd "$1"
+  mkdir -p "$1"
+  cd "$1"
 }
 
 alias /="cd /"
@@ -130,12 +130,12 @@ alias gl="cd /media/files/gitlab"
 alias glc="cd /media/files/gitlab/creio"
 
 gc () {
-	git clone "$1"
+  git clone "$1"
 }
 function gcj () {
-	git clone "$1"
-	cd "$2"
-	# $EDITOR .
+  git clone "$1"
+  cd "$2"
+  # $EDITOR .
 }
 alias gi="git init"
 alias gs="git status"
@@ -143,8 +143,8 @@ alias glog="git log --stat --pretty=oneline --graph --date=short"
 alias gg="gitg &"
 alias gad="git add --all"
 gac () {
-	git add --all
-	git commit -am "$1"
+  git add --all
+  git commit -am "$1"
 }
 alias gr="git remote"
 alias gf="git fetch"
@@ -159,28 +159,28 @@ alias torc="$BROWSER --proxy-server='socks://127.0.0.1:9050' &"
 # full screen flags -fs
 alias yt="youtube-viewer"
 ytv () {
-	youtube-viewer "$1"
+  youtube-viewer "$1"
 }
 
 # youtube-dl --ignore-errors -o '~/Видео/youtube/%(playlist)s/%(title)s.%(ext)s' https://www.youtube.com/playlist?list=PL-UzghgfytJQV-JCEtyuttutudMk7
 # Загрузка Видео ~/Videos или ~/Видео
 # Пример: dlv https://www.youtube.com/watch?v=gBAfejjUQoA
 ytv () {
-	youtube-dl --ignore-errors -o '~/Videos/youtube/%(title)s.%(ext)s' "$1"
+  youtube-dl --ignore-errors -o '~/Videos/youtube/%(title)s.%(ext)s' "$1"
 }
 # dlp https://www.youtube.com/playlist?list=PL-UzghgfytJQV-JCEtyuttutudMk7
 ytp () {
-	youtube-dl --ignore-errors -o '~/Videos/youtube/%(playlist)s/%(title)s.%(ext)s' "$1"
+  youtube-dl --ignore-errors -o '~/Videos/youtube/%(playlist)s/%(title)s.%(ext)s' "$1"
 }
 
 # Загрузка аудио ~/Music или ~/Музыка
 # Пример: mp3 https://www.youtube.com/watch?v=gBAfejjUQoA
 mp3 () {
-	youtube-dl --ignore-errors -f bestaudio --extract-audio --audio-format mp3 --audio-quality 0 -o '~/Music/youtube/%(title)s.%(ext)s' "$1"
+  youtube-dl --ignore-errors -f bestaudio --extract-audio --audio-format mp3 --audio-quality 0 -o '~/Music/youtube/%(title)s.%(ext)s' "$1"
 }
 # mp3p https://www.youtube.com/watch?v=-F7A24f6gNc&list=RD-F7A24f6gNc
 mp3p () {
-	youtube-dl --ignore-errors -f bestaudio --extract-audio --audio-format mp3 --audio-quality 0 -o '~/Music/youtube/%(playlist)s/%(title)s.%(ext)s' "$1"
+  youtube-dl --ignore-errors -f bestaudio --extract-audio --audio-format mp3 --audio-quality 0 -o '~/Music/youtube/%(playlist)s/%(title)s.%(ext)s' "$1"
 }
 
 alias porn="mpv 'http://www.pornhub.com/random'"
@@ -189,15 +189,15 @@ alias mvis="ncmpcpp -S visualizer"
 alias m="ncmpcpp"
 
 pf () {
-	peerflix "$1" --mpv
+  peerflix "$1" --mpv
 }
 alias rss="newsboat"
 # download web site
 wgetw () {
-	wget -rkx "$1"
+  wget -rkx "$1"
 }
 iso () {
-	sudo dd bs=4M if=/home/st/files/linux/distr/"$1".iso of=/dev/"$2" status=progress && sync
+  sudo dd bs=4M if=/home/st/files/linux/distr/"$1".iso of=/dev/"$2" status=progress && sync
 }
 
 
@@ -253,51 +253,51 @@ alias pipr="pip install -r requirements.txt"
 # распаковать архив не указывая тип распаковщика
 function ex {
  if [ -z "$1" ]; then
-		# display usage if no parameters given
-		echo "Использование: ex <path/file_name>.<zip|rar|bz2|gz|tar|tbz2|tgz|Z|7z|xz|ex|tar.bz2|tar.gz|tar.xz>"
+    # display usage if no parameters given
+    echo "Использование: ex <path/file_name>.<zip|rar|bz2|gz|tar|tbz2|tgz|Z|7z|xz|ex|tar.bz2|tar.gz|tar.xz>"
  else
-		if [ -f "$1" ] ; then
-				NAME=${1%.*}
-				#mkdir $NAME && cd $NAME
-				case "$1" in
-					*.tar.bz2)   tar xvjf ./"$1"    ;;
-					*.tar.gz)    tar xvzf ./"$1"    ;;
-					*.tar.xz)    tar xvJf ./"$1"    ;;
-					*.lzma)      unlzma ./"$1"      ;;
-					*.bz2)       bunzip2 ./"$1"     ;;
-					*.rar)       unrar x -ad ./"$1" ;;
-					*.gz)        gunzip ./"$1"      ;;
-					*.tar)       tar xvf ./"$1"     ;;
-					*.tbz2)      tar xvjf ./"$1"    ;;
-					*.tgz)       tar xvzf ./"$1"    ;;
-					*.zip)       unzip ./"$1"       ;;
-					*.Z)         uncompress ./"$1"  ;;
-					*.7z)        7z x ./"$1"        ;;
-					*.xz)        unxz ./"$1"        ;;
-					*.exe)       cabextract ./"$1"  ;;
-					*)           echo "ex: '$1' - Не может быть распакован" ;;
-				esac
-		else
-				echo "'$1' - не является допустимым файлом"
-		fi
+    if [ -f "$1" ] ; then
+        NAME=${1%.*}
+        #mkdir $NAME && cd $NAME
+        case "$1" in
+          *.tar.bz2)   tar xvjf ./"$1"    ;;
+          *.tar.gz)    tar xvzf ./"$1"    ;;
+          *.tar.xz)    tar xvJf ./"$1"    ;;
+          *.lzma)      unlzma ./"$1"      ;;
+          *.bz2)       bunzip2 ./"$1"     ;;
+          *.rar)       unrar x -ad ./"$1" ;;
+          *.gz)        gunzip ./"$1"      ;;
+          *.tar)       tar xvf ./"$1"     ;;
+          *.tbz2)      tar xvjf ./"$1"    ;;
+          *.tgz)       tar xvzf ./"$1"    ;;
+          *.zip)       unzip ./"$1"       ;;
+          *.Z)         uncompress ./"$1"  ;;
+          *.7z)        7z x ./"$1"        ;;
+          *.xz)        unxz ./"$1"        ;;
+          *.exe)       cabextract ./"$1"  ;;
+          *)           echo "ex: '$1' - Не может быть распакован" ;;
+        esac
+    else
+        echo "'$1' - не является допустимым файлом"
+    fi
 fi
 }
 
 # Упаковка в архив командой pk 7z /что/мы/пакуем имя_файла.7z
 function pk () {
-	if [ $1 ] ; then
-		case $1 in
-			tbz)       tar cjvf $2.tar.bz2 $2      ;;
-			tgz)       tar czvf $2.tar.gz  $2       ;;
-			txz)       tar -caf $2.tar.xz  $2       ;;
-			tar)       tar cpvf $2.tar  $2       ;;
-			bz2)       bzip $2 ;;
-			gz)        gzip -c -9 -n $2 > $2.gz ;;
-			zip)       zip -r $2.zip $2   ;;
-			7z)        7z a $2.7z $2    ;;
-			*)         echo "'$1' не может быть упакован с помощью pk()" ;;
-		esac
-	else
-		echo "'$1' не является допустимым файлом"
-	fi
-}
\ No newline at end of file
+  if [ $1 ] ; then
+    case $1 in
+      tbz)       tar cjvf $2.tar.bz2 $2      ;;
+      tgz)       tar czvf $2.tar.gz  $2       ;;
+      txz)       tar -caf $2.tar.xz  $2       ;;
+      tar)       tar cpvf $2.tar  $2       ;;
+      bz2)       bzip $2 ;;
+      gz)        gzip -c -9 -n $2 > $2.gz ;;
+      zip)       zip -r $2.zip $2   ;;
+      7z)        7z a $2.7z $2    ;;
+      *)         echo "'$1' не может быть упакован с помощью pk()" ;;
+    esac
+  else
+    echo "'$1' не является допустимым файлом"
+  fi
+}

--- a/.bin/xfce-theme.sh
+++ b/.bin/xfce-theme.sh
@@ -27,7 +27,7 @@ sublime_colorscheme_dark="Packages\\/One Dark Color Scheme\\/One Dark.tmTheme"
 xresources_conf="$HOME/.Xresources"
 
 xresources_color_light="colors\\/ll"
-xresources_color_dark="colors\\/ln"
+xresources_color_dark="colors\\/materia"
 
 # rofi conf
 rofi_conf="$HOME/.config/rofi/config"
@@ -54,7 +54,7 @@ if [[ "$de_theme" == "$PREF_LIGHT_THEME" ]]; then
 
     gsettings set org.gnome.desktop.interface gtk-theme $PREF_DARK_THEME
     gsettings set org.gnome.desktop.wm.preferences button-layout '"menu:"'
-    
+
     sed -i -e "s/$sublime_colorscheme_light/$sublime_colorscheme_dark/g" "$sublime_conf"
     sed -i -e "s/$sublime_theme_light.sublime-theme/$sublime_theme_dark.sublime-theme/g" "$sublime_conf"
 
@@ -82,7 +82,7 @@ else
 
     gsettings set org.gnome.desktop.interface gtk-theme $PREF_LIGHT_THEME
     gsettings set org.gnome.desktop.wm.preferences button-layout '"menu:"'
-    
+
     sed -i -e "s/$sublime_colorscheme_dark/$sublime_colorscheme_light/g" "$sublime_conf"
     sed -i -e "s/$sublime_theme_dark.sublime-theme/$sublime_theme_light.sublime-theme/g" "$sublime_conf"
 
@@ -92,8 +92,8 @@ else
     kill -1 $(pidof urxvtd)
 
     sed -i -e "s/$PREF_DARK_ICO/$PREF_LIGHT_ICO/g" "$rofi_conf"
-    
+
     sed -i -e "s/$br_color_dark/$br_color_light/g" "$gtk_css"
 
     sed -i -e "s/icon_theme=$PREF_DARK_ICO/icon_theme=$PREF_LIGHT_ICO/g" "$qt_conf"
-fi
\ No newline at end of file
+fi

--- a/.colors/ll
+++ b/.colors/ll
@@ -44,4 +44,4 @@ rofi.color-window:  #f2f3f4, #ffffff, #fafafa
 ! Property Name     BG       FG       BG-alt   Head-BG  Head-FG
 rofi.color-normal:  #f2f3f4, #9c9c9c, #f2f3f4, #f2f3f4, #0f0f0f
 rofi.color-active:  #f2f3f4, #9c9c9c, #f2f3f4, #f2f3f4, #0f0f0f
-rofi.color-urgent:  #f2f3f4, #9c9c9c, #f2f3f4, #f2f3f4, #0f0f0f
\ No newline at end of file
+rofi.color-urgent:  #f2f3f4, #9c9c9c, #f2f3f4, #f2f3f4, #0f0f0f

--- a/.colors/ln
+++ b/.colors/ln
@@ -1,18 +1,18 @@
 *.background:    #111113
 *.foreground:    #FDFDFD
-*.cursorColor:  #C574DD
-*.border:       #111113
+*.cursorColor:   #C574DD
+*.border:        #111113
 
-*.color0:	#282A36
-*.color1:	#F37F97
-*.color2:	#5ADECD
-*.color3:	#F2A272
-*.color4:	#8897F4
-*.color5:	#C574DD
-*.color6:	#79E6F3
-*.color7:	#FDFDFD
-*.color8:	#414458
-*.color9:	#FF4971
+*.color0:	  #282A36
+*.color1:	  #F37F97
+*.color2:	  #5ADECD
+*.color3:	  #F2A272
+*.color4:	  #8897F4
+*.color5:	  #C574DD
+*.color6:	  #79E6F3
+*.color7:	  #FDFDFD
+*.color8:	  #414458
+*.color9:	  #FF4971
 *.color10:	#18E3C8
 *.color11:	#FF8037
 *.color12:	#556FFF
@@ -25,4 +25,4 @@ rofi.color-normal: #282c37,  #d9e1e8,  #282c37,  #5A74CA,  #282c37
 rofi.color-urgent: #282c37,  #d9e1e8,  #282c37,  #5A74CA,  #282c37
 rofi.color-active: #282c37,  #d9e1e8,  #282c37,  #5A74CA,  #282c37
 !                  ´background´, ´border´
-rofi.color-window: #282c37,      #75444A57
\ No newline at end of file
+rofi.color-window: #282c37,      #75444A57

--- /dev/null
+++ b/.colors/materia
@@ -0,0 +1,29 @@
+*.background:    #1D2026
+*.foreground:    #EEFFFF
+*.cursorColor:   #C574DD
+*.border:        #1D2026
+
+*.color0:   #2E3C43
+*.color1:   #F07178
+*.color2:   #C3E88D
+*.color3:   #FFCB6B
+*.color4:   #82AAFF
+*.color5:   #C792EA
+*.color6:   #89DDFF
+*.color7:   #B2CCD6
+
+*.color8:   #546E7A
+*.color9:   #F07178
+*.color10:  #C3E88D
+*.color11:  #FFCB6B
+*.color12:  #82AAFF
+*.color13:  #C792EA
+*.color14:  #89DDFF
+*.color15:  #EEFFFF
+
+!State:           ´bg´,     ´fg´,     ´bgalt´,  ´hlbg´,   ´hlfg´
+rofi.color-normal: #282c37,  #d9e1e8,  #282c37,  #5A74CA,  #282c37
+rofi.color-urgent: #282c37,  #d9e1e8,  #282c37,  #5A74CA,  #282c37
+rofi.color-active: #282c37,  #d9e1e8,  #282c37,  #5A74CA,  #282c37
+!                  ´background´, ´border´
+rofi.color-window: #282c37,      #75444A57

--- a/.config/Thunar/accels.scm
+++ b/.config/Thunar/accels.scm
@@ -26,6 +26,7 @@
 ; (gtk_accel_path "<Actions>/ThunarWindow/sendto-menu" "")
 ; (gtk_accel_path "<Actions>/ThunarStandardView/delete" "")
 ; (gtk_accel_path "<Actions>/ThunarStandardView/select-by-pattern" "<Primary>s")
+; (gtk_accel_path "<Actions>/ThunarShortcutsPane/sendto-shortcuts" "")
 ; (gtk_accel_path "<Actions>/ThunarWindow/close-tab" "<Primary>w")
 ; (gtk_accel_path "<Actions>/ThunarWindow/view-side-pane-tree" "<Primary>e")
 ; (gtk_accel_path "<Actions>/ThunarWindow/help-menu" "")

Binary files a/.config/dconf/user and b/.config/dconf/user differ

--- a/.config/i3/config
+++ b/.config/i3/config
@@ -1,76 +1,48 @@
-# Window and Color
-client.focused          #364670 #364670 #93CFBD #364670 #364670
-client.focused_inactive #2F2F38 #2F2F38 #CCCCCC #2F2F38 #2F2F38
-client.unfocused        #2F2F38 #2F2F38 #93CFBD #2F2F38 #2F2F38
-client.urgent           #6B3659 #6B3659 #93CFBD #6B3659 #6B3659
-client.placeholder      #666666 #666666 #CCCCCC #666666 #666666
-client.background       #364670
+# This file has been auto-generated by i3-config-wizard(1).
+# It will not be overwritten, so edit it as you like.
+#
+# Should you change your keyboard layout some time, delete
+# this file and re-run i3-config-wizard(1).
+#
 
-hide_edge_borders smart
-new_window pixel 2
-new_float pixel 2
+# i3 config file (v4)
+#
+# Please see https://i3wm.org/docs/userguide.html for a complete reference!
 
-# Gapps
-smart_gaps on
-smart_borders on
-
-set $default_gaps_inner 0
-set $default_gaps_outer 0
-gaps inner $default_gaps_inner
-gaps outer $default_gaps_outer
-
-set $mode_gaps Gaps: (o) outer, (i) inner
-set $mode_gaps_outer Outer Gaps: +|-|0 (local), mod1 + +|-|0 (global)
-set $mode_gaps_inner Inner Gaps: +|-|0 (local), mod1 + +|-|0 (global)
-bindsym $mod+mod1+g mode "$mode_gaps"
-
-mode "$mode_gaps" {
-        bindsym o      mode "$mode_gaps_outer"
-        bindsym i      mode "$mode_gaps_inner"
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-
-mode "$mode_gaps_inner" {
-        bindsym plus  gaps inner current plus 5
-        bindsym minus gaps inner current minus 5
-        bindsym 0     gaps inner current set 0
-
-        bindsym mod1+plus  gaps inner all plus 5
-        bindsym mod1+minus gaps inner all minus 5
-        bindsym mod1+0     gaps inner all set 0
-
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
-mode "$mode_gaps_outer" {
-        bindsym plus  gaps outer current plus 5
-        bindsym minus gaps outer current minus 5
-        bindsym 0     gaps outer current set 0
-
-        bindsym mod1+plus  gaps outer all plus 5
-        bindsym mod1+minus gaps outer all minus 5
-        bindsym mod1+0     gaps outer all set 0
-
-        bindsym Return mode "default"
-        bindsym Escape mode "default"
-}
+set $mod Mod4
 
+# Font for window titles. Will also be used by the bar unless a different font
+# is used in the bar {} block below.
+font pango:monospace 8
 
-set $mod Mod4
-set $mod1 Mod1
+# This font is widely installed, provides lots of unicode glyphs, right-to-left
+# text rendering and scalability on retina/hidpi displays (thanks to pango).
+#font pango:DejaVu Sans Mono 8
 
-font pango:ClearSansMedium 10
+# Before i3 v4.8, we used to recommend this one as the default:
+# font -misc-fixed-medium-r-normal--13-120-75-75-C-70-iso10646-1
+# The font above is very space-efficient, that is, it looks good, sharp and
+# clear in small sizes. However, its unicode glyph coverage is limited, the old
+# X core fonts rendering does not support right-to-left and this being a bitmap
+# font, it doesn’t scale on retina/hidpi displays.
 
+# Use Mouse+$mod to drag floating windows to their wanted position
 floating_modifier $mod
 
+# start a terminal
+bindsym $mod+Return exec i3-sensible-terminal
+
 # kill focused window
-bindsym $mod+z kill
+bindsym $mod+Shift+q kill
+
+# start dmenu (a program launcher)
+bindsym $mod+d exec dmenu_run
+# There also is the (new) i3-dmenu-desktop which only displays applications
+# shipping a .desktop file. It is a wrapper around dmenu, so you need that
+# installed.
+# bindsym $mod+d exec --no-startup-id i3-dmenu-desktop
 
 # change focus
-bindsym $mod1+Tab focus right
-# bindsym $mod+Tab focus left
-bindsym $mod+Tab workspace back_and_forth
 bindsym $mod+j focus left
 bindsym $mod+k focus down
 bindsym $mod+l focus up
@@ -83,16 +55,16 @@ bindsym $mod+Up focus up
 bindsym $mod+Right focus right
 
 # move focused window
-bindsym $mod+mod1+j move left
-bindsym $mod+mod1+k move down
-bindsym $mod+mod1+l move up
-bindsym $mod+mod1+semicolon move right
+bindsym $mod+Shift+j move left
+bindsym $mod+Shift+k move down
+bindsym $mod+Shift+l move up
+bindsym $mod+Shift+colon move right
 
 # alternatively, you can use the cursor keys:
-bindsym $mod+mod1+Left move left
-bindsym $mod+mod1+Down move down
-bindsym $mod+mod1+Up move up
-bindsym $mod+mod1+Right move right
+bindsym $mod+Shift+Left move left
+bindsym $mod+Shift+Down move down
+bindsym $mod+Shift+Up move up
+bindsym $mod+Shift+Right move right
 
 # split in horizontal orientation
 bindsym $mod+h split h
@@ -109,28 +81,26 @@ bindsym $mod+w layout tabbed
 bindsym $mod+e layout toggle split
 
 # toggle tiling / floating
-bindsym $mod+c floating toggle
+bindsym $mod+Shift+space floating toggle
 
 # change focus between tiling / floating windows
-bindsym $mod+x focus mode_toggle
+bindsym $mod+space focus mode_toggle
 
 # focus the parent container
 bindsym $mod+a focus parent
 
 # focus the child container
-bindsym $mod+d focus child
-
-bindsym $mod+g sticky toggle
+#bindsym $mod+d focus child
 
 # Define names for default workspaces for which we configure key bindings later on.
 # We use variables to avoid repeating the names in multiple places.
-set $ws1 web
-set $ws2 term
-set $ws3 code
-set $ws4 media
-set $ws5 gimp
-set $ws6 chat
-set $ws7 doc
+set $ws1 "1"
+set $ws2 "2"
+set $ws3 "3"
+set $ws4 "4"
+set $ws5 "5"
+set $ws6 "6"
+set $ws7 "7"
 set $ws8 "8"
 set $ws9 "9"
 set $ws10 "10"
@@ -148,114 +118,53 @@ bindsym $mod+9 workspace $ws9
 bindsym $mod+0 workspace $ws10
 
 # move focused container to workspace
-bindsym $mod+mod1+1 move container to workspace $ws1
-bindsym $mod+mod1+2 move container to workspace $ws2
-bindsym $mod+mod1+3 move container to workspace $ws3
-bindsym $mod+mod1+4 move container to workspace $ws4
-bindsym $mod+mod1+5 move container to workspace $ws5
-bindsym $mod+mod1+6 move container to workspace $ws6
-bindsym $mod+mod1+7 move container to workspace $ws7
-bindsym $mod+mod1+8 move container to workspace $ws8
-bindsym $mod+mod1+9 move container to workspace $ws9
-bindsym $mod+mod1+0 move container to workspace $ws10
-
-bindsym $mod+mod1+c reload
-bindsym $mod+mod1+r restart
-bindsym $mod+mod1+Delete exec ~/.bin/rofi-logout
-# bindsym $mod+mod1+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -b 'Yes, exit i3' 'i3-msg exit'"
-
+bindsym $mod+Shift+1 move container to workspace $ws1
+bindsym $mod+Shift+2 move container to workspace $ws2
+bindsym $mod+Shift+3 move container to workspace $ws3
+bindsym $mod+Shift+4 move container to workspace $ws4
+bindsym $mod+Shift+5 move container to workspace $ws5
+bindsym $mod+Shift+6 move container to workspace $ws6
+bindsym $mod+Shift+7 move container to workspace $ws7
+bindsym $mod+Shift+8 move container to workspace $ws8
+bindsym $mod+Shift+9 move container to workspace $ws9
+bindsym $mod+Shift+0 move container to workspace $ws10
+
+# reload the configuration file
+bindsym $mod+Shift+c reload
+# restart i3 inplace (preserves your layout/session, can be used to upgrade i3)
+bindsym $mod+Shift+r restart
+# exit i3 (logs you out of your X session)
+bindsym $mod+Shift+e exec "i3-nagbar -t warning -m 'You pressed the exit shortcut. Do you really want to exit i3? This will end your X session.' -B 'Yes, exit i3' 'i3-msg exit'"
+
+# resize window (you can also use the mouse for that)
 mode "resize" {
-        bindsym j resize shrink width 3 px or 3 ppt
-        bindsym k resize grow height 3 px or 3 ppt
-        bindsym l resize shrink height 3 px or 3 ppt
-        bindsym semicolon resize grow width 3 px or 3 ppt
-
-        bindsym Left resize shrink width 3 px or 3 ppt
-        bindsym Down resize grow height 3 px or 3 ppt
-        bindsym Up resize shrink height 3 px or 3 ppt
-        bindsym Right resize grow width 3 px or 3 ppt
-
+        # These bindings trigger as soon as you enter the resize mode
+
+        # Pressing left will shrink the window’s width.
+        # Pressing right will grow the window’s width.
+        # Pressing up will shrink the window’s height.
+        # Pressing down will grow the window’s height.
+        bindsym j resize shrink width 10 px or 10 ppt
+        bindsym k resize grow height 10 px or 10 ppt
+        bindsym l resize shrink height 10 px or 10 ppt
+        bindsym semicolon resize grow width 10 px or 10 ppt
+
+        # same bindings, but for the arrow keys
+        bindsym Left resize shrink width 10 px or 10 ppt
+        bindsym Down resize grow height 10 px or 10 ppt
+        bindsym Up resize shrink height 10 px or 10 ppt
+        bindsym Right resize grow width 10 px or 10 ppt
+
+        # back to normal: Enter or Escape or $mod+r
         bindsym Return mode "default"
         bindsym Escape mode "default"
         bindsym $mod+r mode "default"
 }
-bindsym $mod+r mode "resize"
-
-
-## Specific window
-for_window [window_role="pop-up|bubble|task_dialog|Preferences"] floating enable
-for_window [window_type="dialog|menu"] floating enable
-for_window [window_role="browser|GtkFileChooserDialog"] resize set 800 600, move position center
-for_window [window_role="demo"] resize set 800 600, move position center
-for_window [class="(?i)simplescreenrecorder"] floating enable, move position 5 30
-for_window [class="(?i)nitrogen|engrampa|fsearch|qt5ct"] floating enable, resize set 600 500, move position center
-for_window [class="(?i)pavucontrol|lxappearance"] floating enable
-for_window [title="(?i)term-float"] floating enable, focus
-for_window [title="(?i)ranger"] floating enable, resize set 1280 600, move position center, focus
-for_window [class="(?i)mpv"] floating enable, resize set 350 250, sticky enable, move window to position 1000 85
-# for_window [title="(?i)htop"] floating enable, resize set 1280 600, move position center, focus
-for_window [class="(?i)chromium|urxvt|thunar|subl3|mupdf|viewnior"] focus
-for_window [window_role="demo"] move window to scratchpad, scratchpad show, floating enable, border pixel 0, resize set 1366 250, move absolute position 0 518
-for_window [workspace=$ws1] layout tabbed
-for_window [workspace=$ws3] layout tabbed
-
 
-## Specific workspaces
-assign [window_role="browser"] $ws1
-assign [title="(?i)term-tiling"] $ws2
-assign [title="htop"] $ws2
-assign [class="(?i)subl3|thunar"] $ws3
-assign [class="(?i)smplayer"] $ws4
-assign [window_role="gimp"] $ws5
-assign [class="(?i)telegram|discord"] $ws6
-assign [class="(?i)zathura|fbreader|mupdf"] $ws7
-
-
-#### hide/show bar
-#gaps top 32
-#bindsym $mod+p exec polybar-msg cmd toggle; exec i3-msg gaps top all toggle 32
-
-# start app
-# Update locker, run: betterlockscreen -u path/to/directory -r 1920x1080 -b 0.5
-bindsym $mod1+l exec --no-startup-id "betterlockscreen -l"
-bindsym $mod1+d exec --no-startup-id "rofi -show run"
-# bindsym $mod1+space exec --no-startup-id "rofi -show window"
-bindsym $mod1+space exec --no-startup-id "$HOME/.bin/toggle-tint.sh"
-bindsym $mod+Return exec --no-startup-id "urxvt -name 'term-tiling'"
-bindsym $mod1+t exec --no-startup-id "urxvt -name 'term-float'"
-bindsym $mod1+h exec --no-startup-id "urxvt -e htop"
-bindsym $mod1+r exec --no-startup-id "urxvt -e ranger"
-bindsym $mod1+f exec --no-startup-id "thunar"
-bindsym $mod1+s exec --no-startup-id "subl3"
-bindsym $mod1+w exec --no-startup-id "chromium"
-
-
-bindsym $mod+Ctrl+Up exec mpc volume +2
-bindsym $mod+Ctrl+Down exec mpc volume -2
-bindsym $mod+Ctrl+Left exec mpc prev
-bindsym $mod+Ctrl+Right exec mpc next
-bindsym $mod+Ctrl+d exec mpc del 0
-
-
-exec_always --no-startup-id "xset +fp $HOME/.fonts/misc/"
-##### autostart app
-#exec_always --no-startup-id "nitrogen --restore"
-exec_always --no-startup-id "hsetroot -center $HOME/.wall/wl3.jpg"
-
-# xwinwrap -g 1920x1080 -ni -s -nf -b -un -argb -sh rectangle -fdt -- mpv -wid WID --keepaspect=no --loop ~/.wall/wall.webm
-# xwinwrap -g 1920x1080 -ni -s -nf -b -un -argb -sh rectangle -fdt -- gifview -w WID -a ~/.wall/wall.gif
-# exec_always --no-startup-id "xwinwrap -ov -ni -fs -- mpv -wid WID --keepaspect=no --loop ~/.config/wall/wl7.gif"
+bindsym $mod+r mode "resize"
 
-exec --no-startup-id numlockx
-exec --no-startup-id "compton -b --config $HOME/.config/compton.conf"
-exec --no-startup-id "setxkbmap -layout us,ru -option 'grp:win_space_toggle,grp_led:scroll'"
-#exec --no-startup-id "setxkbmap -layout us,ru -option 'grp:alt_mod1_toggle,grp_led:scroll'"
-exec --no-startup-id "thunar --daemon"
-exec --no-startup-id "dunst -config $HOME/.config/dunst/dunstrc"
-##### Start bar  
-exec_always --no-startup-id "$HOME/.config/polybar/i3cfg.sh"
-# exec --no-startup-id nm-applet
-exec --no-startup-id redshift-gtk
-exec --no-startup-id clipit
-exec --no-startup-id megasync
-exec --no-startup-id caffeine
\ No newline at end of file
+# Start i3bar to display a workspace bar (plus the system information i3status
+# finds out, if available)
+bar {
+        status_command i3status
+}

--- a/.config/mpd/pid
+++ b/.config/mpd/pid
@@ -1 +1 @@
-459
+470

--- a/.config/mpd/state
+++ b/.config/mpd/state
@@ -2,8 +2,8 @@ sw_volume: 100
 audio_device_state:1:MPD pulse
 audio_device_state:1:MPD FIFO
 state: pause
-current: 38
-time: 411.911000
+current: 62
+time: 255.549000
 random: 0
 repeat: 0
 single: 0

--- a/.config/openbox/autostart
+++ b/.config/openbox/autostart
@@ -5,6 +5,7 @@ xset -b
 tint2 -c ~/.config/tint2/my_ob.tint2rc &
 tint2 -c ~/.config/tint2/tray.tint2rc &
 sh ~/.config/polybar/launch.sh &
+# hsetroot -add '#2c3539' -add '#b89ca8' -gradient 130 &
 hsetroot -fill $HOME/.wall/wl3.jpg &
 compton -b --config ~/.config/compton.conf &
 thunar --daemon &

--- a/.config/polybar/duicfg
+++ b/.config/polybar/duicfg
@@ -56,13 +56,13 @@ font-0 = "ClearSans:style=Bold:pixelsize=9:antialias=false;1"
 # Cat unicode: echo -e "\uF31A"
 font-1 = "Font Awesome 5 Free:style=Regular:pixelsize=8;1"
 font-2 = "Font Awesome 5 Free:style=Solid:pixelsize=8;1"
-font-3 = "Font Awesome 5 Brands:pixelsize=8;1"
-font-4 = "Hack Nerd Font:antialias=false:pixelsize=12;2"
+font-3 = "Hack Nerd Font:antialias=false:pixelsize=9;2"
+font-4 = "Weather Icons:style=Regular:pixelsize=9;2"
 
 
 modules-left = app mail cpu memory uparch title
-modules-center = 
-modules-right = tor mpd alsa date xkeyboard power
+modules-center =
+modules-right = wtr tor mpd alsa date xkeyboard power
 
 cursor-click = pointer
 cursor-scroll = ns-resize
@@ -94,7 +94,8 @@ exec = ~/.config/polybar/wtr.sh
 format-foreground = ${colors.text}
 # format-padding = 1
 interval = 600
-label-font = 0
+# label-font = 5
+# click-left =
 
 
 
@@ -113,7 +114,7 @@ type = custom/script
 interval = 600
 format = "<label>"
 format-prefix = "ip: "
-format-prefix-foreground = ${colors.magenta}
+format-prefix-foreground = ${colors.accent}
 # format-padding = 1
 exec = echo "$(wget -qO- https://canihazip.com/s | sed -e 's/[^[:digit:]\|.]//g')"
 exec-if = ping -c 1 ya.ru
@@ -125,7 +126,7 @@ type = custom/script
 exec = ~/.config/polybar/status tor
 interval = 6
 format = <label>
-format-suffix = "   \\"
+format-suffix = "    \\"
 format-suffix-foreground = ${colors.suffix}
 # format-padding = 1
 click-left = "systemctl restart tor"
@@ -148,9 +149,10 @@ type = custom/script
 # 600s = 10min
 # interval = 600
 # format = " <label> "
-# format-prefix = "// "
 tail = true
+format-prefix = " //    "
 format-prefix-foreground = ${colors.suffix}
+# format-prefix-margin = 2
 exec = "~/.config/polybar/gmail/launch.py --prefix ' ' --color '#798BC7' --nosound"
 click-left = xdg-open https://mail.google.com
 
@@ -162,8 +164,6 @@ content = 
 content-foreground = ${colors.text}
 content-background = ${colors.background}
 content-padding = 0
-content-suffix = "    //"
-content-suffix-foreground = ${colors.suffix}
 click-left = xfdesktop --menu
 click-right = rofi -modi run,drun -show drun -location 1 -xoffset 15 -yoffset 39 -line-padding 4 -columns 1 -width 25 -lines 10 -padding 15 -hide-scrollbar -show-icons -drun-icon-theme
 # click-left = "jgmenu_run >/dev/null 2>&1 &"
@@ -223,9 +223,11 @@ ramp-volume-foreground = ${colors.accent}
 [module/xkeyboard]
 type = internal/xkeyboard
 blacklist-0 = num lock
-format-prefix = " "
+format-prefix = "  "
 format-prefix-foreground = ${colors.accent}
 label = %layout%
+format-suffix = "   \\"
+format-suffix-foreground = ${colors.suffix}
 
 
 
@@ -332,6 +334,4 @@ content = 
 content-foreground = ${colors.text}
 content-background = ${colors.background}
 content-padding = 0
-content-prefix = "\\    "
-content-prefix-foreground = ${colors.suffix}
-click-left = ~/.bin/xfce-logout
\ No newline at end of file
+click-left = ~/.bin/xfce-logout

--- a/.config/qt5ct/qt5ct.conf
+++ b/.config/qt5ct/qt5ct.conf
@@ -1,7 +1,7 @@
 [Appearance]
 color_scheme_path=/usr/share/qt5ct/colors/airy.conf
 custom_palette=false
-icon_theme=ll-ico
+icon_theme=ln-ico
 standard_dialogs=default
 style=gtk2
 

--- a/.config/ranger/history
+++ b/.config/ranger/history
@@ -1,7 +1,3 @@
-search .config
-search range
-rename scope.sh.bak
-rename scope.sh
 open_wit
 q
 Q
@@ -45,6 +41,10 @@ open_with
 rename xfce4.bak
 sear
 fin
-search .wall
 find zs
 delete
+rename .bin
+search .wall
+search wall
+search wa
+search wal

--- a/.config/ranger/rc.conf
+++ b/.config/ranger/rc.conf
@@ -43,9 +43,9 @@ set use_preview_script true
 
 # Preview images in full color with the external command "w3mimgpreview"?
 # This requires the console web browser "w3m" and a supported terminal.
-# It has been successfully tested with "xterm" and "urxvt" without tmux.
-set preview_images_method kitty
+# It has been successfully tested with "xterm" and "urxvt,urxvt_full" without tmux.
 set preview_images true
+set preview_images_method urxvt
 
 # Use a unicode "..." character to mark cut-off filenames?
 set unicode_ellipsis false

--- a/.config/sublime-text-3/Packages/User/Package Control.last-run	
+++ b/.config/sublime-text-3/Packages/User/Package Control.last-run	
@@ -1 +1 @@
-1562764269
\ No newline at end of file
[phone]
\ No newline at end of file

--- a/.config/sublime-text-3/Packages/User/Package Control.merged-ca-bundle	
+++ b/.config/sublime-text-3/Packages/User/Package Control.merged-ca-bundle	
@@ -560,40 +560,6 @@ jWZSaX5LaAzHHjcng6WMxwLkFM1JAbBzs/3GkDpv0mztO+7skb6iQ12LAEpmJURw
 3kAP+HwV96LOPNdeE4yBFxgX0b3xdxA61GU5wSesVywlVP+i2k+KYTlerj1KjL0=
 -----END CERTIFICATE-----
 
-# Certinomis - Root CA
------BEGIN CERTIFICATE-----
-MIIFkjCCA3qgAwIBAgIBATANBgkqhkiG9w0BAQsFADBaMQswCQYDVQQGEwJGUjET
-MBEGA1UEChMKQ2VydGlub21pczEXMBUGA1UECxMOMDAwMiA0MzM5OTg5MDMxHTAb
-BgNVBAMTFENlcnRpbm9taXMgLSBSb290IENBMB4XDTEzMTAyMTA5MTcxOFoXDTMz
-MTAyMTA5MTcxOFowWjELMAkGA1UEBhMCRlIxEzARBgNVBAoTCkNlcnRpbm9taXMx
-FzAVBgNVBAsTDjAwMDIgNDMzOTk4OTAzMR0wGwYDVQQDExRDZXJ0aW5vbWlzIC0g
-Um9vdCBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBANTMCQosP5L2
-fxSeC5yaah1AMGT9qt8OHgZbn1CF6s2Nq0Nn3rD6foCWnoR4kkjW4znuzuRZWJfl
-LieY6pOod5tK8O90gC3rMB+12ceAnGInkYjwSond3IjmFPnVAy//ldu9n+ws+hQV
-WZUKxkd8aRi5pwP5ynapz8dvtF4F/u7BUrJ1Mofs7SlmO/NKFoL21prbcpjp3vDF
-TKWrteoB4owuZH9kb/2jJZOLyKIOSY008B/sWEUuNKqEUL3nskoTuLAPrjhdsKkb
-5nPJWqHZZkCqqU2mNAKthH6yI8H7KsZn9DS2sJVqM09xRLWtwHkziOC/7aOgFLSc
-CbAK42C++PhmiM1b8XcF4LVzbsF9Ri6OSyemzTUK/eVNfaoqoynHWmgE6OXWk6Ri
-wsXm9E/G+Z8ajYJJGYrKWUM66A0ywfRMEwNvbqY/kXPLynNvEiCL7sCCeN5LLsJJ
-wx3tFvYk9CcbXFcx3FXuqB5vbKziRcxXV4p1VxngtViZSTYxPDMBbRZKzbgqg4SG
-m/lg0h9tkQPTYKbVPZrdd5A9NaSfD171UkRpucC63M9933zZxKyGIjK8e2uR73r4
-F2iw4lNVYC2vPsKD2NkJK/DAZNuHi5HMkesE/Xa0lZrmFAYb1TQdvtj/dBxThZng
-WVJKYe2InmtJiUZ+IFrZ50rlau7SZRFDAgMBAAGjYzBhMA4GA1UdDwEB/wQEAwIB
-BjAPBgNVHRMBAf8EBTADAQH/MB0GA1UdDgQWBBTvkUz1pcMw6C8I6tNxIqSSaHh0
-2TAfBgNVHSMEGDAWgBTvkUz1pcMw6C8I6tNxIqSSaHh02TANBgkqhkiG9w0BAQsF
-AAOCAgEAfj1U2iJdGlg+O1QnurrMyOMaauo++RLrVl89UM7g6kgmJs95Vn6RHJk/
-0KGRHCwPT5iVWVO90CLYiF2cN/z7ZMF4jIuaYAnq1fohX9B0ZedQxb8uuQsLrbWw
-F6YSjNRieOpWauwK0kDDPAUwPk2Ut59KA9N9J0u2/kTO+hkzGm2kQtHdzMjI1xZS
-g081lLMSVX3l4kLr5JyTCcBMWwerx20RoFAXlCOotQqSD7J6wWAsOMwaplv/8gzj
-qh8c3LigkyfeY+N/IZ865Z764BNqdeuWXGKRlI5nU7aJ+BIJy29SWwNyhlCVCNSN
-h4YVH5Uk2KRvms6knZtt0rJ2BobGVgjF6wnaNsIbW0G+YSrjcOa4pvi2WsS9Iff/
-ql+hbHY5ZtbqTFXhADObE5hjyW/QASAJN1LnDE8+zbz1X5YnpyACleAu6AdBBR8V
-btaw5BngDwKTACdyxYvRVB9dSsNAl35VpnzBMwQUAR1JIGkLGZOdblgi90AMRgwj
-Y/M50n92Uaf0yKHxDHYiI0ZSKS3io0EHVmmY0gUJvGnHWmHNj4FgFU2A3ZDifcRQ
-8ow7bkrHxuaAKzyBvBGAFhAn1/DNP3nMcyrDflOR1m749fPH0FFNjkulW+YZFzvW
-gQncItzujrnEj1PhZ7szuIgVRs/taTX/dQ1G885x4cVrhkIGuUE=
------END CERTIFICATE-----
-
 # Certplus Class 2 Primary CA
 -----BEGIN CERTIFICATE-----
 MIIDkjCCAnqgAwIBAgIRAIW9S/PY2uNp9pTXX8OlRCMwDQYJKoZIhvcNAQEFBQAw

--- a/.config/sublime-text-3/Packages/User/Package Control.sublime-settings	
+++ b/.config/sublime-text-3/Packages/User/Package Control.sublime-settings	
@@ -6,10 +6,11 @@
 	"installed_packages":
 	[
 		"A File Icon",
+		"ApacheConf",
 		"Color Highlight",
 		"CSScomb",
 		"Emmet",
-		"Expand Selection to Quotes",
+		"FTPSync",
 		"Gist",
 		"gruvbox",
 		"Markdown Extended",
@@ -19,6 +20,8 @@
 		"SideBarEnhancements",
 		"SublimeCodeIntel",
 		"SublimeLinter",
+		"SublimeLinter-jshint",
+		"SublimeLinter-php",
 		"Terminal"
 	]
 }

--- a/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
+++ b/.config/sublime-text-3/Packages/User/Preferences.sublime-settings
@@ -8,8 +8,11 @@
 		}
 	],
 	"color_scheme": "Packages/One Dark Color Scheme/One Dark.tmTheme",
+	"detect_indentation": false,
 	"draw_shadows": false,
+	"draw_white_space": "all",
 	"enable_tab_scrolling": false,
+	"ensure_newline_at_eof_on_save": true,
 	"font_face": "Roboto Mono Medium",
 	"font_size": 9,
 	"gruvbox_accent_blue": true,
@@ -36,13 +39,24 @@
 	"ignored_packages":
 	[
 	],
+	"indent_guide_options":
+	[
+		"draw_active"
+	],
+	"indent_to_bracket": true,
 	"line_padding_bottom": 2,
 	"line_padding_top": 2,
 	"margin": 3,
+	"rulers":
+	[
+		120
+	],
 	"show_encoding": true,
 	"show_scroll_tabs": false,
 	"tab_size": 2,
 	"theme": "gruvbox.sublime-theme",
+	"translate_tabs_to_spaces": true,
+	"trim_trailing_white_space_on_save": true,
 	"update_check": false,
 	"word_wrap": true
 }

--- /dev/null
+++ b/.config/sublime-text-3/Packages/User/SublimeCodeIntel.sublime-settings
@@ -0,0 +1,146 @@
+/*
+   SublimeCodeIntel default settings
+   All settings can be overridden in *.sublime-project file
+*/
+{
+    /*
+       Sets the mode in which SublimeCodeIntel runs:
+
+       true - Enabled (the default).
+       false - Disabled.
+    */
+    "codeintel": true,
+
+    /* path to codeintel database */
+    "codeintel_database_dir": "~/.codeintel",
+
+    /*
+       An array of language names which are enabled.
+    */
+    "codeintel_enabled_languages":
+    [
+       "JavaScript", "Python",
+       "Ruby", "Python3", "XML", "Perl",
+       "Twig", "Node.js", "TemplateToolkit", "PHP"
+    ],
+
+    /*
+       Maps syntax names to languages. This allows variations on a syntax
+       (for example "Python (Django)") to be used. The key is
+       the base filename of the .tmLanguage syntax files, and the value
+       is the syntax it maps to.
+    */
+    "codeintel_syntax_map":
+    {
+       "Python Django": "Python"
+    },
+
+    "disabled_languages": ["SCSS", "HTML", "Sass", "HTML5", "css", "Less", "MD"],
+
+
+    /* ####################################################################### */
+    /* the following settings can be overridden for each language individually */
+    /* see "codeintel_language_settings" below!                                */
+    /* ####################################################################### */
+
+    /*
+       Sets the mode in which SublimeCodeIntel's live autocomplete runs:
+
+       true - Autocomplete popups as you type (the default).
+       false - Autocomplete popups only when you request it.
+    */
+    "codeintel_live": true,
+
+    /*
+       Tooltips method:
+
+       "popup" - Uses Autocomplete popup for tooltips.
+       "panel" - Uses the output panel for tooltips.
+       "status" - Uses the status bar for tooltips (was the default).
+    */
+    "codeintel_tooltips": "popup",
+
+
+    /*
+       "buffer" - add word completions from current view
+       "all" - add word completions from all views from active window
+       "none" - do not add word completions
+    */
+    "codeintel_word_completions": "buffer",
+
+    /*
+       Insert functions snippets.
+    */
+    "codeintel_snippets": true,
+
+    /*
+       Define global filters to exclude paths from scanning. Use the codeintel_config setting for language specific settings.
+       ex: ["list/of","/path/to/exclude"]
+       (Currently only working for JavaScript and PHP)
+    */
+    "codeintel_scan_exclude_dir":[],
+
+    /* Code Scanning: Controls how the Code Intelligence system scans your source code files. */
+
+    /* Maximum directory depth: */
+    "codeintel_max_recursive_dir_depth": 10,
+
+    /* Include all files and directories from the project base directory: */
+    "codeintel_scan_files_in_project": true,
+
+    /* API Catalogs: SublimeCodeIntel uses API catalogs to provide autocomplete and calltips for 3rd-party libraries.
+      Add te libraries that you use in your code. Note: Adding all API catalogs for a particular language can lead to confusing results.
+
+      Avaliable catalogs:
+           PyWin32 (Python3) (for Python3: Python Extensions for Windows)
+           PyWin32 (for Python: Python Extensions for Windows)
+           Rails (for Ruby: Rails version 1.1.6)
+           jQuery (for JavaScript: jQuery JavaScript library - version 1.9.1)
+           Prototype (for JavaScript: JavaScript framework for web development)
+           dojo (for JavaScript: Dojo Toolkit API - version 1.5.0)
+           Ext_30 (for JavaScript: Ext JavaScript framework - version 3.0)
+           HTML5 (for JavaScript: HTML5 (Canvas, Web Messaging, Microdata))
+           MochiKit (for JavaScript: A lightweight JavaScript library - v1.4.2)
+           Mozilla Toolkit (for JavaScript: Mozilla Toolkit API - version 1.8)
+           XBL (for JavaScript: XBL JavaScript support - version 1.0)
+           YUI (for JavaScript: Yahoo! User Interface Library - v2.8.1)
+           Drupal (for PHP: A full-featured PHP content management/discussion engine -- v5.1)
+           PECL (for PHP: A collection of PHP Extensions)
+    */
+    "codeintel_selected_catalogs": [],
+
+    /*
+        When editing within a defined scope, no live completion will trigger. ex: ["comment"]
+     */
+    "codeintel_exclude_scopes_from_complete_triggers": ["comment"],
+
+    /*
+       Defines a configuration for each language.
+    */
+    "codeintel_language_settings": {
+        "Python3": {
+            "python3": "/usr/local/bin/python3.3",
+            "codeintel_scan_extra_dir": [
+                "/Applications/Sublime Text.app/Contents/MacOS",
+                "~/Library/Application Support/Sublime Text 3/Packages/SublimeCodeIntel/arch",
+                "~/Library/Application Support/Sublime Text 3/Packages/SublimeCodeIntel/libs"
+            ],
+            "codeintel_scan_files_in_project": true,
+            "codeintel_selected_catalogs": []
+        },
+        "JavaScript": {
+            "codeintel_scan_extra_dir": [],
+            "codeintel_scan_exclude_dir":["/build/", "/min/"],
+            "codeintel_scan_files_in_project": false,
+            "codeintel_max_recursive_dir_depth": 2,
+            "codeintel_selected_catalogs": ["jQuery"]
+        },
+        "PHP": {
+            "php": "/Applications/MAMP/bin/php/php5.5.3/bin/php",
+            "codeintel_scan_extra_dir": [],
+            "codeintel_scan_files_in_project": true,
+            "codeintel_max_recursive_dir_depth": 15,
+            "codeintel_scan_exclude_dir":["/Applications/MAMP/bin/php/php5.5.3/"]
+        }
+    }
+}

--- a/.config/sublime-text-3/Packages/User/Terminal.sublime-settings
+++ b/.config/sublime-text-3/Packages/User/Terminal.sublime-settings
@@ -1,7 +1,7 @@
 {
 	// The command to execute for the terminal, leave blank for the OS default
 	// On OS X the terminal can be set to iTerm.sh to execute iTerm
-	"terminal": "kitty",
+	"terminal": "urxvtc",
 
 	// A list of default parameters to pass to the terminal, this can be
 	// overridden by passing the "parameters" key with a list value to the args

--- /dev/null
+++ b/.config/sublime-text-3/Packages/User/snippet/sh-sn.sublime-snippet
@@ -0,0 +1,11 @@
+<snippet>
+	<content><![CDATA[
+```${1:sh}
+${2:code}
+```
+]]></content>
+	<!-- Optional: Set a tabTrigger to define how to trigger the snippet -->
+	<tabTrigger>sh</tabTrigger>
+	<!-- Optional: Set a scope to limit where the snippet will trigger -->
+	<!-- <scope>source.md</scope> -->
+</snippet>

--- a/.config/tint2/my_ob.tint2rc
+++ b/.config/tint2/my_ob.tint2rc
@@ -1,92 +1,7 @@
-#---- Generated by tint2conf 6c6f ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
-#-------------------------------------
-# Backgrounds
-# Background 1: Активная задача
-rounded = 0
-border_width = 2
-border_sides = T
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #888888 0
-border_color = #5a74ca 100
-background_color_hover = #888888 20
-border_color_hover = #5a74ca 100
-background_color_pressed = #888888 20
-border_color_pressed = #5a74ca 100
-
-# Background 2: Задача по умолчанию, Свернутая задача
-rounded = 0
-border_width = 0
-border_sides = TBLR
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #000000 0
-border_color = #000000 0
-background_color_hover = #888888 20
-border_color_hover = #888888 20
-background_color_pressed = #888888 20
-border_color_pressed = #888888 20
-
-# Background 3: Неотложная задача
-rounded = 0
-border_width = 2
-border_sides = T
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #888888 0
-border_color = #e64141 100
-background_color_hover = #888888 20
-border_color_hover = #e64141 100
-background_color_pressed = #888888 20
-border_color_pressed = #e64141 100
-
-# Background 4: Неактивная панель задач
-rounded = 0
-border_width = 0
-border_sides = 
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #2b303b 80
-border_color = #000000 0
-background_color_hover = #888888 20
-border_color_hover = #000000 0
-background_color_pressed = #888888 20
-border_color_pressed = #000000 0
-
-# Background 5: Активная панель задач, Батарея, Панель запуска, Системный лоток, Часы
+# Background 1: Панель
 rounded = 0
 border_width = 0
-border_sides = 
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #17181a 100
-border_color = #d8d8d8 0
-background_color_hover = #5a74ca 62
-border_color_hover = #d8d8d8 0
-background_color_pressed = #5a74ca 62
-border_color_pressed = #d8d8d8 0
-
-# Background 6: Всплывающий текст, Button
-rounded = 0
-border_width = 0
-border_sides = 
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #17181a 100
-border_color = #222222 90
-background_color_hover = #2b303b 100
-border_color_hover = #222222 90
-background_color_pressed = #2b303b 100
-border_color_pressed = #222222 90
-
-# Background 7: Панель
-rounded = 0
-border_width = 0
-border_sides = 
+border_sides = LR
 border_content_tint_weight = 0
 background_content_tint_weight = 0
 background_color = #17181a 100
@@ -105,7 +20,7 @@ panel_items = PPPPP
 panel_size = 100% 34
 panel_margin = 0 0
 panel_padding = 7 0 0
-panel_background_id = 7
+panel_background_id = 1
 wm_menu = 1
 panel_dock = 0
 panel_position = bottom center horizontal
@@ -127,130 +42,18 @@ scale_relative_to_dpi = 0
 scale_relative_to_screen_height = 0
 
 #-------------------------------------
-# Taskbar
-taskbar_mode = multi_desktop
-taskbar_hide_if_empty = 1
-taskbar_padding = 0 0 0
-taskbar_background_id = 4
-taskbar_active_background_id = 5
-taskbar_name = 0
-taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 1
-taskbar_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
-taskbar_name_padding = 4 4
-taskbar_name_background_id = 0
-taskbar_name_active_background_id = 0
-taskbar_name_font = Clear Sans Medium, Medium 10
-taskbar_name_font_color = #828282 100
-taskbar_name_active_font_color = #a0a0bd 100
-taskbar_distribute_size = 0
-taskbar_sort_order = none
-task_align = left
-
-#-------------------------------------
-# Task
-task_text = 0
-task_icon = 1
-task_centered = 1
-urgent_nb_of_blink = 20
-task_maximum_size = 36 26
-task_padding = 10 8 4
-task_tooltip = 0
-task_thumbnail = 0
-task_thumbnail_size = 210
-task_font_color = #828282 60
-task_active_font_color = #828282 100
-task_urgent_font_color = #ffffff 100
-task_iconified_font_color = #d8d8d8 60
-task_icon_asb = 80 0 0
-task_active_icon_asb = 100 0 0
-task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 80 0 0
-task_background_id = 2
-task_active_background_id = 1
-task_urgent_background_id = 3
-task_iconified_background_id = 2
-mouse_left = toggle_iconify
-mouse_middle = next_task
-mouse_right = close
-mouse_scroll_up = toggle
-mouse_scroll_down = iconify
-
-#-------------------------------------
-# System tray (notification area)
-systray_padding = 8 2 4
-systray_background_id = 5
-systray_sort = right2left
-systray_icon_size = 16
-systray_icon_asb = 50 0 0
-systray_monitor = 1
-systray_name_filter = 
-
-#-------------------------------------
-# Launcher
-launcher_padding = 5 0 5
-launcher_background_id = 5
-launcher_icon_background_id = 0
-launcher_icon_size = 24
-launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
-startup_notifications = 1
-launcher_tooltip = 1
-
-#-------------------------------------
-# Clock
-time1_format = %a. %d %b %H:%M
-time2_format = 
-time1_font = Clear Sans Medium, Medium 9
-time1_timezone = 
-time2_timezone = 
-clock_font_color = #aeb4c6 100
-clock_padding = 4 4
-clock_background_id = 5
-clock_tooltip = 
-clock_tooltip_timezone = 
-clock_lclick_command = gsimplecal
-clock_rclick_command = xfdesktop --menu
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
-
-#-------------------------------------
-# Battery
-battery_tooltip = 1
-battery_low_status = 20
-battery_low_cmd = notify-send "Battery Low"
-battery_full_cmd = 
-bat1_font = Ubuntu 11
-bat2_font = Ubuntu 0
-battery_font_color = #b5b5b5 100
-bat1_format = 
-bat2_format = 
-battery_padding = 4 2
-battery_background_id = 5
-battery_hide = 101
-battery_lclick_command = xfce4-power-manager-settings
-battery_rclick_command = xfce4-power-manager-settings
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
-
-#-------------------------------------
 # Button 1
 button = new
 button_text = 
 button_lclick_command = sh $HOME/.bin/toggle-bar.sh
 button_rclick_command = $HOME/.bin/toggle-pager.sh
-button_mclick_command = 
-button_uwheel_command = 
-button_dwheel_command = 
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
 button_font = Font Awesome 5 Free 10
 button_font_color = #aeb4c6 100
 button_padding = 5 0
-button_background_id = 6
+button_background_id = 0
 button_centered = 0
 button_max_icon_size = 0
 
@@ -260,13 +63,13 @@ button = new
 button_text = 
 button_lclick_command = urxvtc -name tmux -g 190x50 -e sh -c '~/.bin/rxrun.sh'
 button_rclick_command = urxvtc -name tmux -g 190x50 -e sh -c 'tmux attach || tmux new -s work'
-button_mclick_command = 
-button_uwheel_command = 
-button_dwheel_command = 
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
 button_font = Font Awesome 5 Free 8
 button_font_color = #aeb4c6 100
 button_padding = 5 0
-button_background_id = 6
+button_background_id = 0
 button_centered = 0
 button_max_icon_size = 0
 
@@ -275,14 +78,14 @@ button_max_icon_size = 0
 button = new
 button_text = 
 button_lclick_command = urxvtc -name newsboat -g 190x50 -e newsboat
-button_rclick_command = 
-button_mclick_command = 
-button_uwheel_command = 
-button_dwheel_command = 
+button_rclick_command =
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
 button_font = Font Awesome 5 Free 8
 button_font_color = #aeb4c6 100
 button_padding = 5 0
-button_background_id = 6
+button_background_id = 0
 button_centered = 0
 button_max_icon_size = 0
 
@@ -291,14 +94,14 @@ button_max_icon_size = 0
 button = new
 button_text = 
 button_lclick_command = xkill
-button_rclick_command = 
+button_rclick_command =
 button_mclick_command = $HOME/.bin/toggle-tint.sh
-button_uwheel_command = 
-button_dwheel_command = 
+button_uwheel_command =
+button_dwheel_command =
 button_font = Font Awesome 5 Free 8
 button_font_color = #aeb4c6 100
 button_padding = 5 0
-button_background_id = 6
+button_background_id = 0
 button_centered = 0
 button_max_icon_size = 0
 
@@ -309,21 +112,11 @@ button_text = 
 button_lclick_command = sh $HOME/.bin/xfce-theme.sh
 button_rclick_command = polybar-msg cmd toggle
 button_mclick_command = $HOME/.bin/compton.sh
-button_uwheel_command = 
-button_dwheel_command = 
+button_uwheel_command =
+button_dwheel_command =
 button_font = Font Awesome 5 Free 9
 button_font_color = #aeb4c6 100
 button_padding = 5 0
-button_background_id = 6
+button_background_id = 0
 button_centered = 0
 button_max_icon_size = 0
-
-#-------------------------------------
-# Tooltip
-tooltip_show_timeout = 0
-tooltip_hide_timeout = 0
-tooltip_padding = 10 6
-tooltip_background_id = 6
-tooltip_font_color = #d8d8d8 100
-tooltip_font = Ubuntu 10
-

--- /dev/null
+++ b/.config/tint2/my_ob.tint2rc.backup.1562873320
@@ -0,0 +1,160 @@
+# Background 1: Панель
+rounded = 0
+border_width = 0
+border_sides =
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #17181a 100
+border_color = #17181a 100
+gradient_id = 0
+background_color_hover = #17181a 100
+border_color_hover = #17181a 100
+gradient_id_hover = 0
+background_color_pressed = #17181a 100
+border_color_pressed = #17181a 100
+gradient_id_pressed = 0
+
+#-------------------------------------
+# Panel
+panel_items = PPPPP
+panel_size = 100% 34
+panel_margin = 0 0
+panel_padding = 7 0 0
+panel_background_id = 7
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom center horizontal
+panel_layer = top
+panel_monitor = all
+panel_shrink = 1
+autohide = 1
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.1
+autohide_height = 1
+strut_policy = none
+panel_window_name = tint2
+disable_transparency = 0
+mouse_effects = 0
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
+scale_relative_to_dpi = 0
+scale_relative_to_screen_height = 0
+
+#-------------------------------------
+# Button 1
+button = new
+button_text = 
+button_lclick_command = sh $HOME/.bin/toggle-bar.sh
+button_rclick_command = $HOME/.bin/toggle-pager.sh
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 10
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 2
+button = new
+button_text = 
+button_lclick_command = urxvtc -name tmux -g 190x50 -e sh -c '~/.bin/rxrun.sh'
+button_rclick_command = urxvtc -name tmux -g 190x50 -e sh -c 'tmux attach || tmux new -s work'
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 8
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 3
+button = new
+button_text = 
+button_lclick_command = urxvtc -name newsboat -g 190x50 -e newsboat
+button_rclick_command =
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 8
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 4
+button = new
+button_text = 
+button_lclick_command = xkill
+button_rclick_command =
+button_mclick_command = $HOME/.bin/toggle-tint.sh
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 8
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 5
+button = new
+button_text = 
+button_lclick_command = sh $HOME/.bin/xfce-theme.sh
+button_rclick_command = polybar-msg cmd toggle
+button_mclick_command = $HOME/.bin/compton.sh
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 9
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+# bg
+rounded = 15
+border_width = 0
+border_sides = TBLR
+background_color = #8a757e 100
+
+# panel
+panel_items = C:B
+panel_size = 110 30
+panel_position = bottom right horizontal
+panel_layer = bottom
+panel_monitor = all
+panel_margin = 10 10
+panel_padding = 10 8
+panel_background_id = 1
+
+separator = new
+separator_color = #2c3539 100
+separator_style = line
+separator_size = 1
+separator_padding = 0 0
+# clock
+time1_format = %H:%M
+time1_font = Unifont medium 8
+#%a %d %b
+clock_font_color = #2c3539 100
+clock_padding = 0 0
+clock_background_id = 0
+
+# battery
+bat1_format = %p
+bat1_font = Unifont medium 8
+battery_hide = never
+battery_low_status = 20
+# battery_low_cmd = cmd here
+battery_font_color = #2c3539 100
+battery_padding = 0 0
+battery_background_id = 0

--- /dev/null
+++ b/.config/tint2/my_ob.tint2rc.backup.1562873696
@@ -0,0 +1,122 @@
+# Background 1: Панель
+rounded = 0
+border_width = 0
+border_sides =
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #17181a 100
+border_color = #17181a 100
+gradient_id = 0
+background_color_hover = #17181a 100
+border_color_hover = #17181a 100
+gradient_id_hover = 0
+background_color_pressed = #17181a 100
+border_color_pressed = #17181a 100
+gradient_id_pressed = 0
+
+#-------------------------------------
+# Panel
+panel_items = PPPPP
+panel_size = 100% 34
+panel_margin = 0 0
+panel_padding = 7 0 0
+panel_background_id = 7
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom center horizontal
+panel_layer = top
+panel_monitor = all
+panel_shrink = 1
+autohide = 1
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.1
+autohide_height = 1
+strut_policy = none
+panel_window_name = tint2
+disable_transparency = 0
+mouse_effects = 0
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
+scale_relative_to_dpi = 0
+scale_relative_to_screen_height = 0
+
+#-------------------------------------
+# Button 1
+button = new
+button_text = 
+button_lclick_command = sh $HOME/.bin/toggle-bar.sh
+button_rclick_command = $HOME/.bin/toggle-pager.sh
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 10
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 2
+button = new
+button_text = 
+button_lclick_command = urxvtc -name tmux -g 190x50 -e sh -c '~/.bin/rxrun.sh'
+button_rclick_command = urxvtc -name tmux -g 190x50 -e sh -c 'tmux attach || tmux new -s work'
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 8
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 3
+button = new
+button_text = 
+button_lclick_command = urxvtc -name newsboat -g 190x50 -e newsboat
+button_rclick_command =
+button_mclick_command =
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 8
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 4
+button = new
+button_text = 
+button_lclick_command = xkill
+button_rclick_command =
+button_mclick_command = $HOME/.bin/toggle-tint.sh
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 8
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0
+
+#-------------------------------------
+# Button 5
+button = new
+button_text = 
+button_lclick_command = sh $HOME/.bin/xfce-theme.sh
+button_rclick_command = polybar-msg cmd toggle
+button_mclick_command = $HOME/.bin/compton.sh
+button_uwheel_command =
+button_dwheel_command =
+button_font = Font Awesome 5 Free 9
+button_font_color = #aeb4c6 100
+button_padding = 5 0
+button_background_id = 6
+button_centered = 0
+button_max_icon_size = 0

--- a/.config/tint2/tray.tint2rc
+++ b/.config/tint2/tray.tint2rc
@@ -1,79 +1,7 @@
-#---- Generated by tint2conf 20bb ----
-# See https://gitlab.com/o9000/tint2/wikis/Configure for 
-# full documentation of the configuration options.
-#-------------------------------------
-# Gradients
-#-------------------------------------
-# Backgrounds
-# Background 1: Активная задача
-rounded = 0
-border_width = 2
-border_sides = T
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #888888 0
-border_color = #5a74ca 100
-background_color_hover = #888888 20
-border_color_hover = #5a74ca 100
-background_color_pressed = #888888 20
-border_color_pressed = #5a74ca 100
-
-# Background 2: Задача по умолчанию, Свернутая задача
-rounded = 0
-border_width = 0
-border_sides = TBLR
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #000000 0
-border_color = #000000 0
-background_color_hover = #888888 20
-border_color_hover = #888888 20
-background_color_pressed = #888888 20
-border_color_pressed = #888888 20
-
-# Background 3: Неотложная задача
-rounded = 0
-border_width = 2
-border_sides = T
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #888888 0
-border_color = #e64141 100
-background_color_hover = #888888 20
-border_color_hover = #e64141 100
-background_color_pressed = #888888 20
-border_color_pressed = #e64141 100
-
-# Background 4: Неактивная панель задач
-rounded = 0
-border_width = 0
-border_sides = LR
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #2b303b 80
-border_color = #000000 0
-background_color_hover = #888888 20
-border_color_hover = #000000 0
-background_color_pressed = #888888 20
-border_color_pressed = #000000 0
-
-# Background 5: Активная панель задач, Батарея, Панель запуска, Системный лоток, Часы
-rounded = 0
-border_width = 0
-border_sides = LR
-border_content_tint_weight = 0
-background_content_tint_weight = 0
-background_color = #17181a 90
-border_color = #d8d8d8 0
-background_color_hover = #5a74ca 62
-border_color_hover = #d8d8d8 0
-background_color_pressed = #5a74ca 62
-border_color_pressed = #d8d8d8 0
-
-# Background 6: Всплывающий текст, Панель
+# Background 1: Панель, Системный лоток
 rounded = 0
 border_width = 0
-border_sides = TBLR
+border_sides = L
 border_content_tint_weight = 0
 background_content_tint_weight = 0
 background_color = #17181a 100
@@ -89,7 +17,7 @@ panel_items = S
 panel_size = 100% 34
 panel_margin = 0 0
 panel_padding = 5 0 0
-panel_background_id = 6
+panel_background_id = 1
 wm_menu = 1
 panel_dock = 0
 panel_position = bottom right horizontal
@@ -111,124 +39,11 @@ scale_relative_to_dpi = 0
 scale_relative_to_screen_height = 0
 
 #-------------------------------------
-# Taskbar
-taskbar_mode = multi_desktop
-taskbar_hide_if_empty = 1
-taskbar_padding = 0 0 0
-taskbar_background_id = 4
-taskbar_active_background_id = 5
-taskbar_name = 0
-taskbar_hide_inactive_tasks = 0
-taskbar_hide_different_monitor = 1
-taskbar_hide_different_desktop = 0
-taskbar_always_show_all_desktop_tasks = 0
-taskbar_name_padding = 4 4
-taskbar_name_background_id = 0
-taskbar_name_active_background_id = 0
-taskbar_name_font = Clear Sans Medium, Medium 10
-taskbar_name_font_color = #828282 100
-taskbar_name_active_font_color = #a0a0bd 100
-taskbar_distribute_size = 0
-taskbar_sort_order = none
-task_align = left
-
-#-------------------------------------
-# Task
-task_text = 0
-task_icon = 1
-task_centered = 1
-urgent_nb_of_blink = 20
-task_maximum_size = 36 26
-task_padding = 10 8 4
-task_font = Clear Sans Medium, Medium 10
-task_tooltip = 0
-task_thumbnail = 0
-task_thumbnail_size = 210
-task_font_color = #828282 60
-task_active_font_color = #828282 100
-task_urgent_font_color = #ffffff 100
-task_iconified_font_color = #d8d8d8 60
-task_icon_asb = 80 0 0
-task_active_icon_asb = 100 0 0
-task_urgent_icon_asb = 100 0 0
-task_iconified_icon_asb = 80 0 0
-task_background_id = 2
-task_active_background_id = 1
-task_urgent_background_id = 3
-task_iconified_background_id = 2
-mouse_left = toggle_iconify
-mouse_middle = next_task
-mouse_right = close
-mouse_scroll_up = toggle
-mouse_scroll_down = iconify
-
-#-------------------------------------
 # System tray (notification area)
 systray_padding = 8 2 4
-systray_background_id = 5
+systray_background_id = 1
 systray_sort = right2left
 systray_icon_size = 16
 systray_icon_asb = 40 0 0
 systray_monitor = primary
-systray_name_filter = 
-
-#-------------------------------------
-# Launcher
-launcher_padding = 5 0 5
-launcher_background_id = 5
-launcher_icon_background_id = 0
-launcher_icon_size = 24
-launcher_icon_asb = 100 0 0
-launcher_icon_theme_override = 0
-startup_notifications = 1
-launcher_tooltip = 1
-
-#-------------------------------------
-# Clock
-time1_format = %H:%M
-time2_format = 
-time1_font = Clear Sans Medium, Medium 11
-time1_timezone = 
-time2_timezone = 
-clock_font_color = #aeb4c6 100
-clock_padding = 4 4
-clock_background_id = 5
-clock_tooltip = 
-clock_tooltip_timezone = 
-clock_lclick_command = 
-clock_rclick_command = 
-clock_mclick_command = 
-clock_uwheel_command = 
-clock_dwheel_command = 
-
-#-------------------------------------
-# Battery
-battery_tooltip = 1
-battery_low_status = 20
-battery_low_cmd = notify-send "Battery Low"
-battery_full_cmd = 
-bat1_font = Ubuntu 11
-bat2_font = Ubuntu 0
-battery_font_color = #b5b5b5 100
-bat1_format = 
-bat2_format = 
-battery_padding = 4 2
-battery_background_id = 5
-battery_hide = 101
-battery_lclick_command = xfce4-power-manager-settings
-battery_rclick_command = xfce4-power-manager-settings
-battery_mclick_command = 
-battery_uwheel_command = 
-battery_dwheel_command = 
-ac_connected_cmd = 
-ac_disconnected_cmd = 
-
-#-------------------------------------
-# Tooltip
-tooltip_show_timeout = 0
-tooltip_hide_timeout = 0
-tooltip_padding = 10 6
-tooltip_background_id = 6
-tooltip_font_color = #d8d8d8 100
-tooltip_font = Ubuntu 10
-
+systray_name_filter =

--- /dev/null
+++ b/.config/tint2/tray.tint2rc.backup.1562874061
@@ -0,0 +1,49 @@
+# Background 1: Панель
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #17181a 100
+border_color = #222222 90
+background_color_hover = #2b303b 100
+border_color_hover = #222222 90
+background_color_pressed = #2b303b 100
+border_color_pressed = #222222 90
+
+#-------------------------------------
+# Panel
+panel_items = S
+panel_size = 100% 34
+panel_margin = 0 0
+panel_padding = 5 0 0
+panel_background_id = 6
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom right horizontal
+panel_layer = top
+panel_monitor = all
+panel_shrink = 1
+autohide = 1
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.1
+autohide_height = 1
+strut_policy = none
+panel_window_name = tint2
+disable_transparency = 0
+mouse_effects = 0
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
+scale_relative_to_dpi = 0
+scale_relative_to_screen_height = 0
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 8 2 4
+systray_background_id = 5
+systray_sort = right2left
+systray_icon_size = 16
+systray_icon_asb = 40 0 0
+systray_monitor = primary
+systray_name_filter =

--- /dev/null
+++ b/.config/tint2/tray.tint2rc.backup.1562874413
@@ -0,0 +1,56 @@
+#---- Generated by tint2conf b816 ----
+# See https://gitlab.com/o9000/tint2/wikis/Configure for
+# full documentation of the configuration options.
+#-------------------------------------
+# Gradients
+#-------------------------------------
+# Backgrounds
+# Background 1: Системный лоток
+rounded = 0
+border_width = 0
+border_sides = TBLR
+border_content_tint_weight = 0
+background_content_tint_weight = 0
+background_color = #17181a 100
+border_color = #222222 90
+background_color_hover = #2b303b 100
+border_color_hover = #222222 90
+background_color_pressed = #2b303b 100
+border_color_pressed = #222222 90
+
+#-------------------------------------
+# Panel
+panel_items = S
+panel_size = 100% 34
+panel_margin = 0 0
+panel_padding = 5 0 0
+panel_background_id = 0
+wm_menu = 1
+panel_dock = 0
+panel_position = bottom right horizontal
+panel_layer = top
+panel_monitor = all
+panel_shrink = 1
+autohide = 1
+autohide_show_timeout = 0
+autohide_hide_timeout = 0.1
+autohide_height = 1
+strut_policy = none
+panel_window_name = tint2
+disable_transparency = 0
+mouse_effects = 0
+font_shadow = 0
+mouse_hover_icon_asb = 100 0 10
+mouse_pressed_icon_asb = 100 0 0
+scale_relative_to_dpi = 0
+scale_relative_to_screen_height = 0
+
+#-------------------------------------
+# System tray (notification area)
+systray_padding = 8 2 4
+systray_background_id = 1
+systray_sort = right2left
+systray_icon_size = 16
+systray_icon_asb = 40 0 0
+systray_monitor = primary
+systray_name_filter =

--- a/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
+++ b/.config/xfce4/xfconf/xfce-perchannel-xml/xsettings.xml
@@ -34,6 +34,6 @@
     <property name="MenuBarAccel" type="empty"/>
     <property name="CursorThemeName" type="empty"/>
     <property name="CursorThemeSize" type="empty"/>
-    <property name="DecorationLayout" type="string" value="menu:"/>
+    <property name="DecorationLayout" type="string" value=":minimize,maximize,close"/>
   </property>
 </channel>

--- a/.dotsrc
+++ b/.dotsrc
@@ -105,6 +105,6 @@ ROOT_PATHS=(
 "/etc/pacman.conf"
 "/etc/sddm.conf"
 "/etc/vconsole.conf"
-"/etc/pulse/daemon.conf"
+"/etc/pulse/default.pa"
 "/usr/share/sddm/themes/darkine"
 )

--- a/.tmux.conf
+++ b/.tmux.conf
@@ -12,8 +12,8 @@ set-option -g aggressive-resize on
 set-option -g history-limit 10000
 set-option -w -g main-pane-width 90
 
-set-option -g default-terminal 'rxvt-unicode'
-#set-option -g default-terminal 'xterm-256color'
+# set-option -g default-terminal 'rxvt-unicode'
+set-option -g default-terminal 'xterm-256color'
 #set-option -ga terminal-overrides ',tmux-256color:Tc'
 
 set-option -ga terminal-overrides ',*:Ss=\E[%p1%d q:Se=\E[2 q'

--- a/.zshrc
+++ b/.zshrc
@@ -28,7 +28,9 @@ export FZF_DEFAULT_OPTS="--height 50% --layout=reverse --border --preview 'file
 export FZF_COMPLETION_TRIGGER="~~"
 
 # export TERM="xterm-kitty"
-export TERM="rxvt-unicode"
+# export TERM="rxvt-unicode"
+# export TERM="rxvt-unicode-256color"
+export TERM="xterm-256color"
 export EDITOR="$(if [[ -n $DISPLAY ]]; then echo 'subl3'; else echo 'nano'; fi)"
 export BROWSER="chromium"
 export SSH_KEY_PATH="~/.ssh/dsa_id"
@@ -37,8 +39,3 @@ export XDG_CONFIG_HOME="$HOME/.config"
 [[ -f ~/.alias_zsh ]] && . ~/.alias_zsh
 
 # export PATH=$HOME/.gem/ruby/2.6.0/bin:$PATH
-PATH="/home/st/perl5/bin${PATH:+:${PATH}}"; export PATH;
-PERL5LIB="/home/st/perl5/lib/perl5${PERL5LIB:+:${PERL5LIB}}"; export PERL5LIB;
-PERL_LOCAL_LIB_ROOT="/home/st/perl5${PERL_LOCAL_LIB_ROOT:+:${PERL_LOCAL_LIB_ROOT}}"; export PERL_LOCAL_LIB_ROOT;
-PERL_MB_OPT="--install_base \"/home/st/perl5\""; export PERL_MB_OPT;
-PERL_MM_OPT="INSTALL_BASE=/home/st/perl5"; export PERL_MM_OPT;

--- a/root/etc/pulse/daemon.conf
+++ /dev/null
@@ -1,90 +0,0 @@
-# This file is part of PulseAudio.
-#
-# PulseAudio is free software; you can redistribute it and/or modify
-# it under the terms of the GNU Lesser General Public License as published by
-# the Free Software Foundation; either version 2 of the License, or
-# (at your option) any later version.
-#
-# PulseAudio is distributed in the hope that it will be useful, but
-# WITHOUT ANY WARRANTY; without even the implied warranty of
-# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
-# General Public License for more details.
-#
-# You should have received a copy of the GNU Lesser General Public License
-# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
-
-## Configuration file for the PulseAudio daemon. See pulse-daemon.conf(5) for
-## more information. Default values are commented out.  Use either ; or # for
-## commenting.
-
-; daemonize = no
-; fail = yes
-; allow-module-loading = yes
-; allow-exit = yes
-; use-pid-file = yes
-; system-instance = no
-; local-server-type = user
-; enable-shm = yes
-; enable-memfd = yes
-; shm-size-bytes = 0 # setting this 0 will use the system-default, usually 64 MiB
-; lock-memory = no
-; cpu-limit = no
-
-; high-priority = yes
-; nice-level = -11
-
-; realtime-scheduling = yes
-; realtime-priority = 5
-
-; exit-idle-time = 20
-; scache-idle-time = 20
-
-; dl-search-path = (depends on architecture)
-
-; load-default-script-file = yes
-; default-script-file = /etc/pulse/default.pa
-
-; log-target = auto
-; log-level = notice
-; log-meta = no
-; log-time = no
-; log-backtrace = 0
-
-; resample-method = speex-float-1
-avoid-resampling = true
-; enable-remixing = yes
-; remixing-use-all-sink-channels = yes
-; enable-lfe-remixing = no
-; lfe-crossover-freq = 0
-
-flat-volumes = no
-; flat-volumes = yes
-
-; rlimit-fsize = -1
-; rlimit-data = -1
-; rlimit-stack = -1
-; rlimit-core = -1
-; rlimit-as = -1
-; rlimit-rss = -1
-; rlimit-nproc = -1
-; rlimit-nofile = 256
-; rlimit-memlock = -1
-; rlimit-locks = -1
-; rlimit-sigpending = -1
-; rlimit-msgqueue = -1
-; rlimit-nice = 31
-; rlimit-rtprio = 9
-; rlimit-rttime = 200000
-
-; default-sample-format = s16le
-default-sample-rate = 48000
-; alternate-sample-rate = 48000
-; default-sample-channels = 2
-; default-channel-map = front-left,front-right
-
-; default-fragments = 4
-; default-fragment-size-msec = 25
-
-; enable-deferred-volume = yes
-; deferred-volume-safety-margin-usec = 8000
-; deferred-volume-extra-delay-usec = 0

--- /dev/null
+++ b/root/etc/pulse/default.pa
@@ -0,0 +1,142 @@
+#!/usr/bin/pulseaudio -nF
+#
+# This file is part of PulseAudio.
+#
+# PulseAudio is free software; you can redistribute it and/or modify it
+# under the terms of the GNU Lesser General Public License as published by
+# the Free Software Foundation; either version 2 of the License, or
+# (at your option) any later version.
+#
+# PulseAudio is distributed in the hope that it will be useful, but
+# WITHOUT ANY WARRANTY; without even the implied warranty of
+# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the GNU
+# General Public License for more details.
+#
+# You should have received a copy of the GNU Lesser General Public License
+# along with PulseAudio; if not, see <http://www.gnu.org/licenses/>.
+
+# This startup script is used only if PulseAudio is started per-user
+# (i.e. not in system mode)
+
+.fail
+
+### Automatically restore the volume of streams and devices
+load-module module-device-restore
+load-module module-stream-restore
+load-module module-card-restore
+
+### Automatically augment property information from .desktop files
+### stored in /usr/share/application
+load-module module-augment-properties
+
+### Should be after module-*-restore but before module-*-detect
+load-module module-switch-on-port-available
+
+### Load audio drivers statically
+### (it's probably better to not load these drivers manually, but instead
+### use module-udev-detect -- see below -- for doing this automatically)
+#load-module module-alsa-sink
+#load-module module-alsa-source device=hw:1,0
+#load-module module-oss device="/dev/dsp" sink_name=output source_name=input
+#load-module module-oss-mmap device="/dev/dsp" sink_name=output source_name=input
+#load-module module-null-sink
+#load-module module-pipe-sink
+
+### Automatically load driver modules depending on the hardware available
+.ifexists module-udev-detect.so
+load-module module-udev-detect tsched=0
+.else
+### Use the static hardware detection module (for systems that lack udev support)
+load-module module-detect
+.endif
+
+### Automatically connect sink and source if JACK server is present
+.ifexists module-jackdbus-detect.so
+.nofail
+load-module module-jackdbus-detect channels=2
+.fail
+.endif
+
+### Automatically load driver modules for Bluetooth hardware
+.ifexists module-bluetooth-policy.so
+load-module module-bluetooth-policy
+.endif
+
+.ifexists module-bluetooth-discover.so
+load-module module-bluetooth-discover
+.endif
+
+### Load several protocols
+load-module module-dbus-protocol
+.ifexists module-esound-protocol-unix.so
+load-module module-esound-protocol-unix
+.endif
+load-module module-native-protocol-unix
+
+### Network access (may be configured with paprefs, so leave this commented
+### here if you plan to use paprefs)
+#load-module module-esound-protocol-tcp
+#load-module module-native-protocol-tcp
+#load-module module-zeroconf-publish
+
+### Load the RTP receiver module (also configured via paprefs, see above)
+#load-module module-rtp-recv
+
+### Load the RTP sender module (also configured via paprefs, see above)
+#load-module module-null-sink sink_name=rtp format=s16be channels=2 rate=44100 sink_properties="device.description='RTP Multicast Sink'"
+#load-module module-rtp-send source=rtp.monitor
+
+### Load additional modules from GSettings. This can be configured with the paprefs tool.
+### Please keep in mind that the modules configured by paprefs might conflict with manually
+### loaded modules.
+.ifexists module-gsettings.so
+.nofail
+load-module module-gsettings
+.fail
+.endif
+
+
+### Automatically restore the default sink/source when changed by the user
+### during runtime
+### NOTE: This should be loaded as early as possible so that subsequent modules
+### that look up the default sink/source get the right value
+load-module module-default-device-restore
+
+### Automatically move streams to the default sink if the sink they are
+### connected to dies, similar for sources
+load-module module-rescue-streams
+
+### Make sure we always have a sink around, even if it is a null sink.
+load-module module-always-sink
+
+### Honour intended role device property
+load-module module-intended-roles
+
+### Automatically suspend sinks/sources that become idle for too long
+load-module module-suspend-on-idle
+
+### If autoexit on idle is enabled we want to make sure we only quit
+### when no local session needs us anymore.
+.ifexists module-console-kit.so
+load-module module-console-kit
+.endif
+.ifexists module-systemd-login.so
+load-module module-systemd-login
+.endif
+
+### Enable positioned event sounds
+load-module module-position-event-sounds
+
+### Cork music/video streams when a phone stream is active
+load-module module-role-cork
+
+### Modules to allow autoloading of filters (such as echo cancellation)
+### on demand. module-filter-heuristics tries to determine what filters
+### make sense, and module-filter-apply does the heavy-lifting of
+### loading modules and rerouting streams.
+load-module module-filter-heuristics
+load-module module-filter-apply
+
+### Make some devices default
+#set-default-sink output
+#set-default-source input