Merge remote-tracking branch 'origin/dev' into kmscon

diff --git a/channels/basic/config.any b/channels/basic/config.any
index 7bec8a6..4aa593f 100644 (file)
--- a/channels/basic/config.any
+++ b/channels/basic/config.any
@@ -25,6 +25,7 @@ usershell="/bin/zsh"
 modules=(
     "cli-modules"
     "share-extra"
+    "kmscon"
     "pipewire"
     "gtk-tools"
     #"lightdm"

diff --git a/channels/cinnamon/config.any b/channels/cinnamon/config.any
index bfa6229..b427944 100644 (file)
--- a/channels/cinnamon/config.any
+++ b/channels/cinnamon/config.any
@@ -22,4 +22,5 @@ modules=(
     "cli-modules"
     "lightdm-modules"
     "gtk-modules"
+    "kmscon"
 )

diff --git a/channels/gnome/config.any b/channels/gnome/config.any
index f637902..cf2ffba 100644 (file)
--- a/channels/gnome/config.any
+++ b/channels/gnome/config.any
@@ -23,6 +23,7 @@ noaur=false
 # This setting cannot be changed by an argument.
 modules=(
     "cli-modules"
+    "kmscon"
     "gdm"
     "gtk-modules"
 )

diff --git a/channels/i3/config.any b/channels/i3/config.any
index 9b4eb6f..2cfbccc 100644 (file)
--- a/channels/i3/config.any
+++ b/channels/i3/config.any
@@ -22,4 +22,5 @@ modules=(
     "cli-modules"
     "lightdm-modules"
     "gtk-modules"
+    "kmscon"
 )

diff --git a/channels/lxde/config.any b/channels/lxde/config.any
index bfa6229..b427944 100644 (file)
--- a/channels/lxde/config.any
+++ b/channels/lxde/config.any
@@ -22,4 +22,5 @@ modules=(
     "cli-modules"
     "lightdm-modules"
     "gtk-modules"
+    "kmscon"
 )

diff --git a/channels/plasma/config.any b/channels/plasma/config.any
index 823fdd1..ab7b787 100644 (file)
--- a/channels/plasma/config.any
+++ b/channels/plasma/config.any
@@ -23,4 +23,5 @@ modules=(
     "share-extra"
     "pipewire"
     "calamares"
+    "kmscon"
 )

diff --git a/channels/serene/config.any b/channels/serene/config.any
index 685d311..514230f 100644 (file)
--- a/channels/serene/config.any
+++ b/channels/serene/config.any
@@ -63,6 +63,7 @@ modules=(
     "cli-modules"
     "lightdm-modules"
     "gtk-modules"
+    "kmscon"
 )
 
 

diff --git a/channels/xfce-pro/config.any b/channels/xfce-pro/config.any
index bfa6229..b427944 100644 (file)
--- a/channels/xfce-pro/config.any
+++ b/channels/xfce-pro/config.any
@@ -22,4 +22,5 @@ modules=(
     "cli-modules"
     "lightdm-modules"
     "gtk-modules"
+    "kmscon"
 )

diff --git a/channels/xfce/config.any b/channels/xfce/config.any
index bfa6229..b427944 100644 (file)
--- a/channels/xfce/config.any
+++ b/channels/xfce/config.any
@@ -22,4 +22,5 @@ modules=(
     "cli-modules"
     "lightdm-modules"
     "gtk-modules"
+    "kmscon"
 )

diff --git a/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf b/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf
new file mode 100644 (file)
index 0000000..1a2a848
--- /dev/null
+++ b/modules/kmscon/airootfs.any/etc/fonts/conf.d/99-kmscon.conf
@@ -0,0 +1,12 @@
+<?xml version="1.0"?>
+<!DOCTYPE fontconfig SYSTEM "fonts.dtd">
+<fontconfig>
+<match>
+    <test name="family"><string>monospace</string></test>
+    <edit name="family" mode="prepend" binding="strong">
+        <string>SauceCodePro Nerd Font Mono</string>
+        <string>DejaVu Sans Mono</string>
+        <string>IPAGothic</string>
+    </edit>
+</match>
+</fontconfig>

diff --git a/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh
new file mode 100755 (executable)
index 0000000..55e164f
--- /dev/null
+++ b/modules/kmscon/airootfs.any/root/customize_airootfs_kmscon.sh
@@ -0,0 +1,21 @@
+#!/usr/bin/env bash
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+
+# Copy config file for getty@tty1.service to kmsconvt@tty1.service
+if [[ -f "/etc/systemd/system/getty@tty1.service.d/autologin.conf" ]]; then
+    mkdir -p "/etc/systemd/system/kmsconvt@tty1.service.d/"
+    cp "/etc/systemd/system/getty@tty1.service.d/autologin.conf" "/etc/systemd/system/kmsconvt@tty1.service.d/autologin.conf" 
+fi
+
+# Disable default tty
+_systemd_service disable "getty@tty1.service"
+_systemd_service enable "kmsconvt@tty1.service"
+
+# Run KMSCON for all tty
+ln -s "/usr/lib/systemd/system/kmsconvt@.service" "/etc/systemd/system/autovt@.service"

diff --git a/modules/kmscon/alteriso b/modules/kmscon/alteriso
new file mode 100644 (file)
index 0000000..9e793f3
--- /dev/null
+++ b/modules/kmscon/alteriso
@@ -0,0 +1 @@
+alteriso=3.1

diff --git a/modules/kmscon/architecture b/modules/kmscon/architecture
new file mode 100644 (file)
index 0000000..84d09d3
--- /dev/null
+++ b/modules/kmscon/architecture
@@ -0,0 +1,10 @@
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# Supported architecture list
+
+x86_64

diff --git a/modules/kmscon/packages.i686/kmscon.x86_64 b/modules/kmscon/packages.i686/kmscon.x86_64
new file mode 100644 (file)
index 0000000..4b04eb3
--- /dev/null
+++ b/modules/kmscon/packages.i686/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- kmscon --#
+kmscon

diff --git a/modules/kmscon/packages.x86_64/kmscon.x86_64 b/modules/kmscon/packages.x86_64/kmscon.x86_64
new file mode 100644 (file)
index 0000000..4b04eb3
--- /dev/null
+++ b/modules/kmscon/packages.x86_64/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- kmscon --#
+kmscon

diff --git a/modules/kmscon/packages_aur.i686/kmscon.x86_64 b/modules/kmscon/packages_aur.i686/kmscon.x86_64
new file mode 100644 (file)
index 0000000..26d6099
--- /dev/null
+++ b/modules/kmscon/packages_aur.i686/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- Fonts --#
+nerd-fonts-source-code-pro

diff --git a/modules/kmscon/packages_aur.x86_64/kmscon.x86_64 b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64
new file mode 100644 (file)
index 0000000..26d6099
--- /dev/null
+++ b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64
@@ -0,0 +1,13 @@
+#
+# Alter Linux package list
+#
+# Yamada Hayao
+# Twitter: @Hayao0819
+# Email  : hayao@fascode.net
+#
+# (c) 2019-2021 Fascode Network.
+#
+# kmscon packages
+
+#-- Fonts --#
+nerd-fonts-source-code-pro

diff --git a/system/pacman-x86_64.conf b/system/pacman-x86_64.conf
index bd0789e..ade9bf8 100644 (file)
--- a/system/pacman-x86_64.conf
+++ b/system/pacman-x86_64.conf
@@ -88,8 +88,8 @@ Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arc
 Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
 Server = https://fascodenet.github.io/$repo/$arch/
 
-[dvzrv]
-Server = https://pkgbuild.com/~dvzrv/repo/$arch
+#[dvzrv]
+#Server = https://pkgbuild.com/~dvzrv/repo/$arch
 
 #[testing]
 #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch