Merge branch 'dev' into dev-stable

Hayao0819 · Hayao0819 · commit eabe38fe2445 · 2020-12-26T00:32:08.000+09:00
diff --git a/build.sh b/build.sh
@@ -669,36 +669,6 @@ make_packages() {
     ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "${_pkglist[*]}" install
 }
 
-# Additional packages (airootfs)
-make_packages_file() {
-    set +e
-    #local _loadfilelist _pkg _file _excludefile _excludelist _pkglist
-
-    #-- Detect package list to load --#
-    # Add the files for each channel to the list of files to read.
-    #_loadfilelist=(
-    #    $(ls ${channel_dir}/packages.${arch}/*.${arch} 2> /dev/null)
-    #    ${channel_dir}/packages.${arch}/lang/${locale_name}.${arch}
-    #    $(ls "${script_path}"/channels/share/packages.${arch}/*.${arch} 2> /dev/null)
-    #    "${script_path}"/channels/share/packages.${arch}/lang/${locale_name}.${arch}
-    #)
-
-    #ls "${channel_dir}/package_files.${arch}/*.pkg.*" > /dev/null 2>&1
-    # Install packages on airootfs
-    #if [ $? -ne 0 ]; then
-    #    :
-    #else
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "${channel_dir}/package_files.${arch}/*.pkg.*" install_file
-    #fi
-    #ls "${share_dir}/package_files.${arch}/*.pkg.*" > /dev/null 2>&1
-    #if [ $? -ne 0 ]; then
-    #    :
-    #else
-        ${mkalteriso} ${mkalteriso_option} -w "${work_dir}/${arch}" -C "${work_dir}/pacman-${arch}.conf" -D "${install_dir}" -p "${share_dir}/package_files.${arch}/*.pkg.*" install_file
-    #fi
-    set -e
-}
-
 make_packages_aur() {
     local _pkg pkglist_aur=($("${script_path}/tools/pkglist.sh" --aur -a "${arch}" -k "${kernel}" -c "${channel_dir}" -l "${locale_name}" $(if [[ "${boot_splash}" = true ]]; then echo -n "-b"; fi) ))
 
@@ -1374,7 +1344,6 @@ show_settings
 run_once make_pacman_conf
 run_once make_basefs
 run_once make_packages
-#run_once make_packages_file
 [[ "${noaur}" = false ]] && run_once make_packages_aur
 run_once make_customize_airootfs
 run_once make_setup_mkinitcpio
diff --git a/channels/basic/airootfs.any/etc/pacman.conf b/channels/basic/airootfs.any/etc/pacman.conf
@@ -113,6 +113,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/basic/airootfs.i686/etc/pacman.conf b/channels/basic/airootfs.i686/etc/pacman.conf
@@ -104,6 +104,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/basic/airootfs.x86_64/etc/pacman.conf b/channels/basic/airootfs.x86_64/etc/pacman.conf
@@ -116,6 +116,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/cinnamon/airootfs.i686/etc/pacman.conf b/channels/cinnamon/airootfs.i686/etc/pacman.conf
@@ -128,6 +128,7 @@ Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/cinnamon/airootfs.x86_64/etc/pacman.conf b/channels/cinnamon/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/gnome-mac/airootfs.any/etc/pacman.conf b/channels/gnome-mac/airootfs.any/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/gnome-mac/airootfs.x86_64/etc/pacman.conf b/channels/gnome-mac/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/gnome-mac/packages_aur.x86_64/gnome-extentions.x86_64 b/channels/gnome-mac/packages_aur.x86_64/gnome-extentions.x86_64
@@ -14,5 +14,5 @@ gnome-shell-extension-clipboard-indicator
 gnome-shell-extension-coverflow-alt-tab
 gnome-shell-extension-dash-to-dock
 gnome-shell-extension-desktop-icons-ng
-gnome-shell-extension-extensions-git
+gnome-shell-extension-extensions
 gnome-shell-extension-topicons-redux
diff --git a/channels/gnome/airootfs.any/etc/pacman.conf b/channels/gnome/airootfs.any/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/gnome/airootfs.x86_64/etc/pacman.conf b/channels/gnome/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/gnome/packages.x86_64/gnome.x86_64 b/channels/gnome/packages.x86_64/gnome.x86_64
@@ -41,8 +41,6 @@ gnome-tweaks
 
 #-- extentions --#
 chrome-gnome-shell
-gnome-shell-extension-extensions-git
-gnome-shell-extension-topicons-redux
 
 
 #-- Display manager --#
diff --git a/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64 b/channels/gnome/packages_aur.x86_64/gnome-extensions.x86_64
@@ -10,7 +10,9 @@
 # Gnome extensions
 
 gnome-shell-extension-arc-menu
-gnome-shell-extension-dash-to-panel
-gnome-shell-extension-desktop-icons-ng
 gnome-shell-extension-clipboard-indicator
 gnome-shell-extension-coverflow-alt-tab
+gnome-shell-extension-dash-to-panel
+gnome-shell-extension-desktop-icons-ng
+gnome-shell-extension-extensions
+gnome-shell-extension-topicons-redux
diff --git a/channels/lxde-m/airootfs.x86_64/etc/pacman.conf b/channels/lxde-m/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/lxde-m/pacman-x86_64.conf b/channels/lxde-m/pacman-x86_64.conf
@@ -82,28 +82,25 @@ LocalFileSigLevel = Optional
 # after the header, and they will be used before the default mirrors.
 
 [alter-stable]
-Server = https://xn--d-8o2b.com/repo/$repo/$arch
 Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
 Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
-#Server = https://h.0u0.biz/repo/$repo/$arch
-#Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/a/al/alterlinux/repo/$repo/$arch
+Server = https://repo.dyama.net/$repo/$arch
+#Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 [dvzrv]
 Server = https://pkgbuild.com/~dvzrv/repo/$arch
 
 [alter-kernel]
-Server = https://xn--d-8o2b.com/repo/$repo/$arch
 Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
 Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
-#Server = https://h.0u0.biz/repo/$repo/$arch
-#Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/a/al/alterlinux/repo/$repo/$arch
+Server = https://repo.dyama.net/$repo/$arch
+#Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 #[alter-testing]
+Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
+Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
+Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
-#Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
-#Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
-#Server = https://h.0u0.biz/repo/$repo/$arch
-#Server = https://mirrors.tuna.tsinghua.edu.cn/osdn/storage/g/a/al/alterlinux/repo/$repo/$arch
 
 #[testing]
 #Server = http://ftp.jaist.ac.jp/pub/Linux/ArchLinux/$repo/os/$arch
@@ -123,8 +120,8 @@ Server = http://ftp.riken.jp/Linux/manjaro/stable/$repo/$arch
 Server = http://ftp.tsukuba.wide.ad.jp/Linux/manjaro/stable/$repo/$arch
 
 #[community-testing]
-Server = http://ftp.riken.jp/Linux/manjaro/stable/$repo/$arch
-Server = http://ftp.tsukuba.wide.ad.jp/Linux/manjaro/stable/$repo/$arch
+#Server = http://ftp.riken.jp/Linux/manjaro/stable/$repo/$arch
+#Server = http://ftp.tsukuba.wide.ad.jp/Linux/manjaro/stable/$repo/$arch
 
 [community]
 Server = http://ftp.riken.jp/Linux/manjaro/stable/$repo/$arch
@@ -144,10 +141,8 @@ Server = http://ftp.tsukuba.wide.ad.jp/Linux/manjaro/stable/$repo/$arch
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
-#Server = https://ja.osdn.net/projects/serene/storage/repo/$repo/$arch
-#Server = https://ja.osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
-#Server = https://h.0u0.biz/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
diff --git a/channels/lxde/airootfs.i686/etc/pacman.conf b/channels/lxde/airootfs.i686/etc/pacman.conf
@@ -128,6 +128,7 @@ Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/lxde/airootfs.x86_64/etc/pacman.conf b/channels/lxde/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/plasma/airootfs.i686/etc/pacman.conf b/channels/plasma/airootfs.i686/etc/pacman.conf
@@ -128,6 +128,7 @@ Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/plasma/airootfs.x86_64/etc/pacman.conf b/channels/plasma/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/releng/pacman-i486.conf b/channels/releng/pacman-i486.conf
@@ -70,10 +70,10 @@ LocalFileSigLevel = Optional
 # after the header, and they will be used before the default mirrors.
 
 [alter-stable]
-Server = https://xn--d-8o2b.com/repo/$repo/$arch
+Server = https://repo.dyama.net/$repo/$arch
 Server = https://osdn.net/projects/alterlinux/storage/repo/$repo/$arch
 Server = https://osdn.net/projects/serene/storage/repo/$repo/$arch
-#Server = https://h.0u0.biz/repo/$repo/$arch
+#Server = https://repo.dyama.net/$repo/$arch
 
 #[testing]
 #Server = https://32.arlm.tyzoid.com/$arch/$repo/
diff --git a/channels/releng/pacman-x86_64.conf b/channels/releng/pacman-x86_64.conf
@@ -138,10 +138,8 @@ Server = https://jpn.mirror.pkgbuild.com/$repo/os/$arch
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
-#Server = https://ja.osdn.net/projects/serene/storage/repo/$repo/$arch
-#Server = https://ja.osdn.jp/storage/g/a/al/alterlinux/repo/$repo/$arch
-#Server = https://h.0u0.biz/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
 # tips on creating your own repositories.
diff --git a/channels/serene/airootfs.any/etc/pacman.conf b/channels/serene/airootfs.any/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/serene/airootfs.i686/etc/pacman.conf b/channels/serene/airootfs.i686/etc/pacman.conf
@@ -128,6 +128,7 @@ Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/serene/airootfs.i686/etc/skel/.config/xfce4/panel/docklike-2.rc b/channels/serene/airootfs.i686/etc/skel/.config/xfce4/panel/docklike-2.rc
@@ -1,2 +1,2 @@
 [user]
-pinned=/usr/share/applications/firefox.desktop;/usr/share/applications/thunar.desktop;/usr/share/applications/thunderbird.desktop;/usr/share/applications/vlc.desktop;/usr/share/applications/medit.desktop;/usr/share/applications/xfce4-screenshooter.desktop;/usr/share/applications/xfce4-terminal.desktop;/usr/share/applications/pamac-manager.desktop;/usr/share/applications/xfce-settings-manager.desktop;
+pinned=/usr/share/applications/firefox.desktop;/usr/share/applications/thunar.desktop;/usr/share/applications/thunderbird.desktop;/usr/share/applications/vlc.desktop;/usr/share/applications/medit.desktop;/usr/share/applications/xfce4-screenshooter.desktop;/usr/share/applications/xfce4-terminal.desktop;/usr/share/applications/org.manjaro.pamac.manager.desktop;/usr/share/applications/xfce-settings-manager.desktop;
diff --git a/channels/serene/airootfs.x86_64/etc/pacman.conf b/channels/serene/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/serene/packages.i686/xfce.i686 b/channels/serene/packages.i686/xfce.i686
@@ -38,8 +38,6 @@ alterlinux-xfce-conf
 #-- xfce4 plugins --#
 thunar-archive-plugin
 thunar-media-tags-plugin
-# thunar-vcs-plugin
 xfce4-clipman-plugin
-xfce4-docklike-plugin-git
 xfce4-pulseaudio-plugin
 xfce4-whiskermenu-plugin
diff --git a/channels/serene/packages.x86_64/xfce.x86_64 b/channels/serene/packages.x86_64/xfce.x86_64
@@ -38,8 +38,6 @@ alterlinux-xfce-conf
 #-- xfce4 plugins --#
 thunar-archive-plugin
 thunar-media-tags-plugin
-# thunar-vcs-plugin
 xfce4-clipman-plugin
-xfce4-docklike-plugin-git
 xfce4-pulseaudio-plugin
 xfce4-whiskermenu-plugin
diff --git a/channels/serene/packages_aur.i686/xfce.i686 b/channels/serene/packages_aur.i686/xfce.i686
@@ -10,4 +10,5 @@
 # Xfce4 Desktop Environment
 
 #-- plugin --#
-xfce4-calculator-plugin
+#xfce4-calculator-plugin
+xfce4-docklike-plugin-git
diff --git a/channels/serene/packages_aur.x86_64/xfce.x86_64 b/channels/serene/packages_aur.x86_64/xfce.x86_64
@@ -10,4 +10,5 @@
 # Xfce4 Desktop Environment
 
 #-- plugin --#
-xfce4-calculator-plugin
+#xfce4-calculator-plugin
+xfce4-docklike-plugin-git
diff --git a/channels/xfce-pro/airootfs.any/etc/pacman.conf b/channels/xfce-pro/airootfs.any/etc/pacman.conf
@@ -116,6 +116,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/xfce-pro/airootfs.any/etc/skel/.config/xfce4/panel/docklike-2.rc b/channels/xfce-pro/airootfs.any/etc/skel/.config/xfce4/panel/docklike-2.rc
@@ -1,2 +1,2 @@
 [user]
-pinned=/usr/share/applications/chromium.desktop;/usr/share/applications/thunar.desktop;/usr/share/applications/thunderbird.desktop;/usr/share/applications/vlc.desktop;/usr/share/applications/medit.desktop;/usr/share/applications/xfce4-screenshooter.desktop;/usr/share/applications/VSCodium.desktop;/usr/share/applications/xfce4-terminal.desktop;/usr/share/applications/pamac-manager.desktop;/usr/share/applications/xfce-settings-manager.desktop;
+pinned=/usr/share/applications/chromium.desktop;/usr/share/applications/thunar.desktop;/usr/share/applications/thunderbird.desktop;/usr/share/applications/vlc.desktop;/usr/share/applications/medit.desktop;/usr/share/applications/xfce4-screenshooter.desktop;/usr/share/applications/VSCodium.desktop;/usr/share/applications/xfce4-terminal.desktop;/usr/share/applications/org.manjaro.pamac.manager.desktop;/usr/share/applications/xfce-settings-manager.desktop;
diff --git a/channels/xfce-pro/airootfs.x86_64/etc/pacman.conf b/channels/xfce-pro/airootfs.x86_64/etc/pacman.conf
@@ -116,6 +116,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/xfce-pro/packages.x86_64/fonts.x86_64 b/channels/xfce-pro/packages.x86_64/fonts.x86_64
@@ -12,7 +12,6 @@
 
 # font
 adobe-source-code-pro-fonts
-nerd-fonts-source-code-pro
 noto-fonts
 noto-fonts-cjk
 noto-fonts-emoji
diff --git a/channels/xfce-pro/packages.x86_64/xfce.x86_64 b/channels/xfce-pro/packages.x86_64/xfce.x86_64
@@ -44,8 +44,6 @@ xfdesktop
 #-- xfce4 plugins --#
 thunar-archive-plugin
 thunar-media-tags-plugin
-# thunar-vcs-plugin
 xfce4-clipman-plugin
-xfce4-docklike-plugin-git
 xfce4-pulseaudio-plugin
 xfce4-whiskermenu-plugin
diff --git a/channels/xfce-pro/packages_aur.x86_64/xfce.x86_64 b/channels/xfce-pro/packages_aur.x86_64/xfce.x86_64
@@ -13,4 +13,5 @@
 compiz
 
 #-- plugin --#
-xfce4-calculator-plugin
+#xfce4-calculator-plugin
+xfce4-docklike-plugin-git
diff --git a/channels/xfce/airootfs.i686/etc/pacman.conf b/channels/xfce/airootfs.i686/etc/pacman.conf
@@ -128,6 +128,7 @@ Server = https://mirror.math.princeton.edu/pub/archlinux32/$arch/$repo/
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/xfce/airootfs.x86_64/etc/pacman.conf b/channels/xfce/airootfs.x86_64/etc/pacman.conf
@@ -115,6 +115,7 @@ Include = /etc/pacman.d/mirrorlist
 # This is Yamada Hayao's personal repository.
 # It was used early but is now disabled.
 #[hayao]
+#Server = https://repo.dyama.net/$repo/$arch
 #Server = https://xn--d-8o2b.com/repo/$repo/$arch
 
 # An example of a custom package repository.  See the pacman manpage for
diff --git a/channels/xfce/packages.i686/xfce.i686 b/channels/xfce/packages.i686/xfce.i686
@@ -38,8 +38,6 @@ alterlinux-xfce-conf
 #-- xfce4 plugins --#
 thunar-archive-plugin
 thunar-media-tags-plugin
-# thunar-vcs-plugin
 xfce4-clipman-plugin
-# xfce4-docklike-plugin-git
 xfce4-pulseaudio-plugin
 xfce4-whiskermenu-plugin
diff --git a/channels/xfce/packages_aur.i686/xfce.i686 b/channels/xfce/packages_aur.i686/xfce.i686
diff --git a/channels/xfce/packages_aur.x86_64/xfce.x86_64 b/channels/xfce/packages_aur.x86_64/xfce.x86_64
diff --git a/docs/README.md b/docs/README.md
diff --git a/docs/README_jp.md b/docs/README_jp.md
diff --git a/system/aur.sh b/system/aur.sh
diff --git a/system/pacman-i486.conf b/system/pacman-i486.conf
diff --git a/system/pacman-i686.conf b/system/pacman-i686.conf
diff --git a/system/pacman-x86_64.conf b/system/pacman-x86_64.conf
diff --git a/tools/clean.sh b/tools/clean.sh
