Skip to content

Commit fbafdb9

Browse files
committed
Merge branch 'dev' into dev-stable
2 parents fb0e3c9 + 0f7c3f0 commit fbafdb9

16 files changed

Lines changed: 151 additions & 19 deletions

File tree

channels/i3/airootfs.any/etc/skel/.config/conky/conky-jp.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ ${color0}テーママネージャ ${color1} : ${color2}mod+S
4848
${color0}システム設定マネージャ ${color1} : ${color2}mod+B
4949
${color0}電源メニュー ${color1} : ${color2}mod+Shift+E
5050

51-
${color0}ヘルプの表示 ${color1} : ${color2}mod+Shift+h
52-
${color0}画面のロック ${color1} : ${color2}Super+Esc
51+
${color0}ヘルプの表示 ${color1} : ${color2}mod+Shift+H
52+
${color0}画面のロック ${color1} : ${color2}mod+Esc
5353
]]
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
--[[
2+
# ---------------------------------------------
3+
# Alter Linux i3wm edition
4+
# shortcut list for conky config file (jp)
5+
#
6+
# Watasuke
7+
# Twitter: @Watasuke102
8+
# Email : Watasuke102@gmail.com
9+
#
10+
# (c) 2020 Fascode Network.
11+
# ---------------------------------------------
12+
]]
13+
14+
conky.config = {
15+
alignment = 'top_left',
16+
background = true,
17+
18+
own_window = true,
19+
own_window_type = 'override',
20+
own_window_transparent = true,
21+
22+
font = 'Noto Sans Mono CJK JP:size=9',
23+
default_color = 'white',
24+
color0 = '99dd99',
25+
color1 = 'white',
26+
color2 = '929292',
27+
28+
gap_x = 20,
29+
gap_y = 35,
30+
31+
double_buffer = true,
32+
border_width = 0,
33+
update_interval = 10.0,
34+
cpu_avg_samples = 2,
35+
use_xft = true,
36+
}
37+
38+
conky.text = [[
39+
${color0}ターミナルを開く ${color1} : ${color2}mod+Enter
40+
${color0}アクティブウィンドウを閉じる ${color1} : ${color2}mod+Shift+Q
41+
42+
${color0}ワークスペースの変更 ${color1} : ${color2}mod+(0~9)
43+
${color0}ウィンドウを他のワークスペースへ移動 ${color1} : ${color2}mod+Shift+(0~9)
44+
${color0}リサイズモード ${color1} : ${color2}mod+R
45+
46+
${color0}ランチャーの表示 ${color1} : ${color2}mod+D
47+
${color0}テーママネージャ ${color1} : ${color2}mod+Shift+S
48+
${color0}システム設定マネージャ ${color1} : ${color2}mod+B
49+
${color0}電源メニュー ${color1} : ${color2}mod+Shift+E
50+
51+
${color0}ヘルプの表示 ${color1} : ${color2}mod+Shift+H
52+
${color0}画面のロック ${color1} : ${color2}mod+Esc
53+
${color0}Alter Linuxをインストールする ${color1} : ${color2}mod+I
54+
]]
Lines changed: 54 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,54 @@
1+
--[[
2+
# ---------------------------------------------
3+
# Alter Linux i3wm edition
4+
# shortcut list for conky config file
5+
#
6+
# Watasuke
7+
# Twitter: @Watasuke102
8+
# Email : Watasuke102@gmail.com
9+
#
10+
# (c) 2020 Fascode Network.
11+
# ---------------------------------------------
12+
]]
13+
14+
conky.config = {
15+
alignment = 'top_left',
16+
background = true,
17+
18+
own_window = true,
19+
own_window_type = 'override',
20+
own_window_transparent = true,
21+
22+
font = 'Hack:size=9',
23+
default_color = 'white',
24+
color0 = '99dd99',
25+
color1 = 'white',
26+
color2 = '929292',
27+
28+
gap_x = 20,
29+
gap_y = 35,
30+
31+
double_buffer = true,
32+
border_width = 0,
33+
update_interval = 10.0,
34+
cpu_avg_samples = 2,
35+
use_xft = true,
36+
}
37+
38+
conky.text = [[
39+
${color0}Open terminal ${color1} : ${color2}mod+Enter
40+
${color0}Kill active window ${color1} : ${color2}mod+Shift+Q
41+
42+
${color0}Change workspace ${color1} : ${color2}mod+(0~9)
43+
${color0}Send active window ${color1} : ${color2}mod+Shift+(0~9)
44+
${color0}Resize mode ${color1} : ${color2}mod+R
45+
46+
${color0}Software launcher ${color1} : ${color2}mod+D
47+
${color0}Theme setting ${color1} : ${color2}mod+Shift+S
48+
${color0}System setting ${color1} : ${color2}mod+B
49+
${color0}Power menu ${color1} : ${color2}mod+Shift+E
50+
51+
${color0}Show help document ${color1} : ${color2}mod+Shift+H
52+
${color0}Lock screen ${color1} : ${color2}mod+Esc
53+
${color0}Install Alter Linux${color1} : ${color2}mod+I
54+
]]

channels/i3/airootfs.any/etc/skel/.config/conky/conky.conf

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -48,6 +48,6 @@ ${color0}Theme setting ${color1} : ${color2}mod+Shift+S
4848
${color0}System setting ${color1} : ${color2}mod+B
4949
${color0}Power menu ${color1} : ${color2}mod+Shift+E
5050

51-
${color0}Show help document ${color1} : ${color2}mod+Shift+h
52-
${color0}Lock screen ${color1} : ${color2}Super+Esc
51+
${color0}Show help document ${color1} : ${color2}mod+Shift+H
52+
${color0}Lock screen ${color1} : ${color2}mod+Esc
5353
]]

channels/i3/airootfs.any/root/customize_airootfs_i3.sh

Lines changed: 8 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -80,11 +80,18 @@ if [[ "${japanese}" = true ]]; then
8080
mv "/etc/skel/.config/conky/conky-jp.conf" "/etc/skel/.config/conky/conky.conf"
8181

8282
remove "/home/${username}/.config/conky/conky.conf"
83-
mv "/home/${username}/.config/conky/conky-jp.conf" "/home/${username}/.config/conky/conky.conf"
83+
remove "/home/${username}/.config/conky/conky-live.conf"
84+
mv "/home/${username}/.config/conky/conky-live-jp.conf" "/home/${username}/.config/conky/conky.conf"
8485
else
8586
remove "/etc/skel/.config/conky/conky-jp.conf"
87+
8688
remove "/home/${username}/.config/conky/conky-jp.conf"
89+
remove "/home/${username}/.config/conky/conky-live-jp.conf"
90+
mv "/home/${username}/.config/conky/conky-live.conf" "/home/${username}/.config/conky/conky.conf"
8791
fi
92+
remove "/etc/skel/.config/conky/conky-live.conf"
93+
remove "/etc/skel/.config/conky/conky-live-jp.conf"
94+
remove "/home/${username}/.config/conky/conky-jp.conf"
8895

8996
# Snap
9097
#if [[ "${arch}" = "x86_64" ]]; then

channels/i3/airootfs.i686/etc/skel/.config/i3/config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ for_window [class="^.*"] border pixel 2
3131

3232
# automatic-startup
3333
exec_always --no-startup-id $HOME/.config/polybar/launch.sh
34+
exec_always --no-startup-id light-locker
3435
exec_always --no-startup-id compton
3536
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
3637
exec --no-startup-id nm-applet
@@ -60,7 +61,7 @@ bindsym $mod+Return exec --no-startup-id sakura
6061
bindsym $mod+Shift+Print exec --no-startup-id xfce4-screenshooter
6162

6263
# lock screen
63-
bindsym $mod+Escape exec --no-startup-id i3lock -k
64+
bindsym $mod+Escape exec --no-startup-id light-locker-command -l
6465

6566
# polybar theme setting manager
6667
bindsym $mod+Shift+s exec --no-startup-id alterlinux-i3-manager

channels/i3/airootfs.x86_64/etc/skel/.config/i3/config

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -31,6 +31,7 @@ for_window [class="^.*"] border pixel 2
3131

3232
# automatic-startup
3333
exec_always --no-startup-id $HOME/.config/polybar/launch.sh
34+
exec_always --no-startup-id light-locker
3435
exec_always --no-startup-id compton
3536
exec --no-startup-id xss-lock --transfer-sleep-lock -- i3lock --nofork
3637
exec --no-startup-id nm-applet
@@ -60,7 +61,7 @@ bindsym $mod+Return exec --no-startup-id sakura
6061
bindsym $mod+Shift+Print exec --no-startup-id xfce4-screenshooter
6162

6263
# lock screen
63-
bindsym $mod+Escape exec --no-startup-id i3lock -k
64+
bindsym $mod+Escape exec --no-startup-id light-locker-command -l
6465

6566
# polybar theme setting manager
6667
bindsym $mod+Shift+s exec --no-startup-id alterlinux-i3-manager

channels/i3/packages.i686/i3.i686

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,6 @@ gpm
1414
xorg-server
1515
xorg-xinit
1616
xorg-xrandr
17-
xterm
1817

1918
# xorg-drivers
2019
xf86-video-voodoo

channels/i3/packages.i686/lightdm.i686

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,5 +11,6 @@
1111

1212

1313
lightdm
14+
light-locker
1415
lightdm-slick-greeter
1516
lightdm-settings

channels/i3/packages.i686/packages.i686

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@ clonezilla
1313
ddrescue
1414
diffutils
1515
dmraid
16-
elinks
1716
fsarchiver
1817
gpm
1918
gptfdisk
@@ -31,3 +30,6 @@ testdisk
3130
vi
3231
vim-minimal
3332
grub-theme-vimix
33+
gvfs-smb
34+
gvfs
35+
sshfs

0 commit comments

Comments
 (0)