Merge branch 'dev' of github.com:FascodeNet/alterlinux into dev

Hayao0819 · Hayao0819 · commit 8d4a56f15642 · 2023-02-15T21:32:40.000+09:00
diff --git a/MEDIA_GUIDELINE.md b/MEDIA_GUIDELINE.md
@@ -0,0 +1,4 @@
+# FascodeNetworkで公開しているプロジェクトのメディア素材の扱いについて
+本リポジトリのメディア素材（ロゴやアイコン，その他画像や動画ファイルなどがありますが，これに限られません）の取り扱いに関しては[FascodeNetwork 二次創作ガイドライン](https://blog.fascode.net/2020/04/28/fanfictionguideline/)が適用されます。
+
+詳細に関しては[FascodeNetworkで公開しているプロジェクトのメディア素材の扱いについて](https://blog.fascode.net/2022/10/15/fascode-project-media-guideline/)をご確認ください。
diff --git a/mkinitcpio/mkinitcpio-archiso-plymouth.conf b/mkinitcpio/mkinitcpio-archiso-plymouth.conf
@@ -125,7 +125,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
+HOOKS=(base udev plymouth memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, zstd compression
diff --git a/mkinitcpio/mkinitcpio-archiso.conf b/mkinitcpio/mkinitcpio-archiso.conf
@@ -58,7 +58,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
+HOOKS=(base udev memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, zstd compression
diff --git a/modules/kmscon/packages.i686/kmscon.x86_64 b/modules/kmscon/packages.i686/kmscon.x86_64
@@ -11,3 +11,6 @@
 
 #-- kmscon --#
 kmscon
+
+#-- Fonts --#
+ttf-sourcecodepro-nerd
diff --git a/modules/kmscon/packages.x86_64/kmscon.x86_64 b/modules/kmscon/packages.x86_64/kmscon.x86_64
@@ -11,3 +11,6 @@
 
 #-- kmscon --#
 kmscon
+
+#-- Fonts --#
+ttf-sourcecodepro-nerd
diff --git a/modules/kmscon/packages_aur.i686/kmscon.x86_64 b/modules/kmscon/packages_aur.i686/kmscon.x86_64
diff --git a/modules/kmscon/packages_aur.x86_64/kmscon.x86_64 b/modules/kmscon/packages_aur.x86_64/kmscon.x86_64
diff --git a/modules/share-extra/packages.i686/fonts.i686 b/modules/share-extra/packages.i686/fonts.i686
@@ -15,3 +15,4 @@ adobe-source-code-pro-fonts
 noto-fonts
 noto-fonts-cjk
 noto-fonts-emoji
+ttf-sourcecodepro-nerd
diff --git a/modules/share-extra/packages.pen4/fonts.pen4 b/modules/share-extra/packages.pen4/fonts.pen4
@@ -15,3 +15,4 @@ adobe-source-code-pro-fonts
 noto-fonts
 noto-fonts-cjk
 noto-fonts-emoji
+ttf-sourcecodepro-nerd
diff --git a/modules/share-extra/packages.x86_64/fonts.x86_64 b/modules/share-extra/packages.x86_64/fonts.x86_64
@@ -15,3 +15,4 @@ adobe-source-code-pro-fonts
 noto-fonts
 noto-fonts-cjk
 noto-fonts-emoji
+ttf-sourcecodepro-nerd
diff --git a/modules/share-extra/packages_aur.i686/fonts.i686 b/modules/share-extra/packages_aur.i686/fonts.i686
diff --git a/modules/share-extra/packages_aur.pen4/fonts.pen4 b/modules/share-extra/packages_aur.pen4/fonts.pen4
diff --git a/modules/share-extra/packages_aur.x86_64/fonts.x86_64 b/modules/share-extra/packages_aur.x86_64/fonts.x86_64
diff --git a/modules/share/packages.i486/hardware.i486 b/modules/share/packages.i486/hardware.i486
@@ -13,8 +13,6 @@
 
 #-- drivers --#
 b43-fwcutter
-ipw2100-fw
-ipw2200-fw
 sof-firmware
 
 #-- interface support --#
diff --git a/modules/share/packages.i686/hardware.i686 b/modules/share/packages.i686/hardware.i686
@@ -13,8 +13,6 @@
 
 #-- drivers --#
 b43-fwcutter
-ipw2100-fw
-ipw2200-fw
 sof-firmware
 
 #-- interface support --#
diff --git a/modules/share/packages.pen4/hardware.pen4 b/modules/share/packages.pen4/hardware.pen4
@@ -13,8 +13,6 @@
 
 #-- drivers --#
 b43-fwcutter
-ipw2100-fw
-ipw2200-fw
 sof-firmware
 
 #-- interface support --#
diff --git a/modules/share/packages.x86_64/hardware.x86_64 b/modules/share/packages.x86_64/hardware.x86_64
@@ -13,8 +13,6 @@
 
 #-- drivers --#
 b43-fwcutter
-ipw2100-fw
-ipw2200-fw
 sof-firmware
 
 #-- interface support --#
diff --git a/modules/zsh-powerline/packages.i686/fonts.i686 b/modules/zsh-powerline/packages.i686/fonts.i686
@@ -9,4 +9,4 @@
 #
 # Fonts
 
-nerd-fonts-source-code-pro
+ttf-sourcecodepro-nerd
diff --git a/modules/zsh-powerline/packages.pen4/fonts.pen4 b/modules/zsh-powerline/packages.pen4/fonts.pen4
@@ -9,4 +9,4 @@
 #
 # Fonts
 
-nerd-fonts-source-code-pro
+ttf-sourcecodepro-nerd
diff --git a/modules/zsh-powerline/packages.x86_64/fonts.x86_64 b/modules/zsh-powerline/packages.x86_64/fonts.x86_64
@@ -9,4 +9,4 @@
 #
 # Fonts
 
-nerd-fonts-source-code-pro
+ttf-sourcecodepro-nerd

Original file line number	Diff line number	Diff line change
`@@ -125,7 +125,7 @@ FILES=()`
`125`	`125`	`#`
`126`	`126`	`## NOTE: If you have /usr on a separate partition, you MUST include the`
`127`	`127`	`# usr, fsck and shutdown hooks.`
`128`		`-HOOKS=(base udev plymouth memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)`
	`128`	`+HOOKS=(base udev plymouth memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)`
`129`	`129`
`130`	`130`	`# COMPRESSION`
`131`	`131`	`# Use this to compress the initramfs image. By default, zstd compression`
Original file line number	Diff line number	Diff line change
`@@ -58,7 +58,7 @@ FILES=()`
`58`	`58`	`#`
`59`	`59`	`## NOTE: If you have /usr on a separate partition, you MUST include the`
`60`	`60`	`# usr, fsck and shutdown hooks.`
`61`		`-HOOKS=(base udev memdisk archiso_shutdown archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)`
	`61`	`+HOOKS=(base udev memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs archiso_kms block filesystems keyboard)`
`62`	`62`
`63`	`63`	`# COMPRESSION`
`64`	`64`	`# Use this to compress the initramfs image. By default, zstd compression`