Merge branch 'dev' of https://github.com/FascodeNet/alterlinux into dev

diff --git a/channels/i3/airootfs.any/etc/skel/.config/conky/conky-jp.conf b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-jp.conf
index fde5a46..6086e81 100755 (executable)
--- a/channels/i3/airootfs.any/etc/skel/.config/conky/conky-jp.conf
+++ b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-jp.conf
@@ -48,6 +48,6 @@ ${color0}テーママネージャ                     ${color1} : ${color2}mod+S
 ${color0}システム設定マネージャ               ${color1} : ${color2}mod+B
 ${color0}電源メニュー                         ${color1} : ${color2}mod+Shift+E
 
-${color0}ヘルプの表示                         ${color1} : ${color2}mod+Shift+h
-${color0}画面のロック                         ${color1} : ${color2}Super+Esc
+${color0}ヘルプの表示                         ${color1} : ${color2}mod+Shift+H
+${color0}画面のロック                         ${color1} : ${color2}mod+Esc
 ]]

diff --git a/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live-jp.conf b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live-jp.conf
new file mode 100755 (executable)
index 0000000..cad4ce3
--- /dev/null
+++ b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live-jp.conf
@@ -0,0 +1,54 @@
+--[[
+# ---------------------------------------------
+#  Alter Linux i3wm edition
+#  shortcut list for conky config file (jp)
+#
+#  Watasuke
+#  Twitter: @Watasuke102
+#  Email  : Watasuke102@gmail.com
+#
+#  (c) 2020 Fascode Network.
+# ---------------------------------------------
+]]
+
+conky.config = {
+    alignment  = 'top_left',
+    background = true,
+
+    own_window = true,
+    own_window_type = 'override',
+    own_window_transparent = true,
+
+    font = 'Noto Sans Mono CJK JP:size=9',
+    default_color = 'white',
+    color0 = '99dd99',
+    color1 = 'white',
+    color2 = '929292',
+
+    gap_x = 20,
+    gap_y = 35,
+
+    double_buffer = true,
+    border_width = 0,
+    update_interval = 10.0,
+    cpu_avg_samples = 2,
+    use_xft = true,
+}
+
+conky.text = [[
+${color0}ターミナルを開く                     ${color1} : ${color2}mod+Enter
+${color0}アクティブウィンドウを閉じる         ${color1} : ${color2}mod+Shift+Q
+
+${color0}ワークスペースの変更                 ${color1} : ${color2}mod+(0~9)
+${color0}ウィンドウを他のワークスペースへ移動 ${color1} : ${color2}mod+Shift+(0~9)
+${color0}リサイズモード                       ${color1} : ${color2}mod+R
+
+${color0}ランチャーの表示                     ${color1} : ${color2}mod+D
+${color0}テーママネージャ                     ${color1} : ${color2}mod+Shift+S
+${color0}システム設定マネージャ               ${color1} : ${color2}mod+B
+${color0}電源メニュー                         ${color1} : ${color2}mod+Shift+E
+
+${color0}ヘルプの表示                         ${color1} : ${color2}mod+Shift+H
+${color0}画面のロック                         ${color1} : ${color2}mod+Esc
+${color0}Alter Linuxをインストールする        ${color1} : ${color2}mod+I
+]]

diff --git a/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf
new file mode 100644 (file)
index 0000000..3d4afb5
--- /dev/null
+++ b/channels/i3/airootfs.any/etc/skel/.config/conky/conky-live.conf
@@ -0,0 +1,54 @@
+--[[
+# ---------------------------------------------
+#  Alter Linux i3wm edition
+#  shortcut list for conky config file
+#
+#  Watasuke
+#  Twitter: @Watasuke102
+#  Email  : Watasuke102@gmail.com
+#
+#  (c) 2020 Fascode Network.
+# ---------------------------------------------
+]]
+
+conky.config = {
+    alignment  = 'top_left',
+    background = true,
+
+    own_window = true,
+    own_window_type = 'override',
+    own_window_transparent = true,
+
+    font = 'Hack:size=9',
+    default_color = 'white',
+    color0 = '99dd99',
+    color1 = 'white',
+    color2 = '929292',
+
+    gap_x = 20,
+    gap_y = 35,
+
+    double_buffer = true,
+    border_width = 0,
+    update_interval = 10.0,
+    cpu_avg_samples = 2,
+    use_xft = true,
+}
+
+conky.text = [[
+${color0}Open terminal      ${color1} : ${color2}mod+Enter
+${color0}Kill active window ${color1} : ${color2}mod+Shift+Q
+
+${color0}Change workspace   ${color1} : ${color2}mod+(0~9)
+${color0}Send active window ${color1} : ${color2}mod+Shift+(0~9)
+${color0}Resize mode        ${color1} : ${color2}mod+R
+
+${color0}Software launcher  ${color1} : ${color2}mod+D
+${color0}Theme setting      ${color1} : ${color2}mod+Shift+S
+${color0}System setting     ${color1} : ${color2}mod+B
+${color0}Power menu         ${color1} : ${color2}mod+Shift+E
+
+${color0}Show help document ${color1} : ${color2}mod+Shift+H
+${color0}Lock screen        ${color1} : ${color2}mod+Esc
+${color0}Install Alter Linux${color1} : ${color2}mod+I
+]]

diff --git a/channels/i3/airootfs.any/etc/skel/.config/conky/conky.conf b/channels/i3/airootfs.any/etc/skel/.config/conky/conky.conf
index 43b4bac..faab4fe 100755 (executable)
--- a/channels/i3/airootfs.any/etc/skel/.config/conky/conky.conf
+++ b/channels/i3/airootfs.any/etc/skel/.config/conky/conky.conf
@@ -48,6 +48,6 @@ ${color0}Theme setting      ${color1} : ${color2}mod+Shift+S
 ${color0}System setting     ${color1} : ${color2}mod+B
 ${color0}Power menu         ${color1} : ${color2}mod+Shift+E
 
-${color0}Show help document ${color1} : ${color2}mod+Shift+h
-${color0}Lock screen        ${color1} : ${color2}Super+Esc
+${color0}Show help document ${color1} : ${color2}mod+Shift+H
+${color0}Lock screen        ${color1} : ${color2}mod+Esc
 ]]

diff --git a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh
index 9424157..6cc0009 100755 (executable)
--- a/channels/i3/airootfs.any/root/customize_airootfs_i3.sh
+++ b/channels/i3/airootfs.any/root/customize_airootfs_i3.sh
@@ -80,11 +80,18 @@ if [[ "${japanese}" = true ]]; then
     mv "/etc/skel/.config/conky/conky-jp.conf" "/etc/skel/.config/conky/conky.conf"
 
     remove "/home/${username}/.config/conky/conky.conf"
-    mv "/home/${username}/.config/conky/conky-jp.conf" "/home/${username}/.config/conky/conky.conf"
+    remove "/home/${username}/.config/conky/conky-live.conf"
+    mv "/home/${username}/.config/conky/conky-live-jp.conf" "/home/${username}/.config/conky/conky.conf"
 else
     remove "/etc/skel/.config/conky/conky-jp.conf"
+
     remove "/home/${username}/.config/conky/conky-jp.conf"
+    remove "/home/${username}/.config/conky/conky-live-jp.conf"
+    mv "/home/${username}/.config/conky/conky-live.conf" "/home/${username}/.config/conky/conky.conf"
 fi
+remove "/etc/skel/.config/conky/conky-live.conf"
+remove "/etc/skel/.config/conky/conky-live-jp.conf"
+remove "/home/${username}/.config/conky/conky-jp.conf"
 
 # Snap
 #if [[ "${arch}" = "x86_64" ]]; then