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

diff --cc channels/basic/config.any
index 9c2efce,7bec8a6..4aa593f
--- 1/channels/basic/config.any
--- 2/channels/basic/config.any
+++ b/channels/basic/config.any
@@@ -23,10 -23,9 +23,10 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "zsh-powerline"
+     "cli-modules"
      "share-extra"
 +    "kmscon"
+     "pipewire"
+     "gtk-tools"
      #"lightdm"
  )

diff --cc channels/cinnamon/config.any
index b76fd63,bfa6229..b427944
--- 1/channels/cinnamon/config.any
--- 2/channels/cinnamon/config.any
+++ b/channels/cinnamon/config.any
@@@ -19,12 -19,7 +19,8 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
+     "lightdm-modules"
+     "gtk-modules"
 +    "kmscon"
-     "zsh-powerline"
-     "lightdm"
-     "alter-lightdm"
-     "qtongtk"
  )

diff --cc channels/gnome/config.any
index db23c5a,f637902..cf2ffba
--- 1/channels/gnome/config.any
--- 2/channels/gnome/config.any
+++ b/channels/gnome/config.any
@@@ -22,11 -22,7 +22,8 @@@ noaur=fals
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
 +    "kmscon"
-     "zsh-powerline"
      "gdm"
-     "qtongtk"
+     "gtk-modules"
  )

diff --cc channels/i3/config.any
index dfdb5e0,9b4eb6f..2cfbccc
--- 1/channels/i3/config.any
--- 2/channels/i3/config.any
+++ b/channels/i3/config.any
@@@ -19,12 -19,7 +19,8 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
+     "lightdm-modules"
+     "gtk-modules"
 +    "kmscon"
-     "zsh-powerline"
-     "lightdm"
-     "alter-lightdm"
-     "qtongtk"
  )

diff --cc channels/lxde/config.any
index b76fd63,bfa6229..b427944
--- 1/channels/lxde/config.any
--- 2/channels/lxde/config.any
+++ b/channels/lxde/config.any
@@@ -19,12 -19,7 +19,8 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
+     "lightdm-modules"
+     "gtk-modules"
 +    "kmscon"
-     "zsh-powerline"
-     "lightdm"
-     "alter-lightdm"
-     "qtongtk"
  )

diff --cc channels/plasma/config.any
index aafcb63,823fdd1..ab7b787
--- 1/channels/plasma/config.any
--- 2/channels/plasma/config.any
+++ b/channels/plasma/config.any
@@@ -19,7 -19,8 +19,9 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "share"
-     "base"
+     "cli-modules"
+     "share-extra"
+     "pipewire"
+     "calamares"
 +    "kmscon"
  )

diff --cc channels/serene/config.any
index b27e4bb,685d311..514230f
--- 1/channels/serene/config.any
--- 2/channels/serene/config.any
+++ b/channels/serene/config.any
@@@ -60,14 -60,9 +60,10 @@@ customized_syslinux=tru
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
+     "lightdm-modules"
+     "gtk-modules"
 +    "kmscon"
-     "zsh-powerline"
-     "lightdm"
-     "alter-lightdm"
-     "qtongtk"
  )
  
  

diff --cc channels/xfce-pro/config.any
index b76fd63,bfa6229..b427944
--- 1/channels/xfce-pro/config.any
--- 2/channels/xfce-pro/config.any
+++ b/channels/xfce-pro/config.any
@@@ -19,12 -19,7 +19,8 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
+     "lightdm-modules"
+     "gtk-modules"
 +    "kmscon"
-     "zsh-powerline"
-     "lightdm"
-     "alter-lightdm"
-     "qtongtk"
  )

diff --cc channels/xfce/config.any
index b76fd63,bfa6229..b427944
--- 1/channels/xfce/config.any
--- 2/channels/xfce/config.any
+++ b/channels/xfce/config.any
@@@ -19,12 -19,7 +19,8 @@@ usershell="/bin/zsh
  # An array of module directory names to include.
  # This setting cannot be changed by an argument.
  modules=(
-     "base"
-     "share"
-     "share-extra"
+     "cli-modules"
+     "lightdm-modules"
+     "gtk-modules"
 +    "kmscon"
-     "zsh-powerline"
-     "lightdm"
-     "alter-lightdm"
-     "qtongtk"
  )

diff --cc system/pacman-x86_64.conf
index 4a57b05,bd0789e..ade9bf8
--- 1/system/pacman-x86_64.conf
--- 2/system/pacman-x86_64.conf
+++ b/system/pacman-x86_64.conf
@@@ -82,20 -80,17 +80,17 @@@ LocalFileSigLevel = Optiona
  # after the header, and they will be used before the default mirrors.
  
  [alter-stable]
+ Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
+ Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
  Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
+ Server = https://ftp.jaist.ac.jp/pub/sourceforge.jp/storage/g/s/se/serene/repo/$repo/$arch
+ Server = https://ftp.iij.ad.jp/pub/osdn.jp/storage/g/s/se/serene/repo/$repo/$arch
  Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
- Server = https://repo.dyama.net/$repo/$arch
- #Server = https://xn--d-8o2b.com/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
  
- #[alter-testing]
- #Server = https://osdn.dl.osdn.net/storage/g/a/al/alterlinux/repo/$repo/$arch
- #Server = https://osdn.dl.osdn.net/storage/g/s/se/serene/repo/$repo/$arch
- #Server = https://repo.dyama.net/$repo/$arch
- #Server = https://xn--d-8o2b.com/repo/$repo/$arch
- 
  #[testing]
  #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
  #Server = http://ftp.tsukuba.wide.ad.jp/Linux/archlinux/$repo/os/$arch