remove xf86-video-vmware

.gitignore

@@ -0,0 +1,3 @@
+*.iso
+catos-iso/airootfs/var/**
+catos-iso-for-nvidia/airootfs/var/**

catos-iso-for-nvidia/packages.x86_64

@@ -180,7 +180,7 @@ fwupd
 gtkmm3
 open-vm-tools
 xf86-input-vmmouse
-xf86-video-vmware
+#xf86-video-vmware
 #######################################################
 #nvidia
 #docker
@@ -228,3 +228,10 @@ corekeyboard
 system-config-printer
 catos-fix-storage
 tela-icon-theme-git
+gparted
+
+xf86-video-amdgpu
+vulkan-radeon
+lib32-vulkan-radeon
+vulkan-intel
+lib32-vulkan-intel

catos-iso/airootfs/etc/environment

@@ -0,0 +1,4 @@
+GTK_IM_MODULE=fcitx
+QT_IM_MODULE=fcitx
+XMODIFIERS=@im=fcitx
+SDL_IM_MODULE=fcitx

catos-iso/airootfs/etc/hostname

@@ -1 +1 @@
-archiso
+CatOS

catos-iso/airootfs/etc/localtime

@@ -1 +1 @@
-/usr/share/zoneinfo/UTC
+/usr/share/zoneinfo/Asia/Shanghai

catos-iso/airootfs/etc/mkinitcpio.conf

@@ -49,7 +49,7 @@ FILES=()
 #
 ##   NOTE: If you have /usr on a separate partition, you MUST include the
 #    usr, fsck and shutdown hooks.
-HOOKS=(base udev modconf kms memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
+HOOKS=(base udev microcode modconf memdisk archiso archiso_loop_mnt archiso_pxe_common archiso_pxe_nbd archiso_pxe_http archiso_pxe_nfs block filesystems keyboard)
 
 # COMPRESSION
 # Use this to compress the initramfs image. By default, gzip compression

catos-iso/airootfs/etc/mkinitcpio.conf.d/10-nvidia.conf

@@ -0,0 +1 @@
+MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm)

catos-iso/airootfs/etc/pacman.conf

@@ -0,0 +1,118 @@
+#
+# /etc/pacman.conf
+#
+# See the pacman.conf(5) manpage for option and repository directives
+
+#
+# GENERAL OPTIONS
+#
+[options]
+# The following paths are commented out with their default values listed.
+# If you wish to use different paths, uncomment and update the paths.
+#RootDir     = /
+#DBPath      = /var/lib/pacman/
+#CacheDir    = /var/cache/pacman/pkg/
+#LogFile     = /var/log/pacman.log
+#GPGDir      = /etc/pacman.d/gnupg/
+#HookDir     = /etc/pacman.d/hooks/
+HoldPkg     = pacman glibc
+#XferCommand = /usr/bin/curl -L -C - -f -o %o %u
+#XferCommand = /usr/bin/wget --passive-ftp -c -O %o %u
+#CleanMethod = KeepInstalled
+#UseDelta    = 0.7
+Architecture = auto
+
+# Pacman won't upgrade packages listed in IgnorePkg and members of IgnoreGroup
+#IgnorePkg   =
+#IgnoreGroup =
+
+#NoUpgrade   =
+#NoExtract   =
+
+# Misc options
+#UseSyslog
+Color
+ILoveCandy
+#NoProgressBar
+#CheckSpace
+VerbosePkgLists
+DisableDownloadTimeout
+ParallelDownloads = 10
+DownloadUser = alpm
+#DisableSandbox
+
+# By default, pacman accepts packages signed by keys that its local keyring
+# trusts (see pacman-key and its man page), as well as unsigned packages.
+SigLevel    = Required DatabaseOptional
+LocalFileSigLevel = Optional
+#RemoteFileSigLevel = Required
+
+# NOTE: You must run `pacman-key --init` before first using pacman; the local
+# keyring can then be populated with the keys of all official Arch Linux
+# packagers with `pacman-key --populate archlinux`.
+
+#
+# REPOSITORIES
+#   - can be defined here or included from another file
+#   - pacman will search repositories in the order defined here
+#   - local/custom mirrors can be added here or in separate files
+#   - repositories listed first will take precedence when packages
+#     have identical names, regardless of version number
+#   - URLs will have $repo replaced by the name of the current repo
+#   - URLs will have $arch replaced by the name of the architecture
+#
+# Repository entries are of the format:
+#       [repo-name]
+#       Server = ServerName
+#       Include = IncludePath
+#
+# The header [repo-name] is crucial - it must be present and
+# uncommented to enable the repo.
+#
+
+# The testing repositories are disabled by default. To enable, uncomment the
+# repo name header and Include lines. You can add preferred servers immediately
+# after the header, and they will be used before the default mirrors.
+
+#[core-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[core]
+Include = /etc/pacman.d/mirrorlist
+
+#[extra-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[extra]
+Include = /etc/pacman.d/mirrorlist
+
+# If you want to run 32 bit applications on your x86_64 system,
+# enable the multilib repositories as required here.
+
+#[multilib-testing]
+#Include = /etc/pacman.d/mirrorlist
+
+[multilib]
+Include = /etc/pacman.d/mirrorlist
+
+# An example of a custom package repository.  See the pacman manpage for
+# tips on creating your own repositories.
+#[custom]
+#SigLevel = Optional TrustAll
+#Server = file:///home/custompkgs
+
+[archlinuxcn]
+SigLevel = Optional TrustAll
+Server = https://mirrors.ustc.edu.cn/archlinuxcn/$arch
+Server = https://mirrors.tuna.tsinghua.edu.cn/archlinuxcn/$arch
+Server = https://mirror.nju.edu.cn/archlinuxcn/$arch
+
+[arch4edu]
+SigLevel = Optional TrustAll
+Server = https://mirrors.cernet.edu.cn/arch4edu/$arch
+Server = https://mirrors.tuna.tsinghua.edu.cn/arch4edu/$arch
+Server = https://mirror.nju.edu.cn/arch4edu/$arch
+
+[catos-extra]
+SigLevel = Optional TrustAll
+Server = file:///var/catos-extra/

catos-iso/airootfs/etc/pacman.d/hooks/40-customize.hook

@@ -0,0 +1,12 @@
+# remove from airootfs!
+[Trigger]
+Operation = Install
+Type = Package
+Target = catos-calamares
+
+[Action]
+Description = customize_airootfs
+When = PostTransaction
+Depends = catos-calamares
+Depends = bash
+Exec = /bin/bash /etc/pacman.d/scripts/customize_airootfs.sh

catos-iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook

@@ -6,8 +6,9 @@ Type = Package
 Target = pacman-mirrorlist
 
 [Action]
-Description = Uncommenting all mirrors in /etc/pacman.d/mirrorlist...
+Description = Uncommenting HTTPS mirrors in /etc/pacman.d/mirrorlist...
 When = PostTransaction
 Depends = pacman-mirrorlist
 Depends = sed
-Exec = /usr/bin/sed -i "s/#Server/Server/g" /etc/pacman.d/mirrorlist
+Exec = /usr/bin/sed -E -i 's/#(Server = https:)/\1/g' /etc/pacman.d/mirrorlist
+

catos-iso/airootfs/etc/pacman.d/mirrorlist

@@ -0,0 +1,8 @@
+Server = https://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.cernet.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.aliyun.com/archlinux/$repo/os/$arch
+Server = https://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.xjtu.edu.cn/archlinux/$repo/os/$arch
+Server = https://mirrors.shanghaitech.edu.cn/archlinux/$repo/os/$arch

catos-iso/airootfs/etc/pacman.d/scripts/customize_airootfs.sh

@@ -0,0 +1,24 @@
+#!/usr/bin/env bash
+
+## Script to perform several important tasks before `mkarchcraftiso` create filesystem image.
+
+set -e -u
+
+## 增加catos源
+# echo '[catos]' >> /etc/pacman.conf
+# echo 'SigLevel = Never' >> /etc/pacman.conf
+# echo 'Server = https://pkgs.catos.info/$arch' >> /etc/pacman.conf
+
+echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen
+echo "zh_CN.UTF-8 UTF-8" >> /etc/locale.gen
+locale-gen
+
+##grub
+#echo 'GRUB_THEME="/usr/share/grub/themes/vimix-color-1080p/theme.txt"' >> /etc/default/grub
+echo 'GRUB_THEME="/usr/share/grub/themes/catos-grub-theme-dark-1080p/theme.txt"' >> /etc/default/grub
+
+echo 'GRUB_DISABLE_OS_PROBER=false' >> /etc/default/grub
+
+
+
+