Skip to content

Commit 2e8533d

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents 73224d9 + 69f4aff commit 2e8533d

File tree

38 files changed

+781
-4
lines changed

38 files changed

+781
-4
lines changed

‎Makefile

+8
Original file line numberDiff line numberDiff line change
@@ -85,3 +85,11 @@ wizard:
8585
check:
8686
@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error **/*.{sh,ksh,bash}'
8787
@bash -c 'shopt -s globstar nullglob; shellcheck -s bash --exclude=SC2068 -S error tools/*.{sh,ksh,bash}'
88+
89+
90+
# デバッグ用
91+
ARCH := x86_64
92+
CHANNEL := xfce
93+
LOCALE := ja
94+
custom:
95+
sudo ${CURRENT_DIR}/${BUILD_SCRIPT} ${ARGS} ${SHARE_OPTION} --arch ${ARCH} -l ${LOCALE} ${CHANNEL}

‎build.sh

+1-1
Original file line numberDiff line numberDiff line change
@@ -389,7 +389,7 @@ prepare_build() {
389389
# Check modules
390390
module_check(){
391391
msg_debug -n "Checking ${1} module ... "
392-
bash "${tools_dir}/module.sh" check "${1}" || msg_error "Module ${1} is not available." "1" && echo "${module_dir}/${1}"
392+
bash "${tools_dir}/module.sh" check "${1}" || msg_error "Module ${1} is not available." "1" && msg_debug "Load ${module_dir}/${1}"
393393
}
394394
readarray -t modules < <(printf "%s\n" "${modules[@]}" | awk '!a[$0]++')
395395
for_module "module_check {}"

‎channels/i3/packages.i686/i3.i686

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ i3-gaps
1717
nitrogen
1818
picom
1919
conky
20+
polybar
2021

2122
# launcher
2223
rofi

‎channels/i3/packages.x86_64/i3.x86_64

+1
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,7 @@ i3-gaps
1717
nitrogen
1818
picom
1919
conky
20+
polybar
2021

2122
# launcher
2223
rofi

‎channels/i3/packages_aur.i686/i3.i686

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# i3wm relation packages
1111

1212
# i3wm
13-
polybar
13+
#polybar
1414

1515
# terminal emulator
1616
sakura

‎channels/i3/packages_aur.x86_64/i3.x86_64

+1-1
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
# i3wm relation packages
1111

1212
# i3wm
13-
polybar
13+
#polybar
1414

1515
# terminal emulator
1616
sakura

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/helpers.rc

+1
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
WebBrowser=chromium

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/calculator-2.rc

+5
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
degrees=false
2+
size=20
3+
hist_size=25
4+
output_base=10
5+

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/launcher-4/15751404171.desktop

+26
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,26 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Name=Chromium
4+
GenericName=Web Browser
5+
GenericName[ja]=ウェブブラウザ
6+
Comment=Access the Internet
7+
Comment[ja]=インターネットにアクセス
8+
Exec=/usr/bin/chromium %U
9+
StartupNotify=true
10+
Terminal=false
11+
Icon=chromium
12+
Type=Application
13+
Categories=Network;WebBrowser;
14+
MimeType=text/html;text/xml;application/xhtml_xml;image/webp;x-scheme-handler/http;x-scheme-handler/https;x-scheme-handler/ftp;
15+
Actions=new-window;new-private-window;
16+
X-XFCE-Source=file:///usr/share/applications/chromium.desktop
17+
18+
[Desktop Action new-window]
19+
Name=New Window
20+
Name[ja]=新規ウインドウ
21+
Exec=/usr/bin/chromium
22+
23+
[Desktop Action new-private-window]
24+
Name=New Incognito Window
25+
Name[ja]=新しいシークレット ウィンドウ
26+
Exec=/usr/bin/chromium --incognito

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/launcher-5/15751404272.desktop

+15
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
[Desktop Entry]
2+
Name=Thunar File Manager
3+
Name[ja]=Thunar ファイルマネージャー
4+
Comment=Browse the filesystem with the file manager
5+
Comment[ja]=ファイルマネージャーでファイルシステムを参照します
6+
GenericName=File Manager
7+
GenericName[ja]=ファイルマネージャー
8+
Exec=thunar %F
9+
Icon=Thunar
10+
Terminal=false
11+
StartupNotify=true
12+
Type=Application
13+
Categories=System;Utility;Core;GTK;FileTools;FileManager;
14+
MimeType=inode/directory;
15+
X-XFCE-Source=file:///usr/share/applications/thunar.desktop

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/launcher-6/15751404383.desktop

+21
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,21 @@
1+
[Desktop Entry]
2+
Version=1.0
3+
Name=Xfce Terminal
4+
Name[ja]=Xfce Terminal
5+
Comment=Terminal Emulator
6+
Comment[ja]=ターミナルエミュレーター
7+
GenericName=Terminal Emulator
8+
GenericName[ja]=ターミナルエミュレーター
9+
Exec=xfce4-terminal
10+
Icon=utilities-terminal
11+
Terminal=false
12+
Type=Application
13+
Categories=GTK;System;TerminalEmulator;
14+
StartupNotify=true
15+
Actions=preferences;
16+
X-XFCE-Source=file:///usr/share/applications/xfce4-terminal.desktop
17+
18+
[Desktop Action preferences]
19+
Name=Terminal Preferences
20+
Name[ja]=ターミナルの設定
21+
Exec=xfce4-terminal --preferences

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/panel/whiskermenu-1.rc

+80
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,80 @@
1+
favorites=chromium.desktop
2+
recent=
3+
button-title=Applications
4+
button-icon=xfce4-whiskermenu
5+
button-single-row=false
6+
show-button-title=false
7+
show-button-icon=true
8+
launcher-show-name=true
9+
launcher-show-description=true
10+
launcher-show-tooltip=true
11+
item-icon-size=2
12+
hover-switch-category=false
13+
category-show-name=true
14+
category-icon-size=1
15+
load-hierarchy=false
16+
recent-items-max=0
17+
favorites-in-recent=false
18+
display-recent-default=false
19+
position-search-alternate=true
20+
position-commands-alternate=true
21+
position-categories-alternate=false
22+
stay-on-focus-out=false
23+
confirm-session-command=true
24+
menu-width=400
25+
menu-height=500
26+
menu-opacity=100
27+
command-settings=xfce4-settings-manager
28+
show-command-settings=true
29+
command-lockscreen=xflock4
30+
show-command-lockscreen=false
31+
command-switchuser=gdmflexiserver
32+
show-command-switchuser=false
33+
command-logoutuser=xfce4-session-logout --logout --fast
34+
show-command-logoutuser=true
35+
command-restart=xfce4-session-logout --reboot --fast
36+
show-command-restart=true
37+
command-shutdown=xfce4-session-logout --halt --fast
38+
show-command-shutdown=true
39+
command-suspend=xfce4-session-logout --suspend
40+
show-command-suspend=false
41+
command-hibernate=xfce4-session-logout --hibernate
42+
show-command-hibernate=false
43+
command-logout=xfce4-session-logout
44+
show-command-logout=false
45+
command-menueditor=menulibre
46+
show-command-menueditor=false
47+
command-profile=mugshot
48+
show-command-profile=false
49+
search-actions=5
50+
51+
[action0]
52+
name=Man Pages
53+
pattern=#
54+
command=exo-open --launch TerminalEmulator man %s
55+
regex=false
56+
57+
[action1]
58+
name=Web Search
59+
pattern=?
60+
command=exo-open --launch WebBrowser https://duckduckgo.com/?q=%u
61+
regex=false
62+
63+
[action2]
64+
name=Wikipedia
65+
pattern=!w
66+
command=exo-open --launch WebBrowser https://en.wikipedia.org/wiki/%u
67+
regex=false
68+
69+
[action3]
70+
name=Run in Terminal
71+
pattern=!
72+
command=exo-open --launch TerminalEmulator %s
73+
regex=false
74+
75+
[action4]
76+
name=Open URI
77+
pattern=^(file|http|https):\\/\\/(.*)$
78+
command=exo-open \\0
79+
regex=true
80+

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/displays.xml

+20
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,20 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<channel name="displays" version="1.0">
4+
<property name="ActiveProfile" type="string" value="Default"/>
5+
<property name="Default" type="empty">
6+
<property name="VGA-1" type="string" value="VirtualBox ">
7+
<property name="Active" type="bool" value="true"/>
8+
<property name="EDID" type="string" value="8b95bbf409b9eff7635d08a6b77f23bf5ade9cd3"/>
9+
<property name="Resolution" type="string" value="1280x768"/>
10+
<property name="RefreshRate" type="double" value="59.870228"/>
11+
<property name="Rotation" type="int" value="0"/>
12+
<property name="Reflection" type="string" value="0"/>
13+
<property name="Primary" type="bool" value="true"/>
14+
<property name="Position" type="empty">
15+
<property name="X" type="int" value="0"/>
16+
<property name="Y" type="int" value="0"/>
17+
</property>
18+
</property>
19+
</property>
20+
</channel>

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/keyboards.xml

+7
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,7 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<channel name="keyboards" version="1.0">
4+
<property name="Default" type="empty">
5+
<property name="Numlock" type="bool" value="false"/>
6+
</property>
7+
</channel>

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/thunar.xml

+12
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,12 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<channel name="thunar" version="1.0">
4+
<property name="last-view" type="string" value="ThunarIconView"/>
5+
<property name="last-location-bar" type="string" value="ThunarLocationEntry"/>
6+
<property name="last-icon-view-zoom-level" type="string" value="THUNAR_ZOOM_LEVEL_100_PERCENT"/>
7+
<property name="last-separator-position" type="int" value="170"/>
8+
<property name="last-show-hidden" type="bool" value="false"/>
9+
<property name="last-window-maximized" type="bool" value="false"/>
10+
<property name="last-window-width" type="int" value="777"/>
11+
<property name="last-window-height" type="int" value="480"/>
12+
</channel>

‎channels/madeleine/airootfs.any/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-desktop.xml

+22
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,22 @@
1+
<?xml version="1.0" encoding="UTF-8"?>
2+
3+
<channel name="xfce4-desktop" version="1.0">
4+
<property name="desktop-menu" type="empty">
5+
<property name="show" type="bool" value="false"/>
6+
</property>
7+
<property name="windowlist-menu" type="empty">
8+
<property name="show" type="bool" value="false"/>
9+
</property>
10+
<property name="desktop-icons" type="empty">
11+
<property name="file-icons" type="empty">
12+
<property name="show-home" type="bool" value="false"/>
13+
<property name="show-filesystem" type="bool" value="false"/>
14+
<property name="show-trash" type="bool" value="false"/>
15+
<property name="show-removable" type="bool" value="false"/>
16+
</property>
17+
</property>
18+
<property name="last" type="empty">
19+
<property name="window-width" type="int" value="751"/>
20+
<property name="window-height" type="int" value="597"/>
21+
</property>
22+
</channel>

0 commit comments

Comments
 (0)