Merge remote-tracking branch 'origin/master'

4 years ago · 540621bead
10 changed files with 2506 additions and 47 deletions
--- a/etc/installrc.sh
+++ b/etc/installrc.sh
@ -1,7 +1,7 @@
				@@ -1,7 +1,7 @@
 #!/bin/bash

 #Создан:  Пт 23 авг 2013 19:57:29
-#Изменён: Пн 26 фев 2018 17:07:29
+#Изменён: Чт 05 авг 2021 17:11:33

 #
 # (c) 2013, Maxim Lihachev, <envrm@yandex.ru>
@ -66,7 +66,7 @@ check() {
				@@ -66,7 +66,7 @@ check() {
 backup() {
 	report Сохранение $(basename $filename) $yellow

-	date=$(\date "+%Y.%m.%e_%H.%M")
+	date=$(\date "+%Y.%m.%d_%H.%M")
 	\mv "$link"{,.$date} && \
 	echo -e "${green}Резервная копия: $link.$date ${rstc}"
 }
--- a/etc/rc.linux-gnu
+++ b/etc/rc.linux-gnu
@ -63,6 +63,8 @@ mkdir -p ~/.config/dunst
				@@ -63,6 +63,8 @@ mkdir -p ~/.config/dunst
 + soft/dfc                         ~/.config
 + soft/polybar                     ~/.config
 + soft/procps                      ~/.config
+ soft/k9s/config.$(uname -i).yml  ~/.k9s
+ soft/k9s/skin.$(uname -i).yml    ~/.k9s
 + soft/htop                        ~/.config
 - soft/mc                          ~/.config
 - soft/vim                         ~/.config
--- a/etc/shell/bash/aliases
+++ b/etc/shell/bash/aliases
@ -535,5 +535,9 @@ alias qr="curl -F-=\\<- qrenco.de"
				@@ -535,5 +535,9 @@ alias qr="curl -F-=\\<- qrenco.de"
 #- Преобразование списка в строку
 alias flat="tr '\n' ' '; echo"

+field() {
+	awk -v F="${1?USAGE: filed N}" '{print $F}'
+}
+
 #}}} ###########################################################################

--- a/etc/soft/joplin/userchrome-macos-default-icons.css
+++ b/etc/soft/joplin/userchrome-macos-default-icons.css
--- a/etc/soft/joplin/userchrome.css
+++ b/etc/soft/joplin/userchrome.css
@ -205,11 +205,12 @@
				@@ -205,11 +205,12 @@
  --g-border-width-4: 0.8rem;
  --g-border-width-5: 1.2rem;
  --g-border-width-6: 1.6rem;
-  --g-font-family-system-rounded: "SF Pro Rounded", "SF Pro", -apple-system,
+  --g-font-family-icon-font: "NotoMono Nerd Font",
+  --g-font-family-system-rounded: "NotoMono Nerd Font", "SF Pro Rounded", "SF Pro", -apple-system,
    BlinkMacSystemFont, "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell,
    "Apple Color Emoji", "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji",
    sans-serif;
-  --g-font-family-system: "Font Awesome 5 Free", "SF Pro", -apple-system, BlinkMacSystemFont,
+  --g-font-family-system: "NotoMono Nerd Font", "Font Awesome 5 Free", "SF Pro", -apple-system, BlinkMacSystemFont,
    "Segoe UI", Roboto, Oxygen, Ubuntu, Cantarell, "Apple Color Emoji",
    "Segoe UI Emoji", "Segoe UI Symbol", "Noto Color Emoji", sans-serif;
  --g-font-family-mono: "NotoMono Nerd Font", ui-monospace, SFMono-Regular, Menlo, Monaco, Consolas,
@ -322,41 +323,41 @@
				@@ -322,41 +323,41 @@
 :root {
  /* --g-icon-folder: "􀈕"; */
  --g-icon-folder: "";
-  --g-icon-tag: "􀋡";
-  --g-icon-arrow-triangle-2-circlepath: "􀊯";
-  --g-icon-bold: "􀅓";
-  --g-icon-italic: "􀅔";
+  --g-icon-tag: "";
+  --g-icon-arrow-triangle-2-circlepath: "";
+  --g-icon-bold: "";
+  --g-icon-italic: "";
  --g-icon-highlighter: "􀦇";
-  --g-icon-strikethrough: "􀅖";
-  --g-icon-textformat-abc-dottedunderline: "􀅰";
-  --g-icon-alarm: "􀐭";
-  --g-icon-square-split-2x1: "􀏠";
-  --g-icon-info-circle: "􀅴";
-  --g-icon-chevron-backward: "􀯶";
-  --g-icon-chevron-forward: "􀯻";
-  --g-icon-chevron-down: "􀆈";
-  --g-icon-chevron-up-chevron-down: "􀆏";
-  --g-icon-arrow-up-forward-app: "􀮵";
+  --g-icon-strikethrough: "";
+  --g-icon-textformat-abc-dottedunderline: "";
+  --g-icon-alarm: "";
+  --g-icon-square-split-2x1: "";
+  --g-icon-info-circle: "";
+  --g-icon-chevron-backward: "";
+  --g-icon-chevron-forward: "";
+  --g-icon-chevron-down: "";
+  --g-icon-chevron-up-chevron-down: "";
+  --g-icon-arrow-up-forward-app: "";
  --g-icon-arrow-up-right-square-fill: "􀄕";
-  --g-icon-ellipsis: "􀍠";
-  --g-icon-link: "􀉣";
-  --g-icon-chevron-left-slash-chevron-right: "􀙚";
-  --g-icon-curlybraces: "􀡅";
-  --g-icon-paperclip: "􀉢";
-  --g-icon-list-bullet: "􀋲";
-  --g-icon-list-number: "􀋴";
-  --g-icon-text-badge-checkmark: "􀋺";
-  --g-icon-minus: "􀅽";
-  --g-icon-text-quote: "􀋿";
+  --g-icon-ellipsis: "";
+  --g-icon-link: "";
+  --g-icon-chevron-left-slash-chevron-right: "";
+  --g-icon-curlybraces: "";
+  --g-icon-paperclip: "";
+  --g-icon-list-bullet: "";
+  --g-icon-list-number: "";
+  --g-icon-text-badge-checkmark: "";
+  --g-icon-minus: "";
+  --g-icon-text-quote: "";
  --g-icon-tablecells-badge-ellipsis: "􀏥";
-  --g-icon-clock: "􀐫";
-  --g-icon-calendar-badge-clock: "􀧞";
-  --g-icon-doc-richtext: "􀉅";
-  --g-icon-square-and-pencil: "􀈎";
-  --g-icon-doc-on-clipboard: "􀉃";
+  --g-icon-clock: "";
+  --g-icon-calendar-badge-clock: "";
+  --g-icon-doc-richtext: "";
+  --g-icon-square-and-pencil: "";
+  --g-icon-doc-on-clipboard: "";
  --g-icon-square-and-arrow-down: "􀈄";
-  --g-icon-xmark-circle-fill: "􀁡";
-  --g-icon-xmark: "􀆄";
+  --g-icon-xmark-circle-fill: "";
+  --g-icon-xmark: "";
 }

 .fa-caret-right::before {
@ -516,7 +517,7 @@ body a {
				@@ -516,7 +517,7 @@ body a {
  display: none !important;
 }
 .rli-editor > div > div > div > div .tox-tbtn::after {
-  font-family: "SF Pro";
+  font-family: var(--g-font-family-icon-font);
  font-size: var(--g-font-size-1) !important;
  font-weight: normal !important;
  -webkit-font-smoothing: antialiased;
@ -600,7 +601,7 @@ body a {
				@@ -600,7 +601,7 @@ body a {
 }
 .rli-editor .joplin-tinymce > div:first-child > a span:before,
 .rli-editor .editor-toolbar > div:first-child > a span:before {
-  font-family: "SF Pro";
+  font-family: "NotoMono Nerd Font";
  font-size: var(--g-font-size-1) !important;
  font-weight: normal !important;
  -webkit-font-smoothing: antialiased;
@ -666,7 +667,7 @@ body a {
				@@ -666,7 +667,7 @@ body a {
 }
 .rli-editor .tox-toolbar__group button:before,
 .rli-editor .tox-toolbar__group button[aria-haspopup=true]:before {
-  font-family: "SF Pro";
+  font-family: "NotoMono Nerd Font";
  font-size: var(--g-font-size-1) !important;
  font-weight: normal !important;
  -webkit-font-smoothing: antialiased;
@ -806,7 +807,7 @@ body a {
				@@ -806,7 +807,7 @@ body a {
 }
 .rli-editor > div > div > div > div:not(:first-child) .editor-toolbar a.button span::before,
 .rli-editor > div > div > div > div:not(:first-child) .editor-toolbar a.button i::before {
-  font-family: "SF Pro";
+  font-family: "NotoMono Nerd Font";
  font-size: var(--g-font-size-1) !important;
  font-weight: normal !important;
  -webkit-font-smoothing: antialiased;
@ -1015,7 +1016,7 @@ body a {
				@@ -1015,7 +1016,7 @@ body a {
  height: 100%;
 }
 .rli-editor > div > div > div > div:last-child .icon-tags {
-  font-family: "SF Pro";
+  font-family: "NotoMono Nerd Font";
  font-size: var(--g-font-size-1) !important;
  font-weight: normal !important;
  -webkit-font-smoothing: antialiased;
@ -1024,7 +1025,7 @@ body a {
				@@ -1024,7 +1025,7 @@ body a {
  height: 1.8rem;
 }
 .rli-editor > div > div > div > div:last-child .icon-tags::before {
-  font-family: "SF Pro";
+  font-family: "NotoMono Nerd Font";
  content: var(--g-icon-tag) !important;
 }
 .rli-editor > div > div > div > div:last-child .tag-list span {
@ -1089,7 +1090,7 @@ body a {
				@@ -1089,7 +1090,7 @@ body a {
 .rli-noteList .search-bar input[type=text] + button span::before {
  position: absolute;
  left: 0;
-  content: "􀊫" !important;
+  content: "" !important;
  color: var(--g-secondaryLabelColor);
  font-size: 1.6rem;
  font-family: var(--g-font-family-system);
@ -1143,10 +1144,10 @@ body a {
				@@ -1143,10 +1144,10 @@ body a {
  transform: translateY(0.05rem);
 }
 .rli-noteList .search-bar + div button.new-todo-button span:before {
-  content: "􀁢";
+  content: "";
 }
 .rli-noteList .search-bar + div button.new-note-button span:before {
-  content: "􀈎";
+  content: "";
 }
 .rli-noteList .note-list {
  padding: 0 1rem 1rem;
@ -1359,7 +1360,7 @@ body a {
				@@ -1359,7 +1360,7 @@ body a {
  position: absolute;
 }
 .modal-dialog input + a .fa-question-circle::before {
-  content: "􀅴" !important;
+  content: "" !important;
  color: var(--g-secondaryLabelColor) !important;
  font-family: var(--g-font-family-system) !important;
  font-weight: 400;
--- a/etc/soft/k9s/config.GenuineIntel.yml
+++ b/etc/soft/k9s/config.GenuineIntel.yml
@ -0,0 +1,44 @@
				@@ -0,0 +1,44 @@
+k9s:
+  refreshRate: 2
+  maxConnRetry: 5
+  enableMouse: false
+  headless: false
+  logoless: false
+  crumbsless: false
+  readOnly: false
+  noIcons: true
+  logger:
+    tail: 100
+    buffer: 5000
+    sinceSeconds: 60
+    fullScreenLogs: false
+    textWrap: false
+    showTime: false
+  currentContext: azure-iaas-k8s
+  currentCluster: azure-iaas-k8s
+  clusters:
+    azure-iaas-k8s:
+      namespace:
+        active: ""
+        favorites:
+        - default
+      view:
+        active: pod
+      featureGates:
+        nodeShell: false
+      shellPod:
+        image: busybox:1.31
+        command: []
+        args: []
+        namespace: default
+        limits:
+          cpu: 100m
+          memory: 100Mi
+      portForwardAddress: localhost
+  thresholds:
+    cpu:
+      critical: 90
+      warn: 70
+    memory:
+      critical: 90
+      warn: 70
--- a/etc/soft/k9s/config.MacBookAir8,2.yml
+++ b/etc/soft/k9s/config.MacBookAir8,2.yml
@ -0,0 +1,44 @@
				@@ -0,0 +1,44 @@
+k9s:
+  refreshRate: 2
+  maxConnRetry: 5
+  enableMouse: false
+  headless: false
+  logoless: false
+  crumbsless: false
+  readOnly: false
+  noIcons: false
+  logger:
+    tail: 100
+    buffer: 5000
+    sinceSeconds: 60
+    fullScreenLogs: false
+    textWrap: false
+    showTime: false
+  currentContext: azure-iaas-k8s
+  currentCluster: azure-iaas-k8s
+  clusters:
+    azure-iaas-k8s:
+      namespace:
+        active: ""
+        favorites:
+        - default
+      view:
+        active: pod
+      featureGates:
+        nodeShell: false
+      shellPod:
+        image: busybox:1.31
+        command: []
+        args: []
+        namespace: default
+        limits:
+          cpu: 100m
+          memory: 100Mi
+      portForwardAddress: localhost
+  thresholds:
+    cpu:
+      critical: 90
+      warn: 70
+    memory:
+      critical: 90
+      warn: 70
--- a/etc/soft/k9s/skin.GenuineIntel.yml
+++ b/etc/soft/k9s/skin.GenuineIntel.yml
@ -0,0 +1,97 @@
				@@ -0,0 +1,97 @@
+# OneDark presets
+foreground: &foreground "#abb2bf"
+background: &background "#282c34"
+black: &black "#080808"
+blue: &blue "#61afef"
+green: &green "#98c379"
+grey: &grey "#abb2bf"
+orange: &orange "#ffb86c"
+purple: &purple "#c678dd"
+red: &red "#e06370"
+yellow: &yellow "#e5c07b"
+yellow_bright: &yellow_bright "#d19a66"
+
+k9s:
+  body:
+    fgColor: *foreground
+    bgColor: *background
+    logoColor: *green
+  info:
+    fgColor: *grey
+    sectionColor: *green
+  dialog:
+    fgColor: *black
+    bgColor: *background
+    buttonFgColor: *foreground
+    buttonBgColor: *green
+    buttonFocusFgColor: *black
+    buttonFocusBgColor: *blue
+    labelFgColor: *orange
+    fieldFgColor: *blue
+  frame:
+    border:
+      fgColor: *green
+      focusColor: *green
+    menu:
+      fgColor: *grey
+      keyColor: *yellow
+      numKeyColor: *yellow
+    crumbs:
+      fgColor: *black
+      bgColor: *green
+      activeColor: *yellow
+    status:
+      newColor: *blue
+      modifyColor: *green
+      addColor: *grey
+      pendingColor: *orange
+      errorColor: *red
+      highlightcolor: *yellow
+      killColor: *purple
+      completedColor: *grey
+    title:
+      fgColor: *blue
+      bgColor: *background
+      highlightColor: *purple
+      counterColor: *foreground
+      filterColor: *blue
+  views:
+    charts:
+      bgColor: *background
+      defaultDialColors:
+        - *green
+        - *red
+      defaultChartColors:
+        - *green
+        - *red
+    table:
+      fgColor: *yellow
+      bgColor: *background
+      cursorFgColor: *black
+      cursorBgColor: *blue
+      markColor: *yellow_bright
+      header:
+        fgColor: *grey
+        bgColor: *background
+        sorterColor: *orange
+    xray:
+      fgColor: *blue
+      bgColor: *background
+      cursorColor: *foreground
+      graphicColor: *yellow_bright
+      showIcons: false
+    yaml:
+      keyColor: *red
+      colonColor: *grey
+      valueColor: *grey
+    logs:
+      fgColor: *grey
+      bgColor: *background
+      indicator:
+        fgColor: *blue
+        bgColor: *background
+    help:
+      fgColor: *grey
+      bgColor: *background
+      indicator:
+        fgColor: *blue
--- a/etc/soft/polybar/config
+++ b/etc/soft/polybar/config
@ -177,8 +177,8 @@ label-unmounted =
				@@ -177,8 +177,8 @@ label-unmounted =
 type = internal/date
 interval = 5

-time = " %H:%M"
-date = " %Y-%m-%d"
+time = "%{A1:tcalendar &:} %H:%M%{A}"
+date = "%{A1:tcalendar &:} %Y-%m-%d%{A}"

 format-prefix =
 format-prefix-foreground = ${colors.foreground-alt}
--- a/etc/wm/bspwm/bspwmrc
+++ b/etc/wm/bspwm/bspwmrc
@ -25,6 +25,7 @@ bspc rule -a Vivaldi-stable desktop=^2 follow=on
				@@ -25,6 +25,7 @@ bspc rule -a Vivaldi-stable desktop=^2 follow=on
 bspc rule -a Mptk desktop=^5 follow=off
 bspc rule -a Press-n-post state=fullscreen
 bspc rule -a Joplin desktop=^4 follow=on
+bspc rule -a Tcalendar state=floating follow=on focus=on

 #bspc config external_rules_command ~/bspwm_rules.sh