From d5c549b6a084f9a5fcb3717dd20ab898c6b776bc Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 15:27:43 +0300
Subject: [PATCH 01/21] neomutt -> mutt

---
 etc/shell/bash/aliases | 2 +-
 etc/soft/packages.list | 3 ++-
 2 files changed, 3 insertions(+), 2 deletions(-)

diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index 9588d60..601f457 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -56,7 +56,7 @@ alias vi="nvim -u NONE"	#noindex
 alias vim="nvim -i $SHELLRC/var/vim/nviminfo -p $*"	#noindex
 alias vimdiff="nvim -i $SHELLRC/var/vim/nviminfo -d $*"	#noindex
 alias lsi="TERM=xterm-256color lsi" #noindex
-alias mutt="TERM=xterm-256color neomutt -y -F $SHELLRC/etc/mail/mutt/muttrc && echo "0" > $MD/new" #noindex
+alias mutt="TERM=xterm-256color mutt -y -F $SHELLRC/etc/mail/mutt/muttrc && echo "0" > $MD/new" #noindex
 alias screen="TERM=rxvt-256color screen" #noindex
 alias figlet="figlet -f $SHELLRC/etc/soft/figlet/fonts/standard.flf" #noindex
 alias zathura="nh zathura"	#noindex
diff --git a/etc/soft/packages.list b/etc/soft/packages.list
index 8d7ce53..0b6af38 100755
--- a/etc/soft/packages.list
+++ b/etc/soft/packages.list
@@ -17,6 +17,7 @@ PACKAGES="
 	zathura		#Просмотр PDF/DJVU
 	geeqie		#Просмотр изображений
 
+	newsboat	#Чтение RSS
 	nnn		#Файловый менеджер
 
 	shellcheck	#Линтер bash
@@ -27,7 +28,7 @@ PACKAGES="
 	vifm		#Файловый менеджер
 	nvim		#Текстовый редактор
 	sdcv		#Словарь
-	neomutt		#Почта
+	mutt		#Почта
 	sxiv		#Просмотр изображений
 	connmanctl	#Управление WiFi
 	ls-i		#ls со значками			https://github.com/illinoisjackson/even-better-ls

From 4c3075ce1d95bc6f5be391e8f34cbb63682586aa Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 15:28:25 +0300
Subject: [PATCH 02/21] rss++

---
 etc/net/newsboat/urls | 1 +
 1 file changed, 1 insertion(+)

diff --git a/etc/net/newsboat/urls b/etc/net/newsboat/urls
index cbaa525..f50fb7e 100644
--- a/etc/net/newsboat/urls
+++ b/etc/net/newsboat/urls
@@ -3,3 +3,4 @@ https://planet.haskell.org/atom.xml
 https://www.reddit.com/r/vim/.rss          "~Reddit/vim"
 https://www.reddit.com/r/neovim/.rss       "~Reddit/neovim"
 https://www.reddit.com/r/commandline/.rss  "~Reddit/commandline"
+https://reversed.top/feed.xml

From bf3b65ea7674fb08790546502dbed89da28ad190 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 18:26:48 +0300
Subject: [PATCH 03/21] cron: newsboat

---
 etc/cron/crontab | 5 ++++-
 1 file changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/cron/crontab b/etc/cron/crontab
index 39e2e7b..82a902d 100644
--- a/etc/cron/crontab
+++ b/etc/cron/crontab
@@ -1,6 +1,6 @@
 # crontab
 #
-# Изменён: Вт 22 окт 2019 09:51:43
+# Изменён: Ср 19 фев 2020 18:26:38
 #
 
 # MIN HOUR DAY MONTH DAYOFWEEK COMMAND
@@ -8,6 +8,9 @@
 # Проверка почты
 */10 * * * * ~/.shellrc/bin/scripts/checkmail
 
+# Обновление RSS
+*/30 * * * * /usr/bin/newsboat -x reload
+
 # Удаление файлов, к которым не обращались дольше трёх месяцев
 * * */10 * * ~/.shellrc/bin/exec/delolder 90 ~/.shellrc/var/vim/
 

From 72ce88aef450e0a2287cd21e55064bef798d2076 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 18:27:33 +0300
Subject: [PATCH 04/21] =?UTF-8?q?vifm:=20=D0=BF=D1=80=D0=BE=D1=81=D0=BC?=
 =?UTF-8?q?=D0=BE=D1=82=D1=80=20webp-=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0?=
 =?UTF-8?q?=D0=B6=D0=B5=D0=BD=D0=B8=D0=B9=20=D0=B2=20sxiv?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/soft/vifm/filetypes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes
index 6f96b10..9c762ef 100644
--- a/etc/soft/vifm/filetypes
+++ b/etc/soft/vifm/filetypes
@@ -20,8 +20,8 @@ fileviewer *.torrent dumptorrent -v %f
 filetype *.txt nvim %f
 
 " img
-filetype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico sxiv %c %d/, x-open %c
-filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico sxiv %c %d/, x-open %c
+filetype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico,*.webp sxiv %c %d/, x-open %c
+filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico,*.webp sxiv %c %d/, x-open %c
 filextype *.svg sensible-browser %f &
 " fileviewer *.jpg,*.png lsimg %d/%f %q %pc
 fileviewer *.jpg,*.jpeg,*.png,*.gif exiftool %f, exiv2 %f

From 89b941a4b56e6702373da343f454c181cce61f8f Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 18:36:07 +0300
Subject: [PATCH 05/21] polybar: ++rss

---
 etc/soft/polybar/config | 12 ++++++++++--
 1 file changed, 10 insertions(+), 2 deletions(-)

diff --git a/etc/soft/polybar/config b/etc/soft/polybar/config
index aa926b5..5d9205e 100644
--- a/etc/soft/polybar/config
+++ b/etc/soft/polybar/config
@@ -70,9 +70,9 @@ font-0 = NotoMono Nerd Font:size=12
 font-1 = NotoMono Nerd Font:size=12
 font-2 = NotoMono Nerd Font:size=12
 
-modules-left = desktop mpd
+modules-left = desktop
 modules-center = filesystem 
-modules-right = bdays webcheck mail battery backlight alsa xkeyboard date
+modules-right = bdays webcheck rss mail battery backlight alsa xkeyboard date
 
 separator = |
 
@@ -127,6 +127,14 @@ interval = 86400
 format = 
 format-foreground = ${colors.alert}
 
+[module/rss]
+type = custom/script
+exec = newsboat -x print-unread | awk '{ print $1 }'
+interval = 1200
+
+format-prefix = " "
+format-underline = ${colors.yellow}
+
 [module/mail]
 type = custom/script
 exec = cat $MD/new

From 763f8b708265f38cfa562f4f1e08145e10654896 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 18:53:44 +0300
Subject: [PATCH 06/21] =?UTF-8?q?polybar:=20=D0=BF=D1=80=D0=BE=D0=B2=D0=B5?=
 =?UTF-8?q?=D1=80=D0=BA=D0=B0=20=D0=BD=D0=B5=D0=BF=D1=80=D0=BE=D1=87=D0=B8?=
 =?UTF-8?q?=D1=82=D0=B0=D0=BD=D0=BD=D1=8B=D1=85=20=D0=BD=D0=BE=D0=B2=D0=BE?=
 =?UTF-8?q?=D1=81=D1=82=D0=B5=D0=B9=20=D0=BA=D0=B0=D0=B6=D0=B4=D1=8B=D0=B5?=
 =?UTF-8?q?=202=20=D0=BC=D0=B8=D0=BD=D1=83=D1=82=D1=8B?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/soft/polybar/config | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/etc/soft/polybar/config b/etc/soft/polybar/config
index 5d9205e..38f3738 100644
--- a/etc/soft/polybar/config
+++ b/etc/soft/polybar/config
@@ -130,7 +130,7 @@ format-foreground = ${colors.alert}
 [module/rss]
 type = custom/script
 exec = newsboat -x print-unread | awk '{ print $1 }'
-interval = 1200
+interval = 120
 
 format-prefix = " "
 format-underline = ${colors.yellow}

From bff9fab6fc0433e577dfc43f3c6bc9123adc84ba Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 19 Feb 2020 19:50:11 +0300
Subject: [PATCH 07/21] =?UTF-8?q?polybar,=20newsboat,=20cron:=20=D0=BF?=
 =?UTF-8?q?=D1=80=D0=BE=D0=B2=D0=B5=D1=80=D0=BA=D0=B0=20RSS=20=D0=B1=D0=B5?=
 =?UTF-8?q?=D0=B7=20cron?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/cron/crontab        | 5 +----
 etc/soft/polybar/config | 4 ++--
 2 files changed, 3 insertions(+), 6 deletions(-)

diff --git a/etc/cron/crontab b/etc/cron/crontab
index 82a902d..2d8f895 100644
--- a/etc/cron/crontab
+++ b/etc/cron/crontab
@@ -1,6 +1,6 @@
 # crontab
 #
-# Изменён: Ср 19 фев 2020 18:26:38
+# Изменён: Ср 19 фев 2020 19:44:47
 #
 
 # MIN HOUR DAY MONTH DAYOFWEEK COMMAND
@@ -8,9 +8,6 @@
 # Проверка почты
 */10 * * * * ~/.shellrc/bin/scripts/checkmail
 
-# Обновление RSS
-*/30 * * * * /usr/bin/newsboat -x reload
-
 # Удаление файлов, к которым не обращались дольше трёх месяцев
 * * */10 * * ~/.shellrc/bin/exec/delolder 90 ~/.shellrc/var/vim/
 
diff --git a/etc/soft/polybar/config b/etc/soft/polybar/config
index 38f3738..f715f9e 100644
--- a/etc/soft/polybar/config
+++ b/etc/soft/polybar/config
@@ -129,8 +129,8 @@ format-foreground = ${colors.alert}
 
 [module/rss]
 type = custom/script
-exec = newsboat -x print-unread | awk '{ print $1 }'
-interval = 120
+exec = newsboat -x reload; newsboat -x print-unread | awk '{ print $1 }'
+interval = 1200
 
 format-prefix = " "
 format-underline = ${colors.yellow}

From 7a8c6a42d5dfe1965d2570d1d1aabf8e72f7af7f Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Thu, 20 Feb 2020 20:39:30 +0300
Subject: [PATCH 08/21] bash: stop/start/restart services

---
 etc/shell/bash/aliases | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index 601f457..97ace45 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -375,11 +375,11 @@ lnbin() {
 #- Поиск процесса по имени
 alias pgrep="pgrep -l"
 #- Запуск сервиса
-start() { su -c "sh /etc/init.d/$1 start"; }
+start() { su -c "/etc/init.d/$1 start"; }
 #- Остановка сервиса
-stop() { su -c "sh /etc/init.d/$1 stop"; }
+stop() { su -c "/etc/init.d/$1 stop"; }
 #- Перезапуск сервиса
-restart() { su -c "sh /etc/init.d/$1 restart"; }
+restart() { su -c "/etc/init.d/$1 restart"; }
 
 #}}} ###########################################################################
 #{{{ \033[00m\n\b------<Прочее>\n

From 79b244813ed325c8b784c9a9566c73899db026aa Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Thu, 20 Feb 2020 20:40:14 +0300
Subject: [PATCH 09/21] vifm: ++retag

---
 etc/soft/vifm/commands | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/etc/soft/vifm/commands b/etc/soft/vifm/commands
index a3e066d..e12255f 100644
--- a/etc/soft/vifm/commands
+++ b/etc/soft/vifm/commands
@@ -48,7 +48,9 @@ command z !!zathura %c:p
 
 command renamepdfs !renamepdfs --directory %d %f
 
-command g !press-n-post %f
+command g !press-n-post %c
 
 command todolist todolist %d %M
 
+command retag retag -v %f:p
+

From 91fb2276c27f037b6b33d11600abd50a07473a6a Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Fri, 21 Feb 2020 15:17:54 +0300
Subject: [PATCH 10/21] =?UTF-8?q?sxiv:=20=D1=83=D0=B4=D0=B0=D0=BB=D0=B5?=
 =?UTF-8?q?=D0=BD=D0=B8=D0=B5=20=D0=B8=D0=B7=D0=BE=D0=B1=D1=80=D0=B0=D0=B6?=
 =?UTF-8?q?=D0=B5=D0=BD=D0=B8=D0=B9?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/rc.linux-gnu               |  3 ++-
 etc/soft/sxiv/exec/image-info  | 20 ++++++++++++++++++++
 etc/soft/sxiv/exec/key-handler | 19 +++++++++++++++++++
 3 files changed, 41 insertions(+), 1 deletion(-)
 create mode 100755 etc/soft/sxiv/exec/image-info
 create mode 100755 etc/soft/sxiv/exec/key-handler

diff --git a/etc/rc.linux-gnu b/etc/rc.linux-gnu
index a5c06e1..b506d66 100644
--- a/etc/rc.linux-gnu
+++ b/etc/rc.linux-gnu
@@ -51,7 +51,7 @@ mkdir -p ~/.config/dunst
 - soft/conky/conkyrc.$(uname -i)   ~
 - soft/ctags/ctags                 ~
 + soft/nvim                        ~/.config
-+ soft/vifm                        ~
++ soft/vifm                        ~/.config
 - soft/vimperator                  ~
 - soft/vimperator/vimperatorrc     ~
 + soft/git/gitconfig               ~
@@ -59,6 +59,7 @@ mkdir -p ~/.config/dunst
 - soft/stalonetray/stalonetrayrc   ~
 - soft/tmux/tmux.conf              ~
 + media/alsa/asoundrc              ~
++ soft/sxiv                        ~/.config
 + soft/dfc                         ~/.config
 + soft/polybar                     ~/.config
 + soft/htop                        ~/.config
diff --git a/etc/soft/sxiv/exec/image-info b/etc/soft/sxiv/exec/image-info
new file mode 100755
index 0000000..da610cf
--- /dev/null
+++ b/etc/soft/sxiv/exec/image-info
@@ -0,0 +1,20 @@
+#!/bin/sh
+
+# Example for $XDG_CONFIG_HOME/sxiv/exec/image-info
+# Called by sxiv(1) whenever an image gets loaded.
+# The output is displayed in sxiv's status bar.
+# Arguments:
+#   $1: path to image file
+#   $2: image width
+#   $3: image height
+
+s="  " # field separator
+
+exec 2>/dev/null
+
+filename=$(basename -- "$1")
+filesize=$(du -Hh -- "$1" | cut -f 1)
+geometry="${2}x${3}"
+
+echo "${filesize}${s}${geometry}${s}${filename}"
+
diff --git a/etc/soft/sxiv/exec/key-handler b/etc/soft/sxiv/exec/key-handler
new file mode 100755
index 0000000..39e860b
--- /dev/null
+++ b/etc/soft/sxiv/exec/key-handler
@@ -0,0 +1,19 @@
+#!/bin/sh
+
+# $XDG_CONFIG_HOME/sxiv/exec/key-handler
+#
+# Called by sxiv(1) after the external prefix key (C-x by default) is pressed.
+# The next key combo is passed as its first argument. Passed via stdin are the
+# images to act upon, one path per line: all marked images, if in thumbnail
+# mode and at least one image has been marked, otherwise the current image.
+# sxiv(1) blocks until this script terminates. It then checks which images
+# have been modified and reloads them.
+#
+# The key combo argument has the following form: "[C-][M-][S-]KEY",
+# where C/M/S indicate Ctrl/Meta(Alt)/Shift modifier states and KEY is the X
+# keysym as listed in /usr/include/X11/keysymdef.h without the "XK_" prefix.
+
+case "$1" in
+	"C-d")      tr '\n' '\0' | xargs -IF -0 rm -v F;;
+esac
+

From b5bb4155d47efe554d8086a4315d37e5a3c33372 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Fri, 21 Feb 2020 15:18:23 +0300
Subject: [PATCH 11/21] =?UTF-8?q?bash:=20=D0=B7=D0=B0=D0=B3=D1=80=D1=83?=
 =?UTF-8?q?=D0=B7=D0=BA=D0=B0=20=D0=BD=D0=B0=D1=81=D1=82=D1=80=D0=BE=D0=B5?=
 =?UTF-8?q?=D0=BA=20XDG?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/shell/bash/bashrc     | 4 +++-
 etc/wm/xdg/user-dirs.dirs | 1 +
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/shell/bash/bashrc b/etc/shell/bash/bashrc
index d2be067..75ca0e3 100755
--- a/etc/shell/bash/bashrc
+++ b/etc/shell/bash/bashrc
@@ -1,6 +1,6 @@
 #!/bin/bash ####################################################################
 #
-# Изменён: Вт 18 фев 2020 17:01:38
+# Изменён: Пт 21 фев 2020 14:24:30
 #
 ################################################################################
 
@@ -16,6 +16,8 @@ export INPUTRC="$BASHRC/inputrc"		#Файл inputrc
 export GTK_IM_MODULE="xim"			#Метод ввода Χ
 export QT_IM_MODULE="xim"			#Метод ввода Χ
 
+source "$SHELLRC/etc/wm/xdg/user-dirs.dirs"
+
 export HSTR_CONFIG="keywords-matching,blacklist,hicolor" #hstr
 export HSTR_PROMPT="> "
 
diff --git a/etc/wm/xdg/user-dirs.dirs b/etc/wm/xdg/user-dirs.dirs
index 32f6cc1..6d10d8d 100644
--- a/etc/wm/xdg/user-dirs.dirs
+++ b/etc/wm/xdg/user-dirs.dirs
@@ -1,3 +1,4 @@
+XDG_CONFIG_HOME="$HOME/.config"
 XDG_DESKTOP_DIR="$HOME"
 XDG_TEMPLATES_DIR="$HOME"
 XDG_PUBLICSHARE_DIR="$HOME"

From 866cdf7d29ca27c451ba57eaa22ba7015a33727f Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Fri, 21 Feb 2020 15:18:58 +0300
Subject: [PATCH 12/21] =?UTF-8?q?vifm:=20sxiv:=20=D1=80=D0=B5=D0=B6=D0=B8?=
 =?UTF-8?q?=D0=BC=20=D0=B1=D0=B5=D0=B7=20=D1=81=D0=BE=D0=B7=D0=B4=D0=B0?=
 =?UTF-8?q?=D0=BD=D0=B8=D1=8F=20=D0=B2=D1=80=D0=B5=D0=BC=D0=B5=D0=BD=D0=BD?=
 =?UTF-8?q?=D1=8B=D1=85=20=D1=84=D0=B0=D0=B9=D0=BB=D0=BE=D0=B2?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/soft/vifm/filetypes | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes
index 9c762ef..14514d6 100644
--- a/etc/soft/vifm/filetypes
+++ b/etc/soft/vifm/filetypes
@@ -20,8 +20,8 @@ fileviewer *.torrent dumptorrent -v %f
 filetype *.txt nvim %f
 
 " img
-filetype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico,*.webp sxiv %c %d/, x-open %c
-filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico,*.webp sxiv %c %d/, x-open %c
+filetype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico,*.webp sxiv -p %c %d/, x-open %c
+filextype *.bmp,*.jpg,*.jpeg,*.png,*.gif,*.ico,*.webp sxiv -p %c %d/, x-open %c
 filextype *.svg sensible-browser %f &
 " fileviewer *.jpg,*.png lsimg %d/%f %q %pc
 fileviewer *.jpg,*.jpeg,*.png,*.gif exiftool %f, exiv2 %f

From e1ee91e5c50fd67e0df4b35c0983b5c79b72a889 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Fri, 21 Feb 2020 16:19:51 +0300
Subject: [PATCH 13/21] vifm: ++mpv

---
 etc/soft/vifm/filetypes | 2 +-
 etc/soft/vifm/vifmrc    | 3 +++
 2 files changed, 4 insertions(+), 1 deletion(-)

diff --git a/etc/soft/vifm/filetypes b/etc/soft/vifm/filetypes
index 14514d6..293b1e6 100644
--- a/etc/soft/vifm/filetypes
+++ b/etc/soft/vifm/filetypes
@@ -33,7 +33,7 @@ fileviewer *.mp3 exiftool %f, mp3info %f
 
 " video
 filextype *.avi,*.mp4,*.wmv,*.3gp,*.ogv,*.mkv,*.mpg,*.vob,*.flv,*.mov
-  \ vlc %f &
+  \ mpv %f &, vlc %f &
 
 " playlist
 filextype *.m3u vlc %f &
diff --git a/etc/soft/vifm/vifmrc b/etc/soft/vifm/vifmrc
index 38f515c..f4003ee 100644
--- a/etc/soft/vifm/vifmrc
+++ b/etc/soft/vifm/vifmrc
@@ -37,6 +37,9 @@ set findprg="fd %A %s"
 
 set timefmt="%d.%m.%y %H:%M"
 
+" Отключить отображение / в именах директорий
+set classify=
+
 " %t - file name (considering value of the 'classify' option)
 " %T - symbolic link target (empty for other filetypes)
 " %f - file name relative to current directory (considers 'classify')

From 5197d069cb9193305e7e5b31bf26f6d177a817a9 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Fri, 21 Feb 2020 16:23:35 +0300
Subject: [PATCH 14/21] =?UTF-8?q?vifm:=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20~/.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/soft/vifm/vifmrc | 10 +++++-----
 1 file changed, 5 insertions(+), 5 deletions(-)

diff --git a/etc/soft/vifm/vifmrc b/etc/soft/vifm/vifmrc
index f4003ee..f617933 100644
--- a/etc/soft/vifm/vifmrc
+++ b/etc/soft/vifm/vifmrc
@@ -60,9 +60,9 @@ set slowfs=curlftpfs
 
 let $VIFM_SHELL = 'VIFM: '
 
-source ~/.vifm/marks
-source ~/.vifm/filetypes
-source ~/.vifm/commands
-source ~/.vifm/mappings
-source ~/.vifm/icons
+source ~/.config/vifm/marks
+source ~/.config/vifm/filetypes
+source ~/.config/vifm/commands
+source ~/.config/vifm/mappings
+source ~/.config/vifm/icons
 

From 14ac9f8a7d2c9654ddb1c2a8d2ea8a8c44f39d02 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Fri, 21 Feb 2020 16:25:04 +0300
Subject: [PATCH 15/21] =?UTF-8?q?vifm:=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20~/.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/shell/bash/aliases | 6 +++---
 1 file changed, 3 insertions(+), 3 deletions(-)

diff --git a/etc/shell/bash/aliases b/etc/shell/bash/aliases
index 97ace45..26545a7 100755
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@@ -208,13 +208,13 @@ vicd() { #noindex
 
 function vifm() { #noindex
 	if [ -f ~/.vifm/lastdir ]; then
-		\rm ~/.vifm/lastdir
+		\rm ~/.config/.vifm/lastdir
 	fi
 
 	# "command" prevents recursive call
 	TERM=xterm-256color command vifm .
-	if [ -f ~/.vifm/lastdir ]; then
-		cd "`cat ~/.vifm/lastdir`"
+	if [ -f ~/.config/.vifm/lastdir ]; then
+		cd "`cat ~/.config/.vifm/lastdir`"
 	fi
 }
 

From 49a97dc8020486e3c3cc4018f9015c22c6a2acc9 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Sat, 22 Feb 2020 23:03:09 +0300
Subject: [PATCH 16/21] =?UTF-8?q?vifm:=20=D0=BD=D0=B0=D1=81=D1=82=D1=80?=
 =?UTF-8?q?=D0=BE=D0=B9=D0=BA=D0=B8=20=D0=BF=D0=B5=D1=80=D0=B5=D0=BD=D0=B5?=
 =?UTF-8?q?=D1=81=D0=B5=D0=BD=D1=8B=20=D0=B2=20~/.config?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/soft/vifm/commands | 8 ++++----
 1 file changed, 4 insertions(+), 4 deletions(-)

diff --git a/etc/soft/vifm/commands b/etc/soft/vifm/commands
index e12255f..3bd9dea 100644
--- a/etc/soft/vifm/commands
+++ b/etc/soft/vifm/commands
@@ -1,5 +1,5 @@
 " Выход с переходом в текущую директорию
-command! Q :execute '!echo %d > ~/.vifm/lastdir' | quit
+command! Q :execute '!echo %d > ~/.config/vifm/lastdir' | quit
 
 command df  dfc -t apfs,ext4,fuseblk,osxfuse -w -s -T %m 2> /dev/null
 command dfc dfc -t apfs,ext4,fuseblk,osxfuse -w -s -T %m 2> /dev/null
@@ -10,9 +10,9 @@ command dmesg dmesg %m
 command tag !tmsu tag --tags="%a" %c
 command untagged tmsu untagged | sort %M
 
-command bklist cat ~/.vifm/bookmarks.list %M
-command bkedit !nvim ~/.vifm/bookmarks.list
-command bkadd  :!echo %c:p >> ~/.vifm/bookmarks.list
+command bklist cat ~/.config/vifm/bookmarks.list %M
+command bkedit !nvim ~/.config/vifm/bookmarks.list
+command bkadd  :!echo %c:p >> ~/.config/vifm/bookmarks.list
 
 command man man %a %m
 command fb fb2 %c:p %m

From 587a1fd92d146ade1cf36dc565a7e502f23115b2 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 26 Feb 2020 22:06:39 +0300
Subject: [PATCH 17/21] xbindkeys: ++skippy-xd

---
 etc/X/xbindkeysrc.GenuineIntel | 9 ++++-----
 1 file changed, 4 insertions(+), 5 deletions(-)

diff --git a/etc/X/xbindkeysrc.GenuineIntel b/etc/X/xbindkeysrc.GenuineIntel
index b4396fa..e461e05 100644
--- a/etc/X/xbindkeysrc.GenuineIntel
+++ b/etc/X/xbindkeysrc.GenuineIntel
@@ -1,6 +1,6 @@
 # xbindkeysrc.GehuineIntel
 #
-# Изменён: Пт 14 фев 2020 13:30:11
+# Изменён: Ср 26 фев 2020 22:04:05
 #
 
 #ACPI#{{{
@@ -28,10 +28,6 @@
 	m:0xc + c:9
 	Control+Alt + Escape
 
-"serial"
-	m:0x40 + c:33
-	Mod4 + p
-
 "import screenshot_$(\date +%Y-%m-%d_%H:%M:%S).png"
 	m:0x0 + c:107
         Print
@@ -49,5 +45,8 @@
 "www"
         Alt + n
 
+"skippy-xd"
+        Alt + z
+
 #}}}
 

From 34d9d1aa14197ec390cbbf903567c2a5e8710b2c Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 26 Feb 2020 22:06:55 +0300
Subject: [PATCH 18/21] =?UTF-8?q?vifm:=20=D0=BE=D1=82=D0=BE=D0=B1=D1=80?=
 =?UTF-8?q?=D0=B0=D0=B6=D0=B5=D0=BD=D0=B8=D0=B5=20=D0=BF=D0=BE=D0=B4=D1=81?=
 =?UTF-8?q?=D0=BA=D0=B0=D0=B7=D0=BE=D0=BA?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/soft/vifm/vifmrc | 3 +++
 1 file changed, 3 insertions(+)

diff --git a/etc/soft/vifm/vifmrc b/etc/soft/vifm/vifmrc
index f617933..ae9192b 100644
--- a/etc/soft/vifm/vifmrc
+++ b/etc/soft/vifm/vifmrc
@@ -40,6 +40,9 @@ set timefmt="%d.%m.%y %H:%M"
 " Отключить отображение / в именах директорий
 set classify=
 
+" Отображение подсказок
+set suggestoptions=normal,visual,view,otherpane,keys,marks,registers
+
 " %t - file name (considering value of the 'classify' option)
 " %T - symbolic link target (empty for other filetypes)
 " %f - file name relative to current directory (considers 'classify')

From fecc62b2b6e3ed90248f49e55166431d0fdea938 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Wed, 26 Feb 2020 23:13:15 +0300
Subject: [PATCH 19/21] skippy: config

---
 etc/X/xbindkeysrc.GenuineIntel |  7 +++-
 etc/wm/skippy/skippy-xd.all.rc | 92 ++++++++++++++++++++++++++++++++++++++++++
 etc/wm/skippy/skippy-xd.rc     | 92 ++++++++++++++++++++++++++++++++++++++++++
 3 files changed, 189 insertions(+), 2 deletions(-)
 create mode 100644 etc/wm/skippy/skippy-xd.all.rc
 create mode 100644 etc/wm/skippy/skippy-xd.rc

diff --git a/etc/X/xbindkeysrc.GenuineIntel b/etc/X/xbindkeysrc.GenuineIntel
index e461e05..124b0d9 100644
--- a/etc/X/xbindkeysrc.GenuineIntel
+++ b/etc/X/xbindkeysrc.GenuineIntel
@@ -1,6 +1,6 @@
 # xbindkeysrc.GehuineIntel
 #
-# Изменён: Ср 26 фев 2020 22:04:05
+# Изменён: Ср 26 фев 2020 23:03:10
 #
 
 #ACPI#{{{
@@ -45,8 +45,11 @@
 "www"
         Alt + n
 
-"skippy-xd"
+"skippy-xd --config $SHELLRC/etc/wm/skippy/skippy-xd.rc"
         Alt + z
 
+"skippy-xd --config $SHELLRC/etc/wm/skippy/skippy-xd.all.rc"
+        Alt + a
+
 #}}}
 
diff --git a/etc/wm/skippy/skippy-xd.all.rc b/etc/wm/skippy/skippy-xd.all.rc
new file mode 100644
index 0000000..6237fe2
--- /dev/null
+++ b/etc/wm/skippy/skippy-xd.all.rc
@@ -0,0 +1,92 @@
+# Copy this to ~/.config/skippy-xd/skippy-xd.rc and edit it to your liking
+#
+# Notes:
+#
+# - colors can be anything XAllocNamedColor can handle
+#   (like "black" or "#000000")
+#
+# - distance is a relative number, and is scaled according to the scale
+#   factor applied to windows
+#
+# - fonts are Xft font descriptions
+#
+# - booleans are "true" or anything but "true" (-> false)
+#
+# - opacity is an integer in the range of 0-255
+#
+# - brighness is a floating point number (with 0.0 as neutral)
+#
+# - if the update frequency is a negative value, the mini-windows will only
+#   be updated when they're explicitly rendered (like, when they gain or
+#   lose focus).
+#
+# - the 'shadowText' option can be a color or 'none', in which case the
+#   drop-shadow effect is disabled
+#
+# - Picture specification:
+#   [WIDTHxHEIGHT] [orig|scale|scalek|tile] [left|mid|right] [left|mid|right]
+#   [COLOR|#FFFFFFFF] [PATH]
+#
+#   Examples:
+#   background = 500x400 tile right mid #FF0000 /home/richard/screenshots/256.png
+#   background = orig mid mid #FF000080
+#
+# - Bindings in [bindings] section can bind to "no" (do nothing), "focus"
+#   (focus to window), "iconify", "shade-ewmh" (toggle window shade state),
+#   "close-icccm" (close window with ICCCM method), "close-ewmh" (close
+#   window with EWMH method), or "destroy" (forcefully destroy the window).
+#
+
+[general]
+distance = 50
+useNetWMFullscreen = true
+ignoreSkipTaskbar = true
+updateFreq = 10.0
+lazyTrans = false
+pipePath = /tmp/skippy-xd-fifo
+movePointerOnStart = true
+movePointerOnSelect = true
+movePointerOnRaise = true
+switchDesktopOnActivate = true
+useNameWindowPixmap = false
+forceNameWindowPixmap = false
+includeFrame = true
+allowUpscale = true
+showAllDesktops = true
+showUnmapped = true
+preferredIconSize = 48
+clientDisplayModes = thumbnail icon filled none
+iconFillSpec = orig mid mid #00FFFF
+fillSpec = orig mid mid #FFFFFF
+background = scale mid mid #FFFFFF /home/maks/.shellrc/etc/wm/img/wallpaper.GenuineIntel.jpg
+
+[xinerama]
+showAll = true
+
+[normal]
+tint = black
+tintOpacity = 0
+opacity = 200
+
+[highlight]
+tint = #101020
+tintOpacity = 64
+opacity = 255
+
+[tooltip]
+show = true
+followsMouse = true
+offsetX = 20
+offsetY = 20
+align = left
+border = #ffffff
+background = #404040
+opacity = 128
+text = #ffffff
+textShadow = black
+font = fixed-11:weight=bold
+
+[bindings]
+miwMouse1 = focus
+miwMouse2 = close-ewmh
+miwMouse3 = iconify
diff --git a/etc/wm/skippy/skippy-xd.rc b/etc/wm/skippy/skippy-xd.rc
new file mode 100644
index 0000000..b7f32a7
--- /dev/null
+++ b/etc/wm/skippy/skippy-xd.rc
@@ -0,0 +1,92 @@
+# Copy this to ~/.config/skippy-xd/skippy-xd.rc and edit it to your liking
+#
+# Notes:
+#
+# - colors can be anything XAllocNamedColor can handle
+#   (like "black" or "#000000")
+#
+# - distance is a relative number, and is scaled according to the scale
+#   factor applied to windows
+#
+# - fonts are Xft font descriptions
+#
+# - booleans are "true" or anything but "true" (-> false)
+#
+# - opacity is an integer in the range of 0-255
+#
+# - brighness is a floating point number (with 0.0 as neutral)
+#
+# - if the update frequency is a negative value, the mini-windows will only
+#   be updated when they're explicitly rendered (like, when they gain or
+#   lose focus).
+#
+# - the 'shadowText' option can be a color or 'none', in which case the
+#   drop-shadow effect is disabled
+#
+# - Picture specification:
+#   [WIDTHxHEIGHT] [orig|scale|scalek|tile] [left|mid|right] [left|mid|right]
+#   [COLOR|#FFFFFFFF] [PATH]
+#
+#   Examples:
+#   background = 500x400 tile right mid #FF0000 /home/richard/screenshots/256.png
+#   background = orig mid mid #FF000080
+#
+# - Bindings in [bindings] section can bind to "no" (do nothing), "focus"
+#   (focus to window), "iconify", "shade-ewmh" (toggle window shade state),
+#   "close-icccm" (close window with ICCCM method), "close-ewmh" (close
+#   window with EWMH method), or "destroy" (forcefully destroy the window).
+#
+
+[general]
+distance = 50
+useNetWMFullscreen = true
+ignoreSkipTaskbar = true
+updateFreq = 10.0
+lazyTrans = false
+pipePath = /tmp/skippy-xd-fifo
+movePointerOnStart = true
+movePointerOnSelect = true
+movePointerOnRaise = true
+switchDesktopOnActivate = true
+useNameWindowPixmap = false
+forceNameWindowPixmap = false
+includeFrame = true
+allowUpscale = true
+showAllDesktops = false
+showUnmapped = true
+preferredIconSize = 48
+clientDisplayModes = thumbnail icon filled none
+iconFillSpec = orig mid mid #00FFFF
+fillSpec = orig mid mid #FFFFFF
+background = scale mid mid #FFFFFF /home/maks/.shellrc/etc/wm/img/wallpaper.GenuineIntel.jpg
+
+[xinerama]
+showAll = true
+
+[normal]
+tint = black
+tintOpacity = 0
+opacity = 200
+
+[highlight]
+tint = #101020
+tintOpacity = 64
+opacity = 255
+
+[tooltip]
+show = true
+followsMouse = true
+offsetX = 20
+offsetY = 20
+align = left
+border = #ffffff
+background = #404040
+opacity = 128
+text = #ffffff
+textShadow = black
+font = fixed-11:weight=bold
+
+[bindings]
+miwMouse1 = focus
+miwMouse2 = close-ewmh
+miwMouse3 = iconify

From 4c491c2de40d94427fcb2cd2b8c79148a1244662 Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Thu, 27 Feb 2020 00:31:54 +0300
Subject: [PATCH 20/21] bash: services completion

---
 etc/shell/bash/bash_completion_custom | 12 +++++++++++-
 1 file changed, 11 insertions(+), 1 deletion(-)

diff --git a/etc/shell/bash/bash_completion_custom b/etc/shell/bash/bash_completion_custom
index aba230b..9445a57 100755
--- a/etc/shell/bash/bash_completion_custom
+++ b/etc/shell/bash/bash_completion_custom
@@ -1,6 +1,6 @@
 #!/bin/bash #########################
 #
-# Изменён: Ср 05 фев 2020 14:38:27
+# Изменён: Чт 27 фев 2020 00:31:10
 # 
 #complete <что дополнять> <программа>
 
@@ -102,5 +102,15 @@ _git-commit() {
 	fi
 }
 
+_services () {
+	if [[ $2 == "" ]]; then
+		COMPREPLY=($(\ls /etc/init.d/ | sed '/^\/.*:$/d; /^\s*$/d' 2> /dev/null))
+	else
+		COMPREPLY=($(\ls /etc/init.d/ | sed '/^\/.*:$/d; /^\s*$/d' | grep "^$2" 2> /dev/null))
+	fi
+}
+
+complete -F _services start stop restart
+
 #complete -c _git-commit git g
 

From 5ee2bf7369ffed769ba3f99330dcf0ffba81b5ea Mon Sep 17 00:00:00 2001
From: Maxim Likhachev <envrm@yandex.ru>
Date: Thu, 27 Feb 2020 01:00:10 +0300
Subject: [PATCH 21/21] =?UTF-8?q?bspwm,=20skippy:=20=D1=81=D0=BA=D1=80?=
 =?UTF-8?q?=D1=8B=D1=82=D0=B8=D0=B5=20=D0=BA=D1=83=D1=80=D1=81=D0=BE=D1=80?=
 =?UTF-8?q?=D0=B0?=
MIME-Version: 1.0
Content-Type: text/plain; charset=UTF-8
Content-Transfer-Encoding: 8bit

---
 etc/X/xbindkeysrc.GenuineIntel | 6 +++---
 etc/wm/bspwm/bspwmrc           | 1 +
 2 files changed, 4 insertions(+), 3 deletions(-)

diff --git a/etc/X/xbindkeysrc.GenuineIntel b/etc/X/xbindkeysrc.GenuineIntel
index 124b0d9..cfad1cd 100644
--- a/etc/X/xbindkeysrc.GenuineIntel
+++ b/etc/X/xbindkeysrc.GenuineIntel
@@ -1,6 +1,6 @@
 # xbindkeysrc.GehuineIntel
 #
-# Изменён: Ср 26 фев 2020 23:03:10
+# Изменён: Чт 27 фев 2020 00:53:58
 #
 
 #ACPI#{{{
@@ -45,10 +45,10 @@
 "www"
         Alt + n
 
-"skippy-xd --config $SHELLRC/etc/wm/skippy/skippy-xd.rc"
+"skippy-xd --config $SHELLRC/etc/wm/skippy/skippy-xd.rc; hidecursor"
         Alt + z
 
-"skippy-xd --config $SHELLRC/etc/wm/skippy/skippy-xd.all.rc"
+"skippy-xd --config $SHELLRC/etc/wm/skippy/skippy-xd.all.rc; hidecursor"
         Alt + a
 
 #}}}
diff --git a/etc/wm/bspwm/bspwmrc b/etc/wm/bspwm/bspwmrc
index 3fbe0a0..9aeffc1 100755
--- a/etc/wm/bspwm/bspwmrc
+++ b/etc/wm/bspwm/bspwmrc
@@ -2,6 +2,7 @@
 
 sxhkd &
 polybar main &
+hidecursor &
 
 bspc monitor eDP1 -d Α Β Γ Δ
 bspc monitor  DP1 -d α β γ δ