Merge branch 'dev' into dev-stable

Author: Hayao0819

.github/FUNDING.yml

@@ -0,0 +1,2 @@
+patreon: fascodenetwork
+custom: ["https://fascodenetwork.booth.pm/"]

.shellcheckrc

@@ -0,0 +1,6 @@
+shell=bash
+disable=SC1090
+disable=SC2154
+disable=SC2016
+disable=SC2034
+source-path=SCRIPTDIR

Makefile

@@ -5,10 +5,14 @@ KERNEL       := zen
 SHARE_OPTION := --boot-splash --comp-type "xz" --user "alter" --password "alter" --kernel "${KERNEL}" --debug --noconfirm
 ARCH_x86_64  := --arch x86_64
 ARCH_i686    := --arch i686
+FULLBUILD    := -d -g -e 1 --noconfirm
+FULL_x86_64  := xfce cinnamon i3 plasma
+FULL_i686    := xfce lxde
 CURRENT_DIR  := ${shell dirname $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}/${shell basename $(dir $(abspath $(lastword $(MAKEFILE_LIST))))}
 
 full:
-	@sudo ${CURRENT_DIR}/tools/fullbuild.sh -d
+	@sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m x86_64 ${FULL_x86_64}
+	@sudo ${CURRENT_DIR}/tools/fullbuild.sh ${FULLBUILD} -m i686   ${FULL_i686}
 	@make clean
 
 basic-64 basic-32  cinnamon-64 cinnamon-32 gnome-64 i3-64 i3-32 lxde-64 lxde-32 plasma-64 releng-32 releng-64 serene-64 serene-32 xfce-64 xfce-32 xfce-pro-64:
@@ -35,7 +39,7 @@ build_option:
 	${CURRENT_DIR}/tools/menuconf-to-alterconf.sh ${CURRENT_DIR}/.build_option
 
 clean:
-	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} clean
+	@sudo ${CURRENT_DIR}/${BUILD_SCRIPT} --noconfirm clean
 
 build:build_option
 	$(eval BUILD_OPTION := $(shell cat ${CURRENT_DIR}/.build_option))

build.sh

@@ -27,5 +27,6 @@ modules=(
     "share"
     "zsh-powerline"
     "share-extra"
+    "gtk-tools"
     #"lightdm"
 )

channels/basic/config.any

@@ -22,8 +22,10 @@ modules=(
     "base"
     "share"
     "share-extra"
+    "gtk-tools"
     "zsh-powerline"
     "lightdm"
     "alter-lightdm"
     "qtongtk"
+    "calamares"
 )

channels/cinnamon/airootfs.x86_64/usr/share/calamares/modules/services-plymouth.conf

@@ -19,9 +19,6 @@ show-battery-percentage=true
 [org/gnome/desktop/notifications/application/org-gnome-tweaks]
 application-id='org.gnome.tweaks.desktop'
 
-[org/gnome/desktop/peripherals/keyboard]
-numlock-state=false
-
 [org/gnome/desktop/peripherals/touchpad]
 two-finger-scrolling-enabled=true
 
@@ -67,9 +64,9 @@ hinting='slight'
 
 [org/gnome/shell]
 app-picker-view=uint32 0
-disabled-extensions=['[email protected]', '[email protected]', '[email protected]', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', '[email protected]', '[email protected]']
+disabled-extensions=['[email protected]', '[email protected]', '[email protected]', 'native-window-placement@gnome-shell-extensions.gcampax.github.com', '[email protected]' ]
 enabled-extensions=['[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]', '[email protected]']
-favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'pamac-updater.desktop', 'gnome-control-center.desktop']
+favorite-apps=['chromium.desktop', 'org.gnome.Nautilus.desktop', 'thunderbird.desktop', 'libreoffice-startcenter.desktop', 'medit.desktop', 'vlc.desktop', 'org.gnome.Screenshot.desktop', 'org.gnome.Terminal.desktop', 'org.gnome.Extensions.desktop', 'gnome-control-center.desktop']
 
 [org/gnome/shell/extensions/arc-menu]
 application-shortcuts-list=[['Software', 'system-software-install-symbolic', 'ArcMenu_Software'], ['Settings', 'preferences-system-symbolic', 'gnome-control-center.desktop'], ['Tweaks', 'org.gnome.tweaks-symbolic', 'org.gnome.tweaks.desktop'], ['Terminal', 'utilities-terminal-symbolic', 'org.gnome.Terminal.desktop']]
@@ -83,7 +80,7 @@ dtp-dtd-state=[true, true]
 enable-custom-arc-menu=false
 enable-menu-button-arrow=false
 menu-button-icon='Custom_Icon'
-pinned-app-list=['Chromium', 'chromium', 'chromium.desktop', 'LibreOffice', 'libreoffice-startcenter', 'libreoffice-startcenter.desktop', 'VLC Media Player', 'vlc', 'vlc.desktop', 'Update software', 'system-software-update', 'pamac-updater.desktop', 'System Monitor', 'org.gnome.SystemMonitor', 'gnome-system-monitor.desktop', 'Terminal', 'org.gnome.Terminal', 'org.gnome.Terminal.desktop', 'Settings', 'org.gnome.Settings', 'gnome-control-center.desktop']
+pinned-app-list=['Chromium', 'chromium', 'chromium.desktop', 'LibreOffice', 'libreoffice-startcenter', 'libreoffice-startcenter.desktop', 'VLC Media Player', 'vlc', 'vlc.desktop', 'System Monitor', 'org.gnome.SystemMonitor', 'gnome-system-monitor.desktop', 'Terminal', 'org.gnome.Terminal', 'org.gnome.Terminal.desktop', 'Settings', 'org.gnome.Settings', 'gnome-control-center.desktop']
 position-in-panel='Left'
 recently-installed-apps=@as []
 show-external-devices=true

channels/cinnamon/airootfs.x86_64/usr/share/calamares/modules/services.conf

@@ -0,0 +1,2 @@
+[org/gnome/shell]
+welcome-dialog-last-shown-version='4294967295'