From 3642e37184c89c85d11b454342998489df636374 Mon Sep 17 00:00:00 2001 From: Daniel Napora Date: Sat, 25 Sep 2021 19:06:35 +0200 Subject: [PATCH] update --- common/.bashrc | 1 - common/rc.xml | 2 +- lang/en/.config/mabox/mbhelper.csv | 2 +- lang/es/.newsboat/config | 57 ------------------- lang/pl/.config/mabox/mainmenu_below_apps.csv | 2 + lang/pl/.config/mabox/mbhelper.csv | 2 +- lang/pl/.gkrellm2/user-config | 3 +- lang/pl/.newsboat/config | 57 ------------------- lang/pl/.newsboat/urls | 15 ----- 9 files changed, 6 insertions(+), 135 deletions(-) delete mode 100644 lang/es/.newsboat/config create mode 100644 lang/pl/.config/mabox/mainmenu_below_apps.csv delete mode 100644 lang/pl/.newsboat/config delete mode 100644 lang/pl/.newsboat/urls diff --git a/common/.bashrc b/common/.bashrc index ccaac90..afb3264 100644 --- a/common/.bashrc +++ b/common/.bashrc @@ -97,7 +97,6 @@ unset use_color safe_term match_lhs sh alias cp="cp -i" # confirm before overwriting something alias df='df -h' # human-readable sizes alias free='free -m' # show sizes in MB -alias np='nano -w PKGBUILD' alias more=less alias mc='. /usr/lib/mc/mc-wrapper.sh' diff --git a/common/rc.xml b/common/rc.xml index 10fba60..fdd5d5e 100644 --- a/common/rc.xml +++ b/common/rc.xml @@ -422,7 +422,7 @@ - exo-open --launch TerminalEmulator bpytop + exo-open --launch TerminalEmulator btop diff --git a/lang/en/.config/mabox/mbhelper.csv b/lang/en/.config/mabox/mbhelper.csv index 63d6a06..2e548b3 100644 --- a/lang/en/.config/mabox/mbhelper.csv +++ b/lang/en/.config/mabox/mbhelper.csv @@ -5,7 +5,7 @@  super-grave Quake-like Terminal,mabox-terminal  super-e Text Editor,geany  super-g Galculator,galculator - super-h Bpytop resource monitor,^term(bpytop) + super-h Btop resource monitor,^term(btop)  super-/ File Search,fsearch  super-r PyRadio,sakura -e 'pyradio'  super-v Volume control,pavucontrol diff --git a/lang/es/.newsboat/config b/lang/es/.newsboat/config deleted file mode 100644 index 957c2f7..0000000 --- a/lang/es/.newsboat/config +++ /dev/null @@ -1,57 +0,0 @@ -browser exo-open --launch WebBrowser %u -player mpv -auto-reload no -cleanup-on-quit no -notify-always yes -notify-format "%n nieprzeczytanych wiadomości %f nieprzeczytanych kanałów" -notify-program notify-send -reload-time 20 - - -bind-key LEFT quit -bind-key RIGHT open - -color background white black -color listnormal color242 black -color listfocus black color2 -color listnormal_unread color250 black bold -color listfocus_unread black color2 bold -color info white color22 bold -color article white black - -macro m set browser "newsboat-mpv.sh %u"; open-in-browser ; set browser "exo-open --launch WebBrowser %u" - -articlelist-format "%4i %f %D %?T?|%-17T| ?%t" - -#highlight feedlist "^ *[0-9]+ *N " color156 default -#highlight articlelist "^ *[0-9]+ *N " color156 default - -#highlight article "(^Kanał:.*|^Tytuł:.*|^Autor:.*)" color75 default -#highlight article "(^Odsyłacz:.*|^Data:)" color74 default -#highlight article "^Podcast Download URL:.*" color71 default -#highlight article "^Odsyłacze:" yellow color240 underline -#highlight article "\\[[0-9][0-9]*\\]" color72 default bold -#highlight article "\\[image [0-9][0-9]*\\]" color72 default bold -#highlight article "\\[embedded flash: [0-9][0-9]*\\]" color72 default bold -#highlight article ":.*\\(link\\)$" color74 default -#highlight article ":.*\\(image\\)$" color74 default -#highlight article ":.*\\(embedded flash\\)$" color74 default - -#color listnormal white default -#color listfocus default color240 -#color info default color240 - -color background color236 default -color listnormal color248 default -color listnormal_unread color6 default -color listfocus color236 color12 -color listfocus_unread color15 color12 -color info color248 color236 -color article color248 default -highlight article "^(Fuente|Enlace):" color6 default bold -highlight article "^(Título):.*$" color6 default bold -highlight article "^(Fecha|Autor):" color6 default bold -highlight article "https?://[^ ]+" color10 default underline -highlight article "\\[[0-9]+\\]" color10 default bold -highlight article "\\[image\\ [0-9]+\\]" color10 default bold -highlight feedlist "^─.*$" color6 color236 bold diff --git a/lang/pl/.config/mabox/mainmenu_below_apps.csv b/lang/pl/.config/mabox/mainmenu_below_apps.csv new file mode 100644 index 0000000..8a09340 --- /dev/null +++ b/lang/pl/.config/mabox/mainmenu_below_apps.csv @@ -0,0 +1,2 @@ +^sep() +Katalog Domowy,^pipe(jgbrowser ~),user-home diff --git a/lang/pl/.config/mabox/mbhelper.csv b/lang/pl/.config/mabox/mbhelper.csv index ca2db60..c620eaa 100644 --- a/lang/pl/.config/mabox/mbhelper.csv +++ b/lang/pl/.config/mabox/mbhelper.csv @@ -5,7 +5,7 @@  super-grave Quake-like Terminal,mabox-terminal  super-e Edytor tekstu,geany  super-g Galculator,galculator - super-h Bpytop monitor zasobów,^term(bpytop) + super-h Btop monitor zasobów,^term(btop)  super-/ FSearch wyszukiwanie plików,fsearch  super-r PyRadio,sakura -e 'pyradio'  super-v Kontrola głośności,pavucontrol diff --git a/lang/pl/.gkrellm2/user-config b/lang/pl/.gkrellm2/user-config index 383f739..b8f184d 100644 --- a/lang/pl/.gkrellm2/user-config +++ b/lang/pl/.gkrellm2/user-config @@ -33,7 +33,7 @@ clock_cal clock_format %k:%M %S cpu enable 0 cpu smp_mode 0 cpu enabled cpu 1 -cpu launch cpu terminator -T "bpytop" -e bpytop +cpu launch cpu terminator -T "btop" -e btop cpu tooltip_comment cpu bpytop cpu extra_info cpu 1 cpu chart_config cpu 60 100 1 0 0 0 : 0 0 0 0 500 : 0 0 0 0 500 : 0 0 0 0 500 @@ -118,7 +118,6 @@ uptime enable 1 uptime launch uptime tooltip gkrellmlaunch visible=1 label=Midnight_Commander cmd=terminator -T "Midnight Commander" -e mc -gkrellmlaunch visible=1 label=RSS cmd=terminator -T "Newsboat" -x "newsboat" gkrellmlaunch visible=1 label=PyRadio cmd=terminator -T "PyRadio" -x pyradio gkrellmlaunch visible=1 label=TVP_Polonia cmd=streamlink tvpstream.vod.tvp.pl/?channel_id=34776037 best gkrellmlaunch visible=1 label=TVP_PolandIn cmd=streamlink tvpstream.vod.tvp.pl/?channel_id=39821455 best diff --git a/lang/pl/.newsboat/config b/lang/pl/.newsboat/config deleted file mode 100644 index eb51a15..0000000 --- a/lang/pl/.newsboat/config +++ /dev/null @@ -1,57 +0,0 @@ -browser exo-open --launch WebBrowser %u -player mpv -auto-reload no -cleanup-on-quit no -notify-always yes -notify-format "%n nieprzeczytanych wiadomości %f nieprzeczytanych kanałów" -notify-program notify-send -reload-time 20 - - -bind-key LEFT quit -bind-key RIGHT open - -color background white black -color listnormal color242 black -color listfocus black color2 -color listnormal_unread color250 black bold -color listfocus_unread black color2 bold -color info white color22 bold -color article white black - -macro m set browser "newsboat-mpv.sh %u"; open-in-browser ; set browser "exo-open --launch WebBrowser %u" - -articlelist-format "%4i %f %D %?T?|%-17T| ?%t" - -#highlight feedlist "^ *[0-9]+ *N " color156 default -#highlight articlelist "^ *[0-9]+ *N " color156 default - -#highlight article "(^Kanał:.*|^Tytuł:.*|^Autor:.*)" color75 default -#highlight article "(^Odsyłacz:.*|^Data:)" color74 default -#highlight article "^Podcast Download URL:.*" color71 default -#highlight article "^Odsyłacze:" yellow color240 underline -#highlight article "\\[[0-9][0-9]*\\]" color72 default bold -#highlight article "\\[image [0-9][0-9]*\\]" color72 default bold -#highlight article "\\[embedded flash: [0-9][0-9]*\\]" color72 default bold -#highlight article ":.*\\(link\\)$" color74 default -#highlight article ":.*\\(image\\)$" color74 default -#highlight article ":.*\\(embedded flash\\)$" color74 default - -#color listnormal white default -#color listfocus default color240 -#color info default color240 - -color background color236 default -color listnormal color248 default -color listnormal_unread color6 default -color listfocus color236 color12 -color listfocus_unread color15 color12 -color info color248 color236 -color article color248 default -highlight article "^(Kanał|Odsyłacz):" color6 default bold -highlight article "^(Tytuł):.*$" color6 default bold -highlight article "^(Data|Autor):" color6 default bold -highlight article "https?://[^ ]+" color10 default underline -highlight article "\\[[0-9]+\\]" color10 default bold -highlight article "\\[image\\ [0-9]+\\]" color10 default bold -highlight feedlist "^─.*$" color6 color236 bold diff --git a/lang/pl/.newsboat/urls b/lang/pl/.newsboat/urls deleted file mode 100644 index dca667a..0000000 --- a/lang/pl/.newsboat/urls +++ /dev/null @@ -1,15 +0,0 @@ -https://forum.maboxlinux.org/latest.rss -https://forum.maboxlinux.org/posts.rss -https://forum.manjaro.pl/latest.rss -https://forum.manjaro.pl/posts.rss - -# Manjaro -https://forum.manjaro.org/c/announcements/stable-updates.rss "~MANJARO: Aktualizacje stable" - - -# Arch -https://www.archlinux.org/feeds/packages/added/ "~ARCH: Dodane pakiety" -https://aur.archlinux.org/rss/ "~ARCH: Dodane pakiety (AUR)" - -# Youtube example -https://www.youtube.com/feeds/videos.xml?channel_id=UCVls1GmFKf6WlTraIb_IaJg "~Youtube: DistroTube"