Skip to content

Commit 757fdb6

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev-stable'
2 parents 04031ea + 24dd12a commit 757fdb6

35 files changed

+742
-150
lines changed

‎.gitignore‎

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,4 +12,7 @@
1212
pkg/
1313
src/
1414
out/
15-
work/
15+
work/
16+
17+
airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-notifyd.xml
18+
airootfs/etc/skel/.config/xfce4/desktop/

‎Makefile‎

Lines changed: 53 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,53 @@
1+
BUILD_SCRIPT = build.sh
2+
3+
4+
linux:
5+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter"
6+
@make cleanup
7+
8+
ck :
9+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k ck
10+
@make cleanup
11+
12+
lts:
13+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lts
14+
@make cleanup
15+
16+
lqx:
17+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lqx
18+
@make cleanup
19+
20+
rt:
21+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k rt
22+
@make cleanup
23+
24+
zen:
25+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k zen
26+
@make cleanup
27+
28+
test-linux:
29+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -t '-Xcompression-level 1' -x
30+
@make cleanup
31+
32+
test-ck:
33+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k ck -t '-Xcompression-level 1' -x
34+
@make cleanup
35+
36+
test-lts:
37+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lts -t '-Xcompression-level 1' -x
38+
@make cleanup
39+
40+
test-lqx:
41+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k lqx -t '-Xcompression-level 1' -x
42+
@make cleanup
43+
44+
test-rt:
45+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k rt -t '-Xcompression-level 1' -x
46+
@make cleanup
47+
48+
test-zen:
49+
@sudo ./${BUILD_SCRIPT} -b -c "zstd" -p "alter" -k zen -t '-Xcompression-level 1' -x
50+
@make cleanup
51+
52+
cleanup:
53+
@sudo rm -rf ./work

‎README.md‎

Lines changed: 7 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -10,14 +10,18 @@
1010
| [日本語](README_jp.md) | [English](README.md) |
1111
|:-----:|:-----:|
1212

13-
| [Stable](https://github.com/SereneTeam/alterlinux/tree/master) | [Unstable](https://github.com/SereneTeam/alterlinux/tree/dev-stable) | [Develop](https://github.com/SereneTeam/alterlinux/tree/dev) |
14-
|:-----:|:-----:|:-----:|
15-
1613
## Overview
1714

1815
Alter Linux is a new OS developed based on Arch Linux.
1916
Combining a sophisticated UI with Xfce4 and a package management tool complete with a GUI, anyone can easily use the latest OS at high speed.
2017

18+
## Branch
19+
The main branches are: Other branches are temporary or used for specific purposes.
20+
21+
| [Stable](https://github.com/SereneTeam/alterlinux/tree/master) | [dev-stable](https://github.com/SereneTeam/alterlinux/tree/dev-stable) | [dev](https://github.com/SereneTeam/alterlinux/tree/dev) |
22+
|:-----:|:-----:|:-----:|
23+
| Most stable. Bug fixes may be delayed. | It is updated regularly. Relatively stable, with the latest features and fixes. | Always updated. There may be many issues left. |
24+
2125
## Repositories and software
2226

2327
### Repositories

‎README_jp.md‎

Lines changed: 9 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -10,15 +10,19 @@
1010
| [日本語](README_jp.md) | [English](README.md) |
1111
|:-----:|:-----:|
1212

13-
| [安定版](https://github.com/SereneTeam/alterlinux/tree/master) | [リリース候補](https://github.com/SereneTeam/alterlinux/tree/dev-stable) | [開発](https://github.com/SereneTeam/alterlinux/tree/dev) |
14-
|:-----:|:-----:|:-----:|
15-
1613
## 概要
1714

1815
Alter LinuxはArch Linuxをベースに開発されている新しいOSです。
1916
Xfce4による洗練されたUIとGUIで完結するパッケージ管理ツールを兼ね備え、誰でも簡単に高速で最新のOSを使用できます。
20-
21-
## リポジトリとソフトウェア
17+
18+
## ブランチ
19+
主要なブランチは以下のとおりです。これ以外のブランチは一時的なものや特定の用途で使われているものです。
20+
21+
| [安定版](https://github.com/SereneTeam/alterlinux/tree/master) | [リリース候補](https://github.com/SereneTeam/alterlinux/tree/dev-stable) | [開発](https://github.com/SereneTeam/alterlinux/tree/dev) |
22+
|:-----:|:-----:|:-----:|
23+
| 最も安定しています。バグの修正などは遅れる場合があります。 | 定期的に更新されます。比較的安定していて、最新の機能や修正を利用できます。 | 常に更新されます。問題が多数残っている場合があります。|
24+
25+
## リポジトリとソフトウェア
2226

2327
### リポジトリ
2428
- [SereneTeam/alter-repo](https://github.com/SereneTeam/alter-repo)

‎airootfs/etc/lightdm/lightdm-webkit2-greeter.conf‎

Lines changed: 35 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,35 @@
1+
#
2+
# [greeter]
3+
# debug_mode = Greeter theme debug mode.
4+
# detect_theme_errors = Provide an option to load a fallback theme when theme errors are detected.
5+
# screensaver_timeout = Blank the screen after this many seconds of inactivity.
6+
# secure_mode = Don't allow themes to make remote http requests.
7+
# time_format = A moment.js format string so the greeter can generate localized time for display.
8+
# time_language = Language to use when displaying the time or "auto" to use the system's language.
9+
# webkit_theme = Webkit theme to use.
10+
#
11+
# NOTE: See moment.js documentation for format string options: http://momentjs.com/docs/#/displaying/format/
12+
#
13+
14+
[greeter]
15+
debug_mode = false
16+
detect_theme_errors = true
17+
screensaver_timeout = 300
18+
secure_mode = true
19+
time_format = LT
20+
time_language = auto
21+
webkit_theme = alter
22+
23+
#
24+
# [branding]
25+
# background_images = Path to directory that contains background images for use by themes.
26+
# logo = Path to logo image for use by greeter themes.
27+
# user_image = Default user image/avatar. This is used by themes for users that have no .face image.
28+
#
29+
# NOTE: Paths must be accessible to the lightdm system user account (so they cannot be anywhere in /home)
30+
#
31+
32+
[branding]
33+
background_images = /usr/share/backgrounds
34+
logo = /usr/share/pixmaps/archlinux-logo.svg
35+
user_image = /usr/share/pixmaps/archlinux-user.svg

‎airootfs/etc/lightdm/slick-greeter.conf‎

Lines changed: 0 additions & 7 deletions
This file was deleted.

‎airootfs/etc/skel/.bash_profile‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,11 +1,12 @@
11
#
22
# ~/.bash_profile
33
#
4-
4+
<<DISABLED
55
if [[ -f ~/.setup.sh ]]; then
66
bash ~/.setup.sh
77
rm ~/.setup.sh
88
fi
9+
DISABLED
910

1011
[[ -f ~/.bashrc ]] && . ~/.bashrc
1112
[[ -z $DISPLAY && $XDG_VTNR -eq 1 ]] && exec startx

‎airootfs/etc/skel/.config/gtk-3.0/bookmarks‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
file:///home/alter/Pictures
2+
file:///home/alter/Videos
3+
file:///home/alter/Music
4+
file:///home/alter/Downloads
5+
file:///home/alter/Documents

‎airootfs/etc/skel/.config/xfce4/panel/whiskermenu-3.rc‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
1-
favorites=exo-terminal-emulator.desktop,exo-file-manager.desktop,exo-mail-reader.desktop,exo-web-browser.desktop
2-
recent=xfce-display-settings.desktop,xfce-settings-manager.desktop,exo-file-manager.desktop,exo-terminal-emulator.desktop,exo-web-browser.desktop
1+
favorites=chromium.desktop,thunderbird.desktop,vlc.desktop,leafpad.desktop,code-oss.desktop,xfce4-screenshooter.desktop
2+
recent=
33
button-title=Alter
44
button-icon=alter
55
button-single-row=false
@@ -14,7 +14,7 @@ category-show-name=true
1414
category-icon-size=1
1515
load-hierarchy=false
1616
view-as-icons=false
17-
recent-items-max=10
17+
recent-items-max=0
1818
favorites-in-recent=true
1919
display-recent-default=false
2020
position-search-alternate=true

‎airootfs/etc/skel/.config/xfce4/xfconf/xfce-perchannel-xml/xfce4-panel.xml‎

Lines changed: 13 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -38,23 +38,23 @@
3838
<value type="int" value="1"/>
3939
<value type="int" value="14"/>
4040
</property>
41-
<property name="enter-opacity" type="uint" value="75"/>
42-
<property name="leave-opacity" type="uint" value="75"/>
41+
<property name="enter-opacity" type="uint" value="100"/>
42+
<property name="leave-opacity" type="uint" value="100"/>
4343
<property name="background-style" type="uint" value="1"/>
4444
<property name="background-rgba" type="array">
4545
<value type="double" value="0.000000"/>
4646
<value type="double" value="0.000000"/>
4747
<value type="double" value="0.000000"/>
48-
<value type="double" value="1.000000"/>
48+
<value type="double" value="0.000000"/>
4949
</property>
5050
</property>
5151
<property name="panel-3" type="empty">
5252
<property name="position" type="string" value="p=9;x=639;y=20"/>
5353
<property name="size" type="uint" value="35"/>
5454
<property name="length" type="uint" value="10"/>
5555
<property name="position-locked" type="bool" value="true"/>
56-
<property name="enter-opacity" type="uint" value="75"/>
57-
<property name="leave-opacity" type="uint" value="75"/>
56+
<property name="enter-opacity" type="uint" value="100"/>
57+
<property name="leave-opacity" type="uint" value="100"/>
5858
<property name="plugin-ids" type="array">
5959
<value type="int" value="11"/>
6060
<value type="int" value="13"/>
@@ -65,7 +65,7 @@
6565
<value type="double" value="0.000000"/>
6666
<value type="double" value="0.000000"/>
6767
<value type="double" value="0.000000"/>
68-
<value type="double" value="1.000000"/>
68+
<value type="double" value="0.000000"/>
6969
</property>
7070
</property>
7171
<property name="panel-4" type="empty">
@@ -86,10 +86,10 @@
8686
<value type="double" value="0.000000"/>
8787
<value type="double" value="0.000000"/>
8888
<value type="double" value="0.000000"/>
89-
<value type="double" value="1.000000"/>
89+
<value type="double" value="0.000000"/>
9090
</property>
91-
<property name="enter-opacity" type="uint" value="75"/>
92-
<property name="leave-opacity" type="uint" value="75"/>
91+
<property name="enter-opacity" type="uint" value="100"/>
92+
<property name="leave-opacity" type="uint" value="100"/>
9393
</property>
9494
<property name="panel-5" type="empty">
9595
<property name="position" type="string" value="p=8;x=98;y=949"/>
@@ -135,7 +135,9 @@
135135
<property name="style" type="uint" value="0"/>
136136
<property name="expand" type="bool" value="true"/>
137137
</property>
138-
<property name="plugin-13" type="string" value="clock"/>
138+
<property name="plugin-13" type="string" value="clock">
139+
<property name="digital-format" type="string" value="%m/%d %a %l:%M:%S"/>
140+
</property>
139141
<property name="plugin-14" type="string" value="separator">
140142
<property name="expand" type="bool" value="true"/>
141143
<property name="style" type="uint" value="0"/>
@@ -151,6 +153,7 @@
151153
</property>
152154
<property name="plugin-23" type="string" value="systray">
153155
<property name="names-ordered" type="array">
156+
<value type="string" value="networkmanager applet"/>
154157
<value type="string" value="thunar"/>
155158
<value type="string" value="pamac-tray"/>
156159
<value type="string" value="blueman-tray"/>

0 commit comments

Comments
 (0)