diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..b1c9328 --- /dev/null +++ b/.gitignore @@ -0,0 +1,3 @@ +*.iso +catos-iso/airootfs/var/** +catos-iso-for-nvidia/airootfs/var/** diff --git a/catos-iso-for-nvidia/packages.x86_64 b/catos-iso-for-nvidia/packages.x86_64 index 9f6459d..0d1f022 100644 --- a/catos-iso-for-nvidia/packages.x86_64 +++ b/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 \ No newline at end of file diff --git a/catos-iso/airootfs/etc/environment b/catos-iso/airootfs/etc/environment new file mode 100644 index 0000000..c9eb0f6 --- /dev/null +++ b/catos-iso/airootfs/etc/environment @@ -0,0 +1,4 @@ +GTK_IM_MODULE=fcitx +QT_IM_MODULE=fcitx +XMODIFIERS=@im=fcitx +SDL_IM_MODULE=fcitx \ No newline at end of file diff --git a/catos-iso/airootfs/etc/hostname b/catos-iso/airootfs/etc/hostname index 2dbe21e..0aa3790 100644 --- a/catos-iso/airootfs/etc/hostname +++ b/catos-iso/airootfs/etc/hostname @@ -1 +1 @@ -archiso +CatOS diff --git a/catos-iso/airootfs/etc/localtime b/catos-iso/airootfs/etc/localtime index 0e35b57..da51630 120000 --- a/catos-iso/airootfs/etc/localtime +++ b/catos-iso/airootfs/etc/localtime @@ -1 +1 @@ -/usr/share/zoneinfo/UTC \ No newline at end of file +/usr/share/zoneinfo/Asia/Shanghai \ No newline at end of file diff --git a/catos-iso/airootfs/etc/mkinitcpio.conf b/catos-iso/airootfs/etc/mkinitcpio.conf index 8e23672..50af2ae 100644 --- a/catos-iso/airootfs/etc/mkinitcpio.conf +++ b/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 diff --git a/catos-iso/airootfs/etc/mkinitcpio.conf.d/10-nvidia.conf b/catos-iso/airootfs/etc/mkinitcpio.conf.d/10-nvidia.conf new file mode 100644 index 0000000..f5b7164 --- /dev/null +++ b/catos-iso/airootfs/etc/mkinitcpio.conf.d/10-nvidia.conf @@ -0,0 +1 @@ +MODULES+=(nvidia nvidia_modeset nvidia_uvm nvidia_drm) \ No newline at end of file diff --git a/catos-iso/airootfs/etc/motd b/catos-iso/airootfs/etc/motd deleted file mode 100644 index 4d9eda1..0000000 --- a/catos-iso/airootfs/etc/motd +++ /dev/null @@ -1,11 +0,0 @@ -To install Arch Linux follow the installation guide: -https://wiki.archlinux.org/title/Installation_guide - -For Wi-Fi, authenticate to the wireless network using the iwctl utility. -For mobile broadband (WWAN) modems, connect with the mmcli utility. -Ethernet, WLAN and WWAN interfaces using DHCP should work automatically. - -After connecting to the internet, the installation guide can be accessed -via the convenience script Installation_guide. - -                                           diff --git a/catos-iso/airootfs/etc/pacman.conf b/catos-iso/airootfs/etc/pacman.conf new file mode 100644 index 0000000..d86d0d1 --- /dev/null +++ b/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/ \ No newline at end of file diff --git a/catos-iso/airootfs/etc/pacman.d/hooks/40-customize.hook b/catos-iso/airootfs/etc/pacman.d/hooks/40-customize.hook new file mode 100644 index 0000000..7f54b49 --- /dev/null +++ b/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 diff --git a/catos-iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook b/catos-iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook index 342aa95..da2309f 100644 --- a/catos-iso/airootfs/etc/pacman.d/hooks/uncomment-mirrors.hook +++ b/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 + diff --git a/catos-iso/airootfs/etc/pacman.d/hooks/update-kde-logo.hook b/catos-iso/airootfs/etc/pacman.d/hooks/update-kde-logo.hook deleted file mode 100644 index 9be303c..0000000 --- a/catos-iso/airootfs/etc/pacman.d/hooks/update-kde-logo.hook +++ /dev/null @@ -1,12 +0,0 @@ -[Trigger] -Operation = Install -Operation = Upgrade -Type = Package -Target = plasma-desktop - -[Action] -Description = Update KDE Logo -When = PostTransaction -Depends = plasma-desktop -Depends = sed -Exec = /usr/bin/sed -i "s/start-here-kde-symbolic/catos/g" /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml diff --git a/catos-iso/airootfs/etc/pacman.d/mirrorlist b/catos-iso/airootfs/etc/pacman.d/mirrorlist new file mode 100644 index 0000000..f67b6cb --- /dev/null +++ b/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 diff --git a/catos-iso/airootfs/etc/pacman.d/scripts/customize_airootfs.sh b/catos-iso/airootfs/etc/pacman.d/scripts/customize_airootfs.sh new file mode 100755 index 0000000..c8a7daa --- /dev/null +++ b/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 + + + + diff --git a/catos-iso/airootfs/etc/skel/.config/baloofileinformationrc b/catos-iso/airootfs/etc/skel/.config/baloofileinformationrc deleted file mode 100644 index 6d1c1d4..0000000 --- a/catos-iso/airootfs/etc/skel/.config/baloofileinformationrc +++ /dev/null @@ -1,34 +0,0 @@ -[Misc] -version=13 - -[Show] -channels=false -comment=false -contentCreated=false -contentSize=false -created=false -depends=false -embeddedRating=false -fileName=false -fileSize=false -height=false -kfileitem#group=false -kfileitem#owner=false -kfileitem#permissions=false -lastModified=false -lyrics=false -mimeType=false -photoGpsLatitude=false -photoGpsLongitude=false -photoMeteringMode=false -photoPixelXDimension=false -photoPixelYDimension=false -photoSaturation=false -photoSharpness=false -photoWhiteBalance=false -replayGainAlbumGain=false -replayGainAlbumPeak=false -replayGainTrackGain=false -replayGainTrackPeak=false -url=false -width=false diff --git a/catos-iso/airootfs/etc/skel/.config/baloofilerc b/catos-iso/airootfs/etc/skel/.config/baloofilerc deleted file mode 100644 index efa6de4..0000000 --- a/catos-iso/airootfs/etc/skel/.config/baloofilerc +++ /dev/null @@ -1,7 +0,0 @@ -[Basic Settings] -Indexing-Enabled=false - -[General] -dbVersion=2 -exclude filters=*~,*.part,*.o,*.la,*.lo,*.loT,*.moc,moc_*.cpp,qrc_*.cpp,ui_*.h,cmake_install.cmake,CMakeCache.txt,CTestTestfile.cmake,libtool,config.status,confdefs.h,autom4te,conftest,confstat,Makefile.am,*.gcode,.ninja_deps,.ninja_log,build.ninja,*.csproj,*.m4,*.rej,*.gmo,*.pc,*.omf,*.aux,*.tmp,*.po,*.vm*,*.nvram,*.rcore,*.swp,*.swap,lzo,litmain.sh,*.orig,.histfile.*,.xsession-errors*,*.map,*.so,*.a,*.db,*.qrc,*.ini,*.init,*.img,*.vdi,*.vbox*,vbox.log,*.qcow2,*.vmdk,*.vhd,*.vhdx,*.sql,*.sql.gz,*.ytdl,*.class,*.pyc,*.pyo,*.elc,*.qmlc,*.jsc,*.fastq,*.fq,*.gb,*.fasta,*.fna,*.gbff,*.faa,po,CVS,.svn,.git,_darcs,.bzr,.hg,CMakeFiles,CMakeTmp,CMakeTmpQmake,.moc,.obj,.pch,.uic,.npm,.yarn,.yarn-cache,__pycache__,node_modules,node_packages,nbproject,.venv,venv,core-dumps,lost+found -exclude filters version=8 diff --git a/catos-iso/airootfs/etc/skel/.config/fcitx5/conf/classicui.conf b/catos-iso/airootfs/etc/skel/.config/fcitx5/conf/classicui.conf deleted file mode 100644 index 52219fe..0000000 --- a/catos-iso/airootfs/etc/skel/.config/fcitx5/conf/classicui.conf +++ /dev/null @@ -1,35 +0,0 @@ -# 垂直候选列表 -Vertical Candidate List=False -# 使用鼠标滚轮翻页 -WheelForPaging=True -# 字体 -Font="Sans 10" -# 菜单字体 -MenuFont="Sans 10" -# 托盘字体 -TrayFont="Sans Bold 10" -# 托盘标签轮廓颜色 -TrayOutlineColor=#000000 -# 托盘标签文本颜色 -TrayTextColor=#ffffff -# 优先使用文字图标 -PreferTextIcon=False -# 在图标中显示布局名称 -ShowLayoutNameInIcon=True -# 使用输入法的语言来显示文字 -UseInputMethodLanguageToDisplayText=True -# 主题 -Theme=群青 -# 深色主题 -DarkTheme=群青 -# 跟随系统浅色/深色设置 -UseDarkTheme=False -# 当被主题和桌面支持时使用系统的重点色 -UseAccentColor=True -# 在 X11 上针对不同屏幕使用单独的 DPI -PerScreenDPI=False -# 固定 Wayland 的字体 DPI -ForceWaylandDPI=0 -# 在 Wayland 下启用分数缩放 -EnableFractionalScale=True - diff --git a/catos-iso/airootfs/etc/skel/.config/fcitx5/config b/catos-iso/airootfs/etc/skel/.config/fcitx5/config deleted file mode 100644 index 620c871..0000000 --- a/catos-iso/airootfs/etc/skel/.config/fcitx5/config +++ /dev/null @@ -1,79 +0,0 @@ -[Hotkey] -# 反复按切换键时进行轮换 -EnumerateWithTriggerKeys=True -# 临时在当前和第一个输入法之间切换 -AltTriggerKeys= -# 轮换输入法时跳过第一个输入法 -EnumerateSkipFirst=False - -[Hotkey/TriggerKeys] -0=Shift+Shift_L - - -[Hotkey/EnumerateForwardKeys] -0=Control+space - -[Hotkey/EnumerateBackwardKeys] -0=Control+Shift+space - -[Hotkey/EnumerateGroupForwardKeys] -0=Super+space - -[Hotkey/EnumerateGroupBackwardKeys] -0=Shift+Super+space - -[Hotkey/ActivateKeys] -0=Hangul_Hanja - -[Hotkey/DeactivateKeys] -0=Hangul_Romaja - -[Hotkey/PrevPage] -0=Up - -[Hotkey/NextPage] -0=Down - -[Hotkey/PrevCandidate] -0=Shift+Tab - -[Hotkey/NextCandidate] -0=Tab - -[Hotkey/TogglePreedit] -0=Control+Alt+P - -[Behavior] -# 默认状态为激活 -ActiveByDefault=False -# 共享输入状态 -ShareInputState=No -# 在程序中显示预编辑文本 -PreeditEnabledByDefault=True -# 切换输入法时显示输入法信息 -ShowInputMethodInformation=True -# 在焦点更改时显示输入法信息 -showInputMethodInformationWhenFocusIn=False -# 显示紧凑的输入法信息 -CompactInputMethodInformation=True -# 显示第一个输入法的信息 -ShowFirstInputMethodInformation=True -# 默认页大小 -DefaultPageSize=5 -# 覆盖 Xkb 选项 -OverrideXkbOption=False -# 自定义 Xkb 选项 -CustomXkbOption= -# Force Enabled Addons -EnabledAddons= -# Force Disabled Addons -DisabledAddons= -# Preload input method to be used by default -PreloadInputMethod=True -# 允许在密码框中使用输入法 -AllowInputMethodForPassword=False -# 输入密码时显示预编辑文本 -ShowPreeditForPassword=False -# 保存用户数据的时间间隔（以分钟为单位） -AutoSavePeriod=30 - diff --git a/catos-iso/airootfs/etc/skel/.config/fish/fish_variables b/catos-iso/airootfs/etc/skel/.config/fish/fish_variables deleted file mode 100644 index 60df4ce..0000000 --- a/catos-iso/airootfs/etc/skel/.config/fish/fish_variables +++ /dev/null @@ -1,32 +0,0 @@ -# This file contains fish universal variable definitions. -# VERSION: 3.0 -SETUVAR __fish_initialized:3400 -SETUVAR fish_color_autosuggestion:555\x1ebrblack -SETUVAR fish_color_cancel:\x2dr -SETUVAR fish_color_command:blue -SETUVAR fish_color_comment:red -SETUVAR fish_color_cwd:blue -SETUVAR fish_color_cwd_root:red -SETUVAR fish_color_end:green -SETUVAR fish_color_error:brred -SETUVAR fish_color_escape:brcyan -SETUVAR fish_color_history_current:\x2d\x2dbold -SETUVAR fish_color_host:normal -SETUVAR fish_color_host_remote:yellow -SETUVAR fish_color_normal:normal -SETUVAR fish_color_operator:brcyan -SETUVAR fish_color_param:cyan -SETUVAR fish_color_quote:yellow -SETUVAR fish_color_redirection:cyan\x1e\x2d\x2dbold -SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack -SETUVAR fish_color_status:red -SETUVAR fish_color_user:blue -SETUVAR fish_color_valid_path:\x2d\x2dunderline -SETUVAR fish_greeting: -SETUVAR fish_key_bindings:fish_default_key_bindings -SETUVAR fish_pager_color_completion:normal -SETUVAR fish_pager_color_description:B3A06D\x1eyellow\x1e\x2di -SETUVAR fish_pager_color_prefix:normal\x1e\x2d\x2dbold\x1e\x2d\x2dunderline -SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan -SETUVAR fish_pager_color_selected_background:\x2dr diff --git a/catos-iso/airootfs/etc/skel/.config/konsolerc b/catos-iso/airootfs/etc/skel/.config/konsolerc deleted file mode 100644 index 1538a93..0000000 --- a/catos-iso/airootfs/etc/skel/.config/konsolerc +++ /dev/null @@ -1,30 +0,0 @@ -1280x720 screen: Height=613 -1280x720 screen: Width=853 -1280x720 screen: XPosition=265 -1280x720 screen: YPosition=57 -MenuBar=Disabled -State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAiAFEAdQBpAGMAawBDAG8AbQBtAGEAbgBkAHMARABvAGMAawAAAAAA/////wAAAXwBAAAD+wAAABwAUwBTAEgATQBhAG4AYQBnAGUAcgBEAG8AYwBrAAAAAAD/////AAABFQEAAAMAAANVAAACNwAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAAO3/////AAAAAAAAAAA= -eDP-1=eDP-1 - -[Desktop Entry] -DefaultProfile=CatOS.profile - -[General] -ConfigVersion=1 - -[MainWindow] -1280x720 screen: Height=613 -1280x720 screen: Width=853 -1280x720 screen: XPosition=213 -1280x720 screen: YPosition=49 -1536x864 screen: Height=524 -1536x864 screen: Width=911 -1536x864 screen: XPosition=350 -1536x864 screen: YPosition=160 -RestorePositionForNextInstance=false -State=AAAA/wAAAAD9AAAAAQAAAAAAAAAAAAAAAPwCAAAAAvsAAAAiAFEAdQBpAGMAawBDAG8AbQBtAGEAbgBkAHMARABvAGMAawAAAAAA/////wAAAXwBAAAD+wAAABwAUwBTAEgATQBhAG4AYQBnAGUAcgBEAG8AYwBrAAAAAAD/////AAABFQEAAAMAAANVAAACNwAAAAQAAAAEAAAACAAAAAj8AAAAAQAAAAIAAAACAAAAFgBtAGEAaQBuAFQAbwBvAGwAQgBhAHIBAAAAAP////8AAAAAAAAAAAAAABwAcwBlAHMAcwBpAG8AbgBUAG8AbwBsAGIAYQByAQAAASH/////AAAAAAAAAAA= -ToolBarsMovable=Disabled -eDP-1=eDP-1 - -[UiSettings] -ColorScheme= diff --git a/catos-iso/airootfs/etc/skel/.config/ktimezonedrc b/catos-iso/airootfs/etc/skel/.config/ktimezonedrc deleted file mode 100644 index e7daac7..0000000 --- a/catos-iso/airootfs/etc/skel/.config/ktimezonedrc +++ /dev/null @@ -1,4 +0,0 @@ -[TimeZones] -LocalZone=Asia/Shanghai -ZoneinfoDir=/usr/share/zoneinfo -Zonetab=/usr/share/zoneinfo/zone.tab diff --git a/catos-iso/airootfs/etc/skel/.config/kwalletrc b/catos-iso/airootfs/etc/skel/.config/kwalletrc deleted file mode 100644 index bc07dcc..0000000 --- a/catos-iso/airootfs/etc/skel/.config/kwalletrc +++ /dev/null @@ -1,15 +0,0 @@ -[Wallet] -Close When Idle=false -Close on Screensaver=false -Default Wallet=kdewallet -Enabled=false -First Use=false -Idle Timeout=10 -Launch Manager=false -Leave Manager Open=false -Leave Open=true -Prompt on Open=false -Use One Wallet=true - -[org.freedesktop.secrets] -apiEnabled=true diff --git a/catos-iso/airootfs/etc/skel/.config/kwinrc b/catos-iso/airootfs/etc/skel/.config/kwinrc deleted file mode 100644 index 67e5b44..0000000 --- a/catos-iso/airootfs/etc/skel/.config/kwinrc +++ /dev/null @@ -1,4 +0,0 @@ - -[org.kde.kdecoration2] -BorderSize=None -BorderSizeAuto=false diff --git a/catos-iso/airootfs/etc/skel/.config/neofetch/catos.txt b/catos-iso/airootfs/etc/skel/.config/neofetch/catos.txt deleted file mode 100644 index e082b78..0000000 --- a/catos-iso/airootfs/etc/skel/.config/neofetch/catos.txt +++ /dev/null @@ -1,23 +0,0 @@ - -${c1} cccccccccccccc - ',lccccccccccccccccc;' - ,ccccccccccccccccccccccccc; - ,cccccccccccccccccccccccccccccl' - .ccc${c2}lxkol${c1}cccccccccccccccccc${c2}lokxo${c1}ccc - ccccc${c2}dWWN0dl${c1}cccccccccccccc${c2}loONWWx${c1}cccc. - cccccc${c2}dWWWWN0ol${c1}ccccccccccc${c2}oONWWWWxl${c1}cccc. - ccccccc${c2}dWWWWWWN0kkkkkkkkkk0NWWWWWWxl${c1}ccccc. - ,ccccccc${c2}dWWWWWWWWWWWWWWWWWWWWWWWWWWxl${c1}cccccc - cccccccc${c2}dWWWWWWWWWWWWWWWWWWWWWWWWWWxl${c1}cccccc. - cccccccc${c2}dWWWWWWWWWWWWWWWWWWWWWWWWWWxl${c1}cccccc, - .cccccccc${c2}dWWWWW${c1}Kdllx${c2}XWWWWN${c1}kolo0${c2}NWWWWxl${c1}cccccc, - cccccccc${c2}dWWWWN${c1}xlcco0${c2}WWWW0${c1}occcx${c2}XWWWWx${c1}ccccccc' - :ccccccc${c2}oXWWWWN${c1}OkkK${c2}WWWWWWK${c1}kkO${c2}XWWWWXd${c1}ccccccc. - .ccccccc${c2}lkWWWWWWWWWWWWWWWWWWWWWWWWOl${c1}cccccc; - .ccccccc${c2}lOWWWWWWWWWWWWWWWWWWWWWW0o${c1}cccccc: - 'ccccccc${c2}lxXWWWWWWWWWWWWWWWWWWNkl${c1}cccccc: - ,cccccccc${c2}lkXWWWWWWWWWWWWWWXOo${c1}ccccccc:. - .;cccccccc${c2}lok0XNWWWWNX0kdl${c1}cccccccc' - ;ccccccccccllllllllcccccccccc. - ':cccccccccccccccccccccccc;. - .,;ccccccccccccccc:;. diff --git a/catos-iso/airootfs/etc/skel/.config/neofetch/config.conf b/catos-iso/airootfs/etc/skel/.config/neofetch/config.conf deleted file mode 100644 index 43c13e2..0000000 --- a/catos-iso/airootfs/etc/skel/.config/neofetch/config.conf +++ /dev/null @@ -1,864 +0,0 @@ -# See this wiki page for more info: -# https://github.com/dylanaraps/neofetch/wiki/Customizing-Info -print_info() { - info title - info underline - - info "OS" distro - info "Host" model - info "Kernel" kernel - info "Uptime" uptime - info "Packages" packages - info "Shell" shell - info "Resolution" resolution - info "DE" de - info "WM" wm - info "WM Theme" wm_theme - info "Theme" theme - info "Icons" icons - info "Terminal" term - info "Terminal Font" term_font - info "CPU" cpu - info "GPU" gpu - info "Memory" memory - - # info "GPU Driver" gpu_driver # Linux/macOS only - # info "CPU Usage" cpu_usage - # info "Disk" disk - # info "Battery" battery - # info "Font" font - # info "Song" song - # [[ "$player" ]] && prin "Music Player" "$player" - # info "Local IP" local_ip - # info "Public IP" public_ip - # info "Users" users - # info "Locale" locale # This only works on glibc systems. - - info cols -} - -# Title - - -# Hide/Show Fully qualified domain name. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --title_fqdn -title_fqdn="off" - - -# Kernel - - -# Shorten the output of the kernel function. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --kernel_shorthand -# Supports: Everything except *BSDs (except PacBSD and PC-BSD) -# -# Example: -# on: '4.8.9-1-ARCH' -# off: 'Linux 4.8.9-1-ARCH' -kernel_shorthand="on" - - -# Distro - - -# Shorten the output of the distro function -# -# Default: 'off' -# Values: 'on', 'tiny', 'off' -# Flag: --distro_shorthand -# Supports: Everything except Windows and Haiku -distro_shorthand="off" - -# Show/Hide OS Architecture. -# Show 'x86_64', 'x86' and etc in 'Distro:' output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --os_arch -# -# Example: -# on: 'Arch Linux x86_64' -# off: 'Arch Linux' -os_arch="on" - - -# Uptime - - -# Shorten the output of the uptime function -# -# Default: 'on' -# Values: 'on', 'tiny', 'off' -# Flag: --uptime_shorthand -# -# Example: -# on: '2 days, 10 hours, 3 mins' -# tiny: '2d 10h 3m' -# off: '2 days, 10 hours, 3 minutes' -uptime_shorthand="on" - - -# Memory - - -# Show memory pecentage in output. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --memory_percent -# -# Example: -# on: '1801MiB / 7881MiB (22%)' -# off: '1801MiB / 7881MiB' -memory_percent="off" - -# Change memory output unit. -# -# Default: 'mib' -# Values: 'kib', 'mib', 'gib' -# Flag: --memory_unit -# -# Example: -# kib '1020928KiB / 7117824KiB' -# mib '1042MiB / 6951MiB' -# gib: ' 0.98GiB / 6.79GiB' -memory_unit="mib" - - -# Packages - - -# Show/Hide Package Manager names. -# -# Default: 'tiny' -# Values: 'on', 'tiny' 'off' -# Flag: --package_managers -# -# Example: -# on: '998 (pacman), 8 (flatpak), 4 (snap)' -# tiny: '908 (pacman, flatpak, snap)' -# off: '908' -package_managers="on" - - -# Shell - - -# Show the path to $SHELL -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --shell_path -# -# Example: -# on: '/bin/bash' -# off: 'bash' -shell_path="off" - -# Show $SHELL version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --shell_version -# -# Example: -# on: 'bash 4.4.5' -# off: 'bash' -shell_version="on" - - -# CPU - - -# CPU speed type -# -# Default: 'bios_limit' -# Values: 'scaling_cur_freq', 'scaling_min_freq', 'scaling_max_freq', 'bios_limit'. -# Flag: --speed_type -# Supports: Linux with 'cpufreq' -# NOTE: Any file in '/sys/devices/system/cpu/cpu0/cpufreq' can be used as a value. -speed_type="bios_limit" - -# CPU speed shorthand -# -# Default: 'off' -# Values: 'on', 'off'. -# Flag: --speed_shorthand -# NOTE: This flag is not supported in systems with CPU speed less than 1 GHz -# -# Example: -# on: 'i7-6500U (4) @ 3.1GHz' -# off: 'i7-6500U (4) @ 3.100GHz' -speed_shorthand="off" - -# Enable/Disable CPU brand in output. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_brand -# -# Example: -# on: 'Intel i7-6500U' -# off: 'i7-6500U (4)' -cpu_brand="on" - -# CPU Speed -# Hide/Show CPU speed. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --cpu_speed -# -# Example: -# on: 'Intel i7-6500U (4) @ 3.1GHz' -# off: 'Intel i7-6500U (4)' -cpu_speed="on" - -# CPU Cores -# Display CPU cores in output -# -# Default: 'logical' -# Values: 'logical', 'physical', 'off' -# Flag: --cpu_cores -# Support: 'physical' doesn't work on BSD. -# -# Example: -# logical: 'Intel i7-6500U (4) @ 3.1GHz' (All virtual cores) -# physical: 'Intel i7-6500U (2) @ 3.1GHz' (All physical cores) -# off: 'Intel i7-6500U @ 3.1GHz' -cpu_cores="logical" - -# CPU Temperature -# Hide/Show CPU temperature. -# Note the temperature is added to the regular CPU function. -# -# Default: 'off' -# Values: 'C', 'F', 'off' -# Flag: --cpu_temp -# Supports: Linux, BSD -# NOTE: For FreeBSD and NetBSD-based systems, you'll need to enable -# coretemp kernel module. This only supports newer Intel processors. -# -# Example: -# C: 'Intel i7-6500U (4) @ 3.1GHz [27.2°C]' -# F: 'Intel i7-6500U (4) @ 3.1GHz [82.0°F]' -# off: 'Intel i7-6500U (4) @ 3.1GHz' -cpu_temp="off" - - -# GPU - - -# Enable/Disable GPU Brand -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gpu_brand -# -# Example: -# on: 'AMD HD 7950' -# off: 'HD 7950' -gpu_brand="on" - -# Which GPU to display -# -# Default: 'all' -# Values: 'all', 'dedicated', 'integrated' -# Flag: --gpu_type -# Supports: Linux -# -# Example: -# all: -# GPU1: AMD HD 7950 -# GPU2: Intel Integrated Graphics -# -# dedicated: -# GPU1: AMD HD 7950 -# -# integrated: -# GPU1: Intel Integrated Graphics -gpu_type="all" - - -# Resolution - - -# Display refresh rate next to each monitor -# Default: 'off' -# Values: 'on', 'off' -# Flag: --refresh_rate -# Supports: Doesn't work on Windows. -# -# Example: -# on: '1920x1080 @ 60Hz' -# off: '1920x1080' -refresh_rate="off" - - -# Gtk Theme / Icons / Font - - -# Shorten output of GTK Theme / Icons / Font -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --gtk_shorthand -# -# Example: -# on: 'Numix, Adwaita' -# off: 'Numix [GTK2], Adwaita [GTK3]' -gtk_shorthand="off" - - -# Enable/Disable gtk2 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk2 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Adwaita [GTK3]' -gtk2="on" - -# Enable/Disable gtk3 Theme / Icons / Font -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --gtk3 -# -# Example: -# on: 'Numix [GTK2], Adwaita [GTK3]' -# off: 'Numix [GTK2]' -gtk3="on" - - -# IP Address - - -# Website to ping for the public IP -# -# Default: 'http://ident.me' -# Values: 'url' -# Flag: --ip_host -public_ip_host="http://ident.me" - -# Public IP timeout. -# -# Default: '2' -# Values: 'int' -# Flag: --ip_timeout -public_ip_timeout=2 - - -# Desktop Environment - - -# Show Desktop Environment version -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --de_version -de_version="on" - - -# Disk - - -# Which disks to display. -# The values can be any /dev/sdXX, mount point or directory. -# NOTE: By default we only show the disk info for '/'. -# -# Default: '/' -# Values: '/', '/dev/sdXX', '/path/to/drive'. -# Flag: --disk_show -# -# Example: -# disk_show=('/' '/dev/sdb1'): -# 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 823G / 893G (93%)' -# -# disk_show=('/'): -# 'Disk (/): 74G / 118G (66%)' -# -disk_show=('/') - -# Disk subtitle. -# What to append to the Disk subtitle. -# -# Default: 'mount' -# Values: 'mount', 'name', 'dir', 'none' -# Flag: --disk_subtitle -# -# Example: -# name: 'Disk (/dev/sda1): 74G / 118G (66%)' -# 'Disk (/dev/sdb2): 74G / 118G (66%)' -# -# mount: 'Disk (/): 74G / 118G (66%)' -# 'Disk (/mnt/Local Disk): 74G / 118G (66%)' -# 'Disk (/mnt/Videos): 74G / 118G (66%)' -# -# dir: 'Disk (/): 74G / 118G (66%)' -# 'Disk (Local Disk): 74G / 118G (66%)' -# 'Disk (Videos): 74G / 118G (66%)' -# -# none: 'Disk: 74G / 118G (66%)' -# 'Disk: 74G / 118G (66%)' -# 'Disk: 74G / 118G (66%)' -disk_subtitle="mount" - -# Disk percent. -# Show/Hide disk percent. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --disk_percent -# -# Example: -# on: 'Disk (/): 74G / 118G (66%)' -# off: 'Disk (/): 74G / 118G' -disk_percent="on" - - -# Song - - -# Manually specify a music player. -# -# Default: 'auto' -# Values: 'auto', 'player-name' -# Flag: --music_player -# -# Available values for 'player-name': -# -# amarok -# audacious -# banshee -# bluemindo -# clementine -# cmus -# deadbeef -# deepin-music -# dragon -# elisa -# exaile -# gnome-music -# gmusicbrowser -# gogglesmm -# guayadeque -# io.elementary.music -# iTunes -# juk -# lollypop -# mocp -# mopidy -# mpd -# muine -# netease-cloud-music -# olivia -# playerctl -# pogo -# pragha -# qmmp -# quodlibet -# rhythmbox -# sayonara -# smplayer -# spotify -# strawberry -# tauonmb -# tomahawk -# vlc -# xmms2d -# xnoise -# yarock -music_player="auto" - -# Format to display song information. -# -# Default: '%artist% - %album% - %title%' -# Values: '%artist%', '%album%', '%title%' -# Flag: --song_format -# -# Example: -# default: 'Song: Jet - Get Born - Sgt Major' -song_format="%artist% - %album% - %title%" - -# Print the Artist, Album and Title on separate lines -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --song_shorthand -# -# Example: -# on: 'Artist: The Fratellis' -# 'Album: Costello Music' -# 'Song: Chelsea Dagger' -# -# off: 'Song: The Fratellis - Costello Music - Chelsea Dagger' -song_shorthand="off" - -# 'mpc' arguments (specify a host, password etc). -# -# Default: '' -# Example: mpc_args=(-h HOST -P PASSWORD) -mpc_args=() - - -# Text Colors - - -# Text Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --colors -# -# Each number represents a different part of the text in -# this order: 'title', '@', 'underline', 'subtitle', 'colon', 'info' -# -# Example: -# colors=(distro) - Text is colored based on Distro colors. -# colors=(4 6 1 8 8 6) - Text is colored in the order above. -colors=(4 4 7 4 7 7) - - -# Text Options - - -# Toggle bold text -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bold -bold="on" - -# Enable/Disable Underline -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --underline -underline_enabled="on" - -# Underline character -# -# Default: '-' -# Values: 'string' -# Flag: --underline_char -underline_char="-" - - -# Info Separator -# Replace the default separator with the specified string. -# -# Default: ':' -# Flag: --separator -# -# Example: -# separator="->": 'Shell-> bash' -# separator=" =": 'WM = dwm' -separator=":" - - -# Color Blocks - - -# Color block range -# The range of colors to print. -# -# Default: '0', '15' -# Values: 'num' -# Flag: --block_range -# -# Example: -# -# Display colors 0-7 in the blocks. (8 colors) -# neofetch --block_range 0 7 -# -# Display colors 0-15 in the blocks. (16 colors) -# neofetch --block_range 0 15 -block_range=(0 15) - -# Toggle color blocks -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --color_blocks -color_blocks="on" - -# Color block width in spaces -# -# Default: '3' -# Values: 'num' -# Flag: --block_width -block_width=3 - -# Color block height in lines -# -# Default: '1' -# Values: 'num' -# Flag: --block_height -block_height=1 - -# Color Alignment -# -# Default: 'auto' -# Values: 'auto', 'num' -# Flag: --col_offset -# -# Number specifies how far from the left side of the terminal (in spaces) to -# begin printing the columns, in case you want to e.g. center them under your -# text. -# Example: -# col_offset="auto" - Default behavior of neofetch -# col_offset=7 - Leave 7 spaces then print the colors -col_offset="auto" - -# Progress Bars - - -# Bar characters -# -# Default: '-', '=' -# Values: 'string', 'string' -# Flag: --bar_char -# -# Example: -# neofetch --bar_char 'elapsed' 'total' -# neofetch --bar_char '-' '=' -bar_char_elapsed="-" -bar_char_total="=" - -# Toggle Bar border -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --bar_border -bar_border="on" - -# Progress bar length in spaces -# Number of chars long to make the progress bars. -# -# Default: '15' -# Values: 'num' -# Flag: --bar_length -bar_length=15 - -# Progress bar colors -# When set to distro, uses your distro's logo colors. -# -# Default: 'distro', 'distro' -# Values: 'distro', 'num' -# Flag: --bar_colors -# -# Example: -# neofetch --bar_colors 3 4 -# neofetch --bar_colors distro 5 -bar_color_elapsed="distro" -bar_color_total="distro" - - -# Info display -# Display a bar with the info. -# -# Default: 'off' -# Values: 'bar', 'infobar', 'barinfo', 'off' -# Flags: --cpu_display -# --memory_display -# --battery_display -# --disk_display -# -# Example: -# bar: '[---=======]' -# infobar: 'info [---=======]' -# barinfo: '[---=======] info' -# off: 'info' -cpu_display="off" -memory_display="off" -battery_display="off" -disk_display="off" - - -# Backend Settings - - -# Image backend. -# -# Default: 'ascii' -# Values: 'ascii', 'caca', 'chafa', 'jp2a', 'iterm2', 'off', -# 'pot', 'termpix', 'pixterm', 'tycat', 'w3m', 'kitty' -# Flag: --backend -image_backend="ascii" - -# Image Source -# -# Which image or ascii file to display. -# -# Default: 'auto' -# Values: 'auto', 'ascii', 'wallpaper', '/path/to/img', '/path/to/ascii', '/path/to/dir/' -# 'command output (neofetch --ascii "$(fortune | cowsay -W 30)")' -# Flag: --source -# -# NOTE: 'auto' will pick the best image source for whatever image backend is used. -# In ascii mode, distro ascii art will be used and in an image mode, your -# wallpaper will be used. -image_source="${XDG_CACHE_HOME:-${HOME}}/.config/neofetch/catos.txt" -#image_source="auto" - -# Ascii Options - - -# Ascii distro -# Which distro's ascii art to display. -# -# Default: 'auto' -# Values: 'auto', 'distro_name' -# Flag: --ascii_distro -# NOTE: AIX, Alpine, Anarchy, Android, Antergos, antiX, "AOSC OS", -# "AOSC OS/Retro", Apricity, ArcoLinux, ArchBox, ARCHlabs, -# ArchStrike, XFerience, ArchMerge, Arch, Artix, Arya, Bedrock, -# Bitrig, BlackArch, BLAG, BlankOn, BlueLight, bonsai, BSD, -# BunsenLabs, Calculate, Carbs, CentOS, Chakra, ChaletOS, -# Chapeau, Chrom*, Cleanjaro, ClearOS, Clear_Linux, Clover, -# Condres, Container_Linux, CRUX, Cucumber, Debian, Deepin, -# DesaOS, Devuan, DracOS, DarkOs, DragonFly, Drauger, Elementary, -# EndeavourOS, Endless, EuroLinux, Exherbo, Fedora, Feren, FreeBSD, -# FreeMiNT, Frugalware, Funtoo, GalliumOS, Garuda, Gentoo, Pentoo, -# gNewSense, GNOME, GNU, GoboLinux, Grombyang, Guix, Haiku, Huayra, -# Hyperbola, janus, Kali, KaOS, KDE_neon, Kibojoe, Kogaion, -# Korora, KSLinux, Kubuntu, LEDE, LFS, Linux_Lite, -# LMDE, Lubuntu, Lunar, macos, Mageia, MagpieOS, Mandriva, -# Manjaro, Maui, Mer, Minix, LinuxMint, MX_Linux, Namib, -# Neptune, NetBSD, Netrunner, Nitrux, NixOS, Nurunner, -# NuTyX, OBRevenge, OpenBSD, openEuler, OpenIndiana, openmamba, -# OpenMandriva, OpenStage, OpenWrt, osmc, Oracle, OS Elbrus, PacBSD, -# Parabola, Pardus, Parrot, Parsix, TrueOS, PCLinuxOS, Peppermint, -# popos, Porteus, PostMarketOS, Proxmox, Puppy, PureOS, Qubes, Radix, -# Raspbian, Reborn_OS, Redstar, Redcore, Redhat, Refracted_Devuan, -# Regata, Rosa, sabotage, Sabayon, Sailfish, SalentOS, Scientific, -# Septor, SereneLinux, SharkLinux, Siduction, Slackware, SliTaz, -# SmartOS, Solus, Source_Mage, Sparky, Star, SteamOS, SunOS, -# openSUSE_Leap, openSUSE_Tumbleweed, openSUSE, SwagArch, Tails, -# Trisquel, Ubuntu-Budgie, Ubuntu-GNOME, Ubuntu-MATE, Ubuntu-Studio, -# Ubuntu, Venom, Void, Obarun, windows10, Windows7, Xubuntu, Zorin, -# and IRIX have ascii logos -# NOTE: Arch, Ubuntu, Redhat, and Dragonfly have 'old' logo variants. -# Use '{distro name}_old' to use the old logos. -# NOTE: Ubuntu has flavor variants. -# Change this to Lubuntu, Kubuntu, Xubuntu, Ubuntu-GNOME, -# Ubuntu-Studio, Ubuntu-Mate or Ubuntu-Budgie to use the flavors. -# NOTE: Arcolinux, Dragonfly, Fedora, Alpine, Arch, Ubuntu, -# CRUX, Debian, Gentoo, FreeBSD, Mac, NixOS, OpenBSD, android, -# Antrix, CentOS, Cleanjaro, ElementaryOS, GUIX, Hyperbola, -# Manjaro, MXLinux, NetBSD, Parabola, POP_OS, PureOS, -# Slackware, SunOS, LinuxLite, OpenSUSE, Raspbian, -# postmarketOS, and Void have a smaller logo variant. -# Use '{distro name}_small' to use the small variants. -ascii_distro="auto" - -# Ascii Colors -# -# Default: 'distro' -# Values: 'distro', 'num' 'num' 'num' 'num' 'num' 'num' -# Flag: --ascii_colors -# -# Example: -# ascii_colors=(distro) - Ascii is colored based on Distro colors. -# ascii_colors=(4 6 1 8 8 6) - Ascii is colored using these colors. -ascii_colors=(4 7) - -# Bold ascii logo -# Whether or not to bold the ascii logo. -# -# Default: 'on' -# Values: 'on', 'off' -# Flag: --ascii_bold -ascii_bold="on" - - -# Image Options - - -# Image loop -# Setting this to on will make neofetch redraw the image constantly until -# Ctrl+C is pressed. This fixes display issues in some terminal emulators. -# -# Default: 'off' -# Values: 'on', 'off' -# Flag: --loop -image_loop="off" - -# Thumbnail directory -# -# Default: '~/.cache/thumbnails/neofetch' -# Values: 'dir' -thumbnail_dir="${XDG_CACHE_HOME:-${HOME}/.cache}/thumbnails/neofetch" - -# Crop mode -# -# Default: 'normal' -# Values: 'normal', 'fit', 'fill' -# Flag: --crop_mode -# -# See this wiki page to learn about the fit and fill options. -# https://github.com/dylanaraps/neofetch/wiki/What-is-Waifu-Crop%3F -crop_mode="normal" - -# Crop offset -# Note: Only affects 'normal' crop mode. -# -# Default: 'center' -# Values: 'northwest', 'north', 'northeast', 'west', 'center' -# 'east', 'southwest', 'south', 'southeast' -# Flag: --crop_offset -crop_offset="center" - -# Image size -# The image is half the terminal width by default. -# -# Default: 'auto' -# Values: 'auto', '00px', '00%', 'none' -# Flags: --image_size -# --size -image_size="50%" - -# Gap between image and text -# -# Default: '3' -# Values: 'num', '-num' -# Flag: --gap -gap=3 - -# Image offsets -# Only works with the w3m backend. -# -# Default: '0' -# Values: 'px' -# Flags: --xoffset -# --yoffset -yoffset=0 -xoffset=0 - -# Image background color -# Only works with the w3m backend. -# -# Default: '' -# Values: 'color', 'blue' -# Flag: --bg_color -background_color= - - -# Misc Options - -# Stdout mode -# Turn off all colors and disables image backend (ASCII/Image). -# Useful for piping into another command. -# Default: 'off' -# Values: 'on', 'off' -stdout="off" diff --git a/catos-iso/airootfs/etc/skel/.config/plasma-localerc b/catos-iso/airootfs/etc/skel/.config/plasma-localerc new file mode 100644 index 0000000..9a84478 --- /dev/null +++ b/catos-iso/airootfs/etc/skel/.config/plasma-localerc @@ -0,0 +1,13 @@ +[Formats] +LANG=zh_CN.UTF-8 +LC_ADDRESS=zh_CN.UTF-8 +LC_MEASUREMENT=zh_CN.UTF-8 +LC_MONETARY=zh_CN.UTF-8 +LC_NAME=zh_CN.UTF-8 +LC_NUMERIC=zh_CN.UTF-8 +LC_PAPER=zh_CN.UTF-8 +LC_TELEPHONE=zh_CN.UTF-8 +LC_TIME=zh_CN.UTF-8 + +[Translations] +LANGUAGE=zh_CN diff --git a/catos-iso/airootfs/etc/skel/.local/share/applications/StarCatOS.desktop b/catos-iso/airootfs/etc/skel/.local/share/applications/StarCatOS.desktop deleted file mode 100755 index 2eec2dc..0000000 --- a/catos-iso/airootfs/etc/skel/.local/share/applications/StarCatOS.desktop +++ /dev/null @@ -1,10 +0,0 @@ -#!/usr/bin/env xdg-open -[Desktop Entry] -Encoding=UTF-8 -Name=Star CatOS -Comment=Star CatOS -Exec=xdg-open https://github.com/CatOS-Home/CatOS -Icon=catos -Terminal=false -Type=Application -Categories=Network; diff --git a/catos-iso/airootfs/etc/skel/.local/share/konsole/CatOS.profile b/catos-iso/airootfs/etc/skel/.local/share/konsole/CatOS.profile deleted file mode 100644 index a97c3cc..0000000 --- a/catos-iso/airootfs/etc/skel/.local/share/konsole/CatOS.profile +++ /dev/null @@ -1,11 +0,0 @@ -[Appearance] -Font=JetBrains Mono,12,-1,5,75,0,0,0,0,0,Bold -TabColor=156,133,245 - -[Cursor Options] -CursorShape=2 - -[General] -Command=/bin/fish -Name=CatOS -Parent=FALLBACK/ diff --git a/catos-iso/airootfs/etc/systemd/network/20-ethernet.network b/catos-iso/airootfs/etc/systemd/network/20-ethernet.network index 9ada778..0d5b7b7 100644 --- a/catos-iso/airootfs/etc/systemd/network/20-ethernet.network +++ b/catos-iso/airootfs/etc/systemd/network/20-ethernet.network @@ -1,13 +1,14 @@ [Match] -# Matching with "Type=ether" causes issues with containers because it also matches virtual Ethernet interfaces (veth*). -# See https://bugs.archlinux.org/task/70892 -# Instead match by globbing the network interface name. -Name=en* -Name=eth* +Type=ether +# Exclude virtual Ethernet interfaces +Kind=!* + +[Link] +RequiredForOnline=routable [Network] DHCP=yes -IPv6PrivacyExtensions=yes +MulticastDNS=yes # systemd-networkd does not set per-interface-type default route metrics # https://github.com/systemd/systemd/issues/17698 diff --git a/catos-iso/airootfs/etc/systemd/network/20-wlan.network b/catos-iso/airootfs/etc/systemd/network/20-wlan.network index 601d5b8..89c0b49 100644 --- a/catos-iso/airootfs/etc/systemd/network/20-wlan.network +++ b/catos-iso/airootfs/etc/systemd/network/20-wlan.network @@ -1,9 +1,12 @@ [Match] -Name=wl* +Type=wlan + +[Link] +RequiredForOnline=routable [Network] DHCP=yes -IPv6PrivacyExtensions=yes +MulticastDNS=yes # systemd-networkd does not set per-interface-type default route metrics # https://github.com/systemd/systemd/issues/17698 diff --git a/catos-iso/airootfs/etc/systemd/network/20-wwan.network b/catos-iso/airootfs/etc/systemd/network/20-wwan.network index 9104c24..befba8d 100644 --- a/catos-iso/airootfs/etc/systemd/network/20-wwan.network +++ b/catos-iso/airootfs/etc/systemd/network/20-wwan.network @@ -1,9 +1,11 @@ [Match] -Name=ww* +Type=wwan + +[Link] +RequiredForOnline=routable [Network] DHCP=yes -IPv6PrivacyExtensions=yes # systemd-networkd does not set per-interface-type default route metrics # https://github.com/systemd/systemd/issues/17698 diff --git a/catos-iso/airootfs/etc/systemd/networkd.conf.d/ipv6-privacy-extensions.conf b/catos-iso/airootfs/etc/systemd/networkd.conf.d/ipv6-privacy-extensions.conf new file mode 100644 index 0000000..0e9ceb4 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/networkd.conf.d/ipv6-privacy-extensions.conf @@ -0,0 +1,2 @@ +[Network] +IPv6PrivacyExtensions=yes diff --git a/catos-iso/airootfs/etc/systemd/resolved.conf.d/archiso.conf b/catos-iso/airootfs/etc/systemd/resolved.conf.d/archiso.conf new file mode 100644 index 0000000..636f3bd --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/resolved.conf.d/archiso.conf @@ -0,0 +1,4 @@ +# Default systemd-resolved configuration for archiso + +[Resolve] +MulticastDNS=yes diff --git a/catos-iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount b/catos-iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount index 0ba0e67..038961e 100644 --- a/catos-iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount +++ b/catos-iso/airootfs/etc/systemd/system/etc-pacman.d-gnupg.mount @@ -2,7 +2,7 @@ Description=Temporary /etc/pacman.d/gnupg directory [Mount] -What=ramfs +What=tmpfs Where=/etc/pacman.d/gnupg -Type=ramfs -Options=mode=0755 +Type=tmpfs +Options=mode=0755,noswap diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service new file mode 120000 index 0000000..e874a9b --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/NetworkManager.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/NetworkManager.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service new file mode 120000 index 0000000..20ac7b2 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_fcopy_daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hv_fcopy_daemon.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service new file mode 120000 index 0000000..a7eac4a --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_kvp_daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hv_kvp_daemon.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service new file mode 120000 index 0000000..eae19ef --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/hv_vss_daemon.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/hv_vss_daemon.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service new file mode 120000 index 0000000..3625abd --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/iwd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/iwd.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service new file mode 120000 index 0000000..b917481 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/livecd-talk.service @@ -0,0 +1 @@ +/etc/systemd/system/livecd-talk.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service new file mode 120000 index 0000000..cb2d560 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vboxservice.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vboxservice.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service new file mode 120000 index 0000000..e0a11a7 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmtoolsd.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vmtoolsd.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-networks.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-networks.service new file mode 120000 index 0000000..776fbc0 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-networks.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vmware-networks.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service new file mode 120000 index 0000000..173f306 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service @@ -0,0 +1 @@ +/usr/lib/systemd/system/vmware-vmblock-fuse.service \ No newline at end of file diff --git a/catos-iso/airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket b/catos-iso/airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket new file mode 120000 index 0000000..3897c63 --- /dev/null +++ b/catos-iso/airootfs/etc/systemd/system/sockets.target.wants/pcscd.socket @@ -0,0 +1 @@ +/usr/lib/systemd/system/pcscd.socket \ No newline at end of file diff --git a/catos-iso/airootfs/root/.gnupg/scdaemon.conf b/catos-iso/airootfs/root/.gnupg/scdaemon.conf new file mode 100644 index 0000000..e1f3d1f --- /dev/null +++ b/catos-iso/airootfs/root/.gnupg/scdaemon.conf @@ -0,0 +1,4 @@ +disable-ccid +disable-pinpad +pcsc-driver /usr/lib/libpcsclite.so +pcsc-shared diff --git a/catos-iso/airootfs/root/customize_airootfs.sh b/catos-iso/airootfs/root/customize_airootfs.sh deleted file mode 100755 index bc13aa8..0000000 --- a/catos-iso/airootfs/root/customize_airootfs.sh +++ /dev/null @@ -1,203 +0,0 @@ -#!/usr/bin/env bash - -## Script to perform several important tasks before `mkarchcraftiso` create filesystem image. - -set -e -u - -## -------------------------------------------------------------- ## - -## lsb-release -rm /etc/lsb-release -touch /etc/catos-lsb-release -ln -s /etc/catos-lsb-release /etc/lsb-release -cat > "/etc/lsb-release" <<- _EOF_ - DISTRIB_ID="CatOS" - - DISTRIB_RELEASE="rolling" - DISTRIB_DESCRIPTION="CatOS" - -_EOF_ - -## -------------------------------------------------------------- ## - -## -------------------------------------------------------------- ## - -## /etc/os-release -rm /etc/os-release -touch catos-os-release -ln -s /etc/catos-os-release /etc/os-release -cat > "/etc/os-release" <<- _EOF_ - NAME="CatOS" - PRETTY_NAME="CatOS" - ID=catos - BUILD_ID=rolling - ANSI_COLOR="38;2;23;147;209" - HOME_URL="https://github.com/CatOS-Home/CatOS" - DOCUMENTATION_URL="https://github.com/CatOS-Home/CatOS" - SUPPORT_URL="https://github.com/CatOS-Home/CatOS" - BUG_REPORT_URL="https://github.com/CatOS-Home/CatOS" - PRIVACY_POLICY_URL="https://github.com/CatOS-Home/CatOS" - LOGO=catos - -_EOF_ - -## -------------------------------------------------------------- ## - -## -------------------------------------------------------------- ## - -## /etc/issue -rm /etc/issue -touch /etc/catos-issue -ln -s /etc/catos-issue /etc/issue -cat > "/etc/issue" <<- _EOF_ - CatOS \r (\l) - -_EOF_ - -## -------------------------------------------------------------- ## - -## -------------------------------------------------------------- ## - -## /etc/motd -rm /etc/motd -touch /etc/catos-motd -ln -s /etc/catos-motd /etc/motd -cat > "/etc/motd" <<- _EOF_ -To install Cat OS follow the installation guide: -https://wiki.archlinux.org/title/Installation_guide - -For Wi-Fi, authenticate to the wireless network using the iwctl utility. -For mobile broadband (WWAN) modems, connect with the mmcli utility. -Ethernet, WLAN and WWAN interfaces using DHCP should work automatically. - -After connecting to the internet, the installation guide can be accessed -via the convenience script Installation_guide. - -                                           - -_EOF_ - -## -------------------------------------------------------------- ## - -## -------------------------------------------------------------- ## -## 更换国内源 -echo 'Server = https://mirrors.ustc.edu.cn/archlinux/$repo/os/$arch' > /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.cernet.edu.cn/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.aliyun.com/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.bfsu.edu.cn/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.xjtu.edu.cn/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.shanghaitech.edu.cn/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist -echo 'Server = https://mirrors.tuna.tsinghua.edu.cn/archlinux/$repo/os/$arch' >> /etc/pacman.d/mirrorlist - -## -------------------------------------------------------------- ## -##更换主机名 -echo "CatOS" > /etc/hostname -## -------------------------------------------------------------- ## - -## -------------------------------------------------------------- ## -### 开启multilib仓库支持 -echo '[multilib]' >> /etc/pacman.conf -echo 'Include = /etc/pacman.d/mirrorlist' >> /etc/pacman.conf -echo ' ' >> /etc/pacman.conf -## 增加archlinuxcn源 -echo '[archlinuxcn]' >> /etc/pacman.conf -echo 'SigLevel = Never' >> /etc/pacman.conf -echo 'Server = https://mirrors.ustc.edu.cn/archlinuxcn/$arch' >> /etc/pacman.conf - - -## -------------------------------------------------------------- ## - -## 增加arch4edu源 -echo '[arch4edu]' >> /etc/pacman.conf -echo 'SigLevel = Never' >> /etc/pacman.conf -echo 'Server = https://mirrors.cernet.edu.cn/arch4edu/$arch' >> /etc/pacman.conf - -## -------------------------------------------------------------- ## - -## 增加catos源 -echo '[catos]' >> /etc/pacman.conf -echo 'SigLevel = Never' >> /etc/pacman.conf -echo 'Server = https://pkgs.catos.info/$arch' >> /etc/pacman.conf - -## -------------------------------------------------------------- ## - -#pip install questionary -#设置时区 -ln -sf /usr/share/zoneinfo/Asia/Shanghai /etc/localtime -hwclock --systohc - -#设置系统语言为中文 -echo "en_US.UTF-8 UTF-8" >> /etc/locale.gen -echo "zh_CN.UTF-8 UTF-8" >> /etc/locale.gen -locale-gen -cat > "/etc/locale.conf" <<- _EOF_ -LANG=zh_CN.UTF-8 -LC_ADDRESS=zh_CN.UTF-8 -LC_IDENTIFICATION=zh_CN.UTF-8 -LC_MEASUREMENT=zh_CN.UTF-8 -LC_MONETARY=zh_CN.UTF-8 -LC_NAME=zh_CN.UTF-8 -LC_NUMERIC=zh_CN.UTF-8 -LC_PAPER=zh_CN.UTF-8 -LC_TELEPHONE=zh_CN.UTF-8 -LC_TIME=zh_CN.UTF-8 -_EOF_ - -#enable networkmanager -ln -s '/usr/lib/systemd/system/NetworkManager.service' '/etc/systemd/system/multi-user.target.wants/NetworkManager.service' -#enable docker -ln -s '/usr/lib/systemd/system/docker.service' '/etc/systemd/system/multi-user.target.wants/docker.service' - -#optimize the VM experience -ln -s /usr/lib/systemd/system/vboxservice.service /etc/systemd/system/multi-user.target.wants/vboxservice.service -ln -s /usr/lib/systemd/system/vmtoolsd.service /etc/systemd/system/multi-user.target.wants/vmtoolsd.service -ln -s /usr/lib/systemd/system/vmware-networks.service /etc/systemd/system/multi-user.target.wants/vmware-networks.service -ln -s /usr/lib/systemd/system/vmware-vmblock-fuse.service /etc/systemd/system/multi-user.target.wants/vmware-vmblock-fuse.service - -#remove kde welcome -#rm /etc/xdg/autostart/org.kde.plasma-welcome.desktop -rm /etc/xdg/autostart/calamares.desktop - -mkdir /home/liveuser/Desktop -mv /etc/xdg/autostart/catos.desktop /home/liveuser/Desktop/catos.desktop -#rm /etc/xdg/autostart/catos-advanced.desktop #暂时移除联网安装 -mv /etc/xdg/autostart/catos-advanced.desktop /home/liveuser/Desktop/catos-advanced.desktop - - -sed -i 's/#Color/Color/g' /etc/pacman.conf - - -#sed -i 's/MODULES=()/MODULES=(vsock vmw_vsock_vmci_transport vmw_balloon vmw_vmci vmwgfx)/g' /etc/mkinitcpio.conf -#mkinitcpio -p linux - - -##fcitx5 -echo "GTK_IM_MODULE=fcitx" >> /etc/environment -echo "QT_IM_MODULE=fcitx" >> /etc/environment -echo "XMODIFIERS=@im=fcitx" >> /etc/environment -echo "SDL_IM_MODULE=fcitx" >> /etc/environment - - -##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 - -###修改plymounth默认主题为catos /usr/share/plymouth/plymouthd.defaults -#sed -i 's/bgrt/catos/g' /usr/share/plymouth/plymouthd.defaults - - -##default icon -#sed -i 's/start-here-kde/\/usr\/share\/icons\/catos\/catos.svg/g' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml -sed -i 's/start-here-kde-symbolic/catos/g' /usr/share/plasma/plasmoids/org.kde.plasma.kickoff/contents/config/main.xml -###sddm -#sed -i 's:Current=.*:Current=sugar-candy-catos:g' /etc/sddm.conf.d/kde_settings.conf - -###修改默认为x -###sed -i 's:Session=.*:Session=plasmax11:g' /etc/sddm.conf.d/kde_settings.conf - - - - diff --git a/catos-iso/airootfs/usr/local/bin/Installation_guide b/catos-iso/airootfs/usr/local/bin/Installation_guide index 4266754..58b97b0 100755 --- a/catos-iso/airootfs/usr/local/bin/Installation_guide +++ b/catos-iso/airootfs/usr/local/bin/Installation_guide @@ -2,4 +2,4 @@ # # SPDX-License-Identifier: GPL-3.0-or-later -exec lynx 'https://wiki.archlinux.org/title/Installation_guide' +exec xdg-open 'https://wiki.archlinux.org/title/Installation_guide' diff --git a/catos-iso/airootfs/usr/local/bin/choose-mirror b/catos-iso/airootfs/usr/local/bin/choose-mirror index b021945..d2349de 100755 --- a/catos-iso/airootfs/usr/local/bin/choose-mirror +++ b/catos-iso/airootfs/usr/local/bin/choose-mirror @@ -4,21 +4,22 @@ get_cmdline() { local param - for param in $(< /proc/cmdline); do + for param in $(/etc/pacman.d/mirrorlist << EOF +cat >/etc/pacman.d/mirrorlist < # $2 # $3 -unmute_and_set_level(){ - { [ "$3" ] &&[ "$2" ] && [ "$1" ] ; } || bugout +unmute_and_set_level() { + [[ -n "$3" && -n "$2" && -n "$1" ]] || bugout systemd-cat -t "livecdsound" printf "Setting: %s on card: %s to %s\n" "$2" "$1" "$3" systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3" unmute return 0 @@ -42,9 +41,8 @@ unmute_and_set_level(){ # $1 # $2 -mute_and_zero_level() -{ - { [ "$1" ] && [ "$2" ] ; } || bugout +mute_and_zero_level() { + [[ -n "$1" && -n "$2" ]] || bugout systemd-cat -t "livecdsound" printf "Muting control: %s on card: %s\n" "$2" "$1" systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "0%" mute return 0 @@ -53,17 +51,15 @@ mute_and_zero_level() # $1 # $2 # $3 "on" | "off" -switch_control() -{ - { [ "$3" ] && [ "$1" ] ; } || bugout +switch_control() { + [[ -n "$3" && -n "$1" ]] || bugout systemd-cat -t "livecdsound" printf "Switching control: %s on card: %s to %s\n" "$2" "$1" "$3" systemd-cat -t "livecdsound" amixer -c "$1" set "$2" "$3" return 0 } # $1 -sanify_levels_on_card() -{ +sanify_levels_on_card() { unmute_and_set_level "$1" "Front" "80%" unmute_and_set_level "$1" "Master" "80%" unmute_and_set_level "$1" "Master Mono" "80%" @@ -134,94 +130,89 @@ sanify_levels_on_card() } # $1 | "all" -sanify_levels() -{ +sanify_levels() { local ttsdml_returnstatus=0 local card case "$1" in - all) - for card in $(echo_card_indices) ; do - sanify_levels_on_card "$card" || ttsdml_returnstatus=1 - done - ;; - *) - sanify_levels_on_card "$1" || ttsdml_returnstatus=1 - ;; + all) + for card in $(echo_card_indices); do + sanify_levels_on_card "$card" || ttsdml_returnstatus=1 + done + ;; + *) + sanify_levels_on_card "$1" || ttsdml_returnstatus=1 + ;; esac - return $ttsdml_returnstatus + return "$ttsdml_returnstatus" } # List all cards that *should* be usable for PCM audio. In my experience, # the console speaker (handled by the pcsp driver) isn't a suitable playback # device, so we'll exclude it. -list_non_pcsp_cards() -{ +list_non_pcsp_cards() { for card in $(echo_card_indices); do local cardfile="/proc/asound/card${card}/id" - if [ -r "$cardfile" ] && [ -f "$cardfile" ] && \ - [ "$(cat "$cardfile")" != pcsp ]; then + if [[ -r "$cardfile" && -f "$cardfile" && "$(cat "$cardfile")" != pcsp ]]; then echo "$card" fi done } # Properly initialize the sound card so that we have audio at boot. -unmute_all_cards() -{ +unmute_all_cards() { sanify_levels all } is_numeric() { - local str=$1 + local str="$1" [[ "$str" =~ ^[0-9]+$ ]] } set_default_card() { - local card=$1 - sed -e "s/%card%/$card/g" < /usr/local/share/livecd-sound/asound.conf.in \ - > /etc/asound.conf + local card="$1" + sed -e "s/%card%/$card/g" /etc/asound.conf } play_on_card() { - local card=$1 file=$2 + local card="$1" file="$2" aplay -q "-Dplughw:$card,0" "$file" } # If there are multiple usable sound cards, prompt the user to choose one, # using auditory feedback. -pick_a_card() -{ +pick_a_card() { set -f usable_cards="$(list_non_pcsp_cards)" - num_usable_cards="$(wc -w <<< "$usable_cards")" + num_usable_cards="$(wc -w <<<"$usable_cards")" - if [ "$num_usable_cards" -eq 1 ]; then + if (( num_usable_cards == 1 )); then systemd-cat -t "livecdsound" printf "Only one sound card is detected\n" exit 0 fi systemd-cat -t "livecdsound" printf "multiple sound cards detected\n" - for card in $usable_cards; do + for card in "${usable_cards[@]}"; do if ! is_numeric "$card"; then continue fi - play_on_card "$card" /usr/share/livecd-sounds/pick-a-card.wav& + play_on_card "$card" /usr/share/livecd-sounds/pick-a-card.wav & done wait sleep 1 - for card in $usable_cards; do + for card in "${usable_cards[@]}"; do if ! is_numeric "$card"; then continue - fi - play_on_card "$card" /usr/share/livecd-sounds/beep.wav - if read -r -t 10; then - systemd-cat -t "livecdsound" printf "Selecting %s sound card as default\n" "$card" - set_default_card "$card" - break - fi -done + fi + play_on_card "$card" /usr/share/livecd-sounds/beep.wav + if read -r -t 10; then + systemd-cat -t "livecdsound" printf "Selecting %s sound card as default\n" "$card" + set_default_card "$card" + break + fi + done } -if [[ $# -eq 0 ]]; then +if (( $# == 0 )); then echo "error: No argument passed." exit 1 fi diff --git a/catos-iso/airootfs/usr/local/bin/remove-nvidia b/catos-iso/airootfs/usr/local/bin/remove-nvidia new file mode 100755 index 0000000..88f79b4 --- /dev/null +++ b/catos-iso/airootfs/usr/local/bin/remove-nvidia @@ -0,0 +1,48 @@ +#!/bin/bash + +_remove_pacman_package() { + local _pkgname="$1" + pacman -Rsnc "$_pkgname" --noconfirm || true +} + +# remove pkgs installed for VMs +_clean_vm_packages() { + + #remove virtualbox + if pacman -Qi virtualbox-guest-utils &> /dev/null; then + systemctl disable vboxservice.service + _remove_pacman_package virtualbox-guest-utils + fi + + if pacman -Qi virtualbox-guest-utils-nox &> /dev/null; then + systemctl disable vboxservice.service + _remove_pacman_package virtualbox-guest-utils-nox + fi + + #remove vmware + if [ -f /etc/xdg/autostart/vmware-user.desktop ]; then + rm /etc/xdg/autostart/vmware-user.desktop + fi + + if pacman -Qi open-vm-tools &> /dev/null; then + systemctl disable vmtoolsd.service + _remove_pacman_package open-vm-tools + fi + + if [ -f /etc/systemd/system/multi-user.target.wants/vmtoolsd.service ]; then + rm /etc/systemd/system/multi-user.target.wants/vmtoolsd.service + fi + + #remove qemu + if pacman -Qi qemu-guest-agent &> /dev/null; then + systemctl disable qemu-guest-agent.service + _remove_pacman_package qemu-guest-agent + fi +} + +_check_not_running_vm="$(systemd-detect-virt | grep -q 'none'; echo $?)" +if [[ "${_check_not_running_vm}" -eq 0 ]]; then + _clean_vm_packages +fi + +# vim:set ft=bash sw=2 sts=2 et: diff --git a/catos-iso/airootfs/usr/local/bin/removeun b/catos-iso/airootfs/usr/local/bin/removeun new file mode 100755 index 0000000..de37fc5 --- /dev/null +++ b/catos-iso/airootfs/usr/local/bin/removeun @@ -0,0 +1,51 @@ +#!/bin/bash +#set -e + +_clean_files() { +local _files_to_remove=( + /usr/local/bin/choose-mirror + /usr/local/bin/prepare-live-desktop.sh + /usr/local/bin/removeun-online + /usr/local/share/livecd-sound +) + + local xx + for xx in "${_files_to_remove[@]}"; do rm -rf "$xx" || true; done +} + +_clean_packages() { +local _packages_to_remove=( + gparted + catos-calamares + catos-calamares-config + edk2-shell + gpart + arch-install-scripts + squashfs-tools + syslinux + clonezilla + memtest86+ + memtest86+-efi + mkinitcpio-archiso + tcpdump +) + + local _check_nvidia_card="$(chwd --is_nvidia_card | grep -q 'NVIDIA card found!'; echo $?)" + if [[ "${_check_nvidia_card}" -ne 0 ]]; then + echo "No NVIDIA card detected. Removing nvidia drivers" + _packages_to_remove+=(nvidia-module-extractor nvidia-utils egl-wayland) + _files_to_remove+=(/usr/local/bin/nvidia-module-loader + /etc/modprobe.d/nvidia-loader.conf + ) + fi + + local xx + # @ does one by one to avoid errors in the entire process + # taken from Erik Dubois script + for xx in "${_packages_to_remove[@]}"; do pacman -Rsnc "$xx" --noconfirm; done +} + +_clean_packages +_clean_files + +# vim:set ft=bash sw=2 sts=2 et: diff --git a/catos-iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf b/catos-iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf index a481ebc..ff249d2 100644 --- a/catos-iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf +++ b/catos-iso/efiboot/loader/entries/01-archiso-x86_64-linux.conf @@ -1,7 +1,5 @@ title Cat OS install medium (x86_64, UEFI) sort-key 01 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=no diff --git a/catos-iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf b/catos-iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf index b8e39d4..4ee44ec 100644 --- a/catos-iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf +++ b/catos-iso/efiboot/loader/entries/02-archiso-x86_64-speech-linux.conf @@ -1,7 +1,5 @@ title Cat OS install medium (x86_64, UEFI) with speech sort-key 02 linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -initrd /%INSTALL_DIR%/boot/intel-ucode.img -initrd /%INSTALL_DIR%/boot/amd-ucode.img initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img options archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on copytoram=no diff --git a/catos-iso/grub/grub.cfg b/catos-iso/grub/grub.cfg index 612ddc6..25f5d6d 100644 --- a/catos-iso/grub/grub.cfg +++ b/catos-iso/grub/grub.cfg @@ -26,7 +26,7 @@ timeout=15 timeout_style=menu # GRUB init tune for accessibility -play 600 988 1 1319 4 +# play 600 988 1 1319 4 # Menu entries @@ -34,14 +34,21 @@ menuentry "CatOS install medium (x86_64, UEFI)" --class arch --class gnu-linux - set gfxpayload=keep search --no-floppy --set=root --label %ARCHISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=no cow_spacesize=1G - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +} + +menuentry "CatOS install medium (x86_64, UEFI) Legacy Hardware (GPU nomodeset)" --class arch --class gnu-linux --class gnu --class os --id 'archlinux' { + set gfxpayload=keep + search --no-floppy --set=root --label %ARCHISO_LABEL% + linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=no cow_spacesize=1G module_blacklist=nvidia,nvidia_modeset,nvidia_uvm,nvidia_drm nomodeset + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } menuentry "CatOS install medium with speakup screen reader (x86_64, UEFI)" --hotkey s --class arch --class gnu-linux --class gnu --class os --id 'archlinux-accessibility' { set gfxpayload=keep search --no-floppy --set=root --label %ARCHISO_LABEL% linux /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on copytoram=no cow_spacesize=1G - initrd /%INSTALL_DIR%/boot/intel-ucode.img /%INSTALL_DIR%/boot/amd-ucode.img /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img + initrd /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img } if [ "${grub_platform}" == "efi" ]; then diff --git a/catos-iso/packages.x86_64 b/catos-iso/packages.x86_64 index 9fc386b..9bae125 100644 --- a/catos-iso/packages.x86_64 +++ b/catos-iso/packages.x86_64 @@ -1,24 +1,47 @@ alsa-utils amd-ucode -arch-install-scripts archinstall +arch-install-scripts +archlinux-appstream-data +ark b43-fwcutter base +base-devel bind +bluedevil +bluez brltty broadcom-wl btrfs-progs +catos-branding +catos-calamares +catos-calamares-config +catos-fcitx5-themes +catos-fcitx5-config +catos-fix-storage +catos-grub-theme-dark +catos-how +catos-html-wallpaper +catos-kde-settings +catos-kde-theme +catos-distroshelf +catos-ocr +catos-qrcode +catos-shortcut +catos-software-center +catos-wallpaper-effects clonezilla -#cloud-init +#corekeyboard cryptsetup darkhttpd ddrescue -dhclient dhcpcd diffutils +distrobox dmidecode dmraid dnsmasq +dolphin dosfstools e2fsprogs edk2-shell @@ -26,31 +49,58 @@ efibootmgr espeakup ethtool exfatprogs +eza f2fs-tools +fastfetch fatresize +fcitx5-chinese-addons +fcitx5-im +fcitx5-material-color +fcitx5-pinyin-moegirl +fcitx5-pinyin-zhwiki +firefox +firefox-i18n-zh-cn +fish +flatpak fsarchiver -gnu-netcat +fwupd gpart +gparted gpm gptfdisk grml-zsh-config grub +gtkmm3 +gwenview hdparm hyperv +imagemagick intel-ucode irssi iw iwd jfsutils +kate +kdeconnect +kdialog +ki18n5 +kio-admin kitty-terminfo +konsole +kwalletmanager +kwin-decoration-sierra-breeze-enhanced-for-catos less lftp +lib32-mesa +lib32-vulkan-intel +lib32-vulkan-radeon libfido2 libusb-compat linux linux-atm linux-firmware linux-firmware-marvell +linux-headers livecd-sounds lsscsi lvm2 @@ -61,181 +111,98 @@ mc mdadm memtest86+ memtest86+-efi +mesa mkinitcpio mkinitcpio-archiso mkinitcpio-nfs-utils modemmanager mtools -#nano +nano nbd ndisc6 nfs-utils nilfs-utils nmap +noto-fonts-emoji ntfs-3g nvme-cli -open-iscsi -open-vm-tools +octopi +okular openconnect +open-iscsi openssh +open-vm-tools openvpn +os-prober partclone parted partimage pcsclite +plasma +#plasma6-applets-panel-colorizer +podman +power-profiles-daemon ppp pptpclient pv +python-pip qemu-guest-agent +qt6-virtualkeyboard refind -#reflector -#reiserfsprogs rp-pppoe rsync rxvt-unicode-terminfo screen +sddm sdparm sg3_utils smartmontools sof-firmware +spectacle squashfs-tools sudo syslinux +system-config-printer systemd-resolvconf tcpdump +tela-icon-theme-git terminus-font testdisk +timeshift tmux tpm2-tss +ttf-jetbrains-mono +ttf-jetbrains-mono-nerd udftools +unrar usb_modeswitch usbmuxd usbutils vim -#virtualbox-guest-utils-nox # Replaced with virtualbox-guest-utils below +virtualbox-guest-utils vpnc +vulkan-intel +vulkan-radeon wireless-regdb wireless_tools wpa_supplicant +wqy-zenhei wvdial +xf86-input-vmmouse +xf86-video-amdgpu +xf86-input-elographics +xf86-input-evdev +xf86-input-libinput +xf86-input-synaptics +xf86-input-vmmouse +xf86-input-void +xf86-video-amdgpu +xf86-video-fbdev +xf86-video-qxl xfsprogs xl2tpd -zsh - -# everything above comes from archiso releng folder -####################################################### -### Cat OS ### -####################################################### -base-devel -python-pip yay -plasma -#plasma-wayland-session -konsole -dolphin -kate -sddm -wqy-zenhei -ark -okular -firefox -firefox-i18n-zh-cn -gwenview -fish -kwalletmanager -ttf-jetbrains-mono -imagemagick -#catos-aurorae -#papirus-icon-theme -catos-theme -catos-theme2 -#catos-plasmoids -#catos-services -#grub-theme-vimix-color-1080p-git -catos-grub-theme-dark -#klassy -#os-prober -linux-headers -kdialog -timeshift -octopi -unrar -kio-admin -kdeconnect -#catos-pkghello -spectacle -catos-ocr -catos-qrcode -catos-folder-color -catos-shortcut -catos-wallpaper-effects -catos-label -catos-fcitx5-themes -####################kde discover########################### -archlinux-appstream-data -packagekit-qt5 -#packagekit-qt6 -flatpak -fwupd -#######################vmware########################## -#gtkmm -#gtkmm3 -#open-vm-tools -#xf86-input-vmmouse -#xf86-video-vmware -####################################################### -#nvidia -#docker -######################fcitx5############################ -fcitx5-im -fcitx5-chinese-addons -fcitx5-pinyin-moegirl -fcitx5-pinyin-zhwiki -fcitx5-material-color -noto-fonts-emoji -####################################################### -catos-calamares -#alci-calamares -catos-calamares-config -####################Linux Box########################### -podman -distrobox -catos-linuxbox -catos-how -################Fix kde discover ############ -ocs-url -#qt5 -##kde6 -power-profiles-daemon -#panel custom -plasma6-applets-panel-colorizer -catos-html-wallpaper -kwin-decoration-sierra-breeze-enhanced-for-catos -#######bluetooth######## -bluez -bluedevil -#catos software center -ki18n5 -catos-software-center - -# =============== -# VM - VMware -# =========== -xf86-input-vmmouse -xf86-video-vmware -open-vm-tools -gtkmm3 - -# =============== -# VM - VirtualBox -# =============== -virtualbox-guest-utils - -# virtual keyboard -qt6-virtualkeyboard -corekeyboard - -system-config-printer -os-prober -tela-icon-theme-git -catos-fix-storage +zsh +chwd +nvidia-utils +nvidia-open diff --git a/catos-iso/pacman.conf b/catos-iso/pacman.conf index d78fff4..b7fa8b7 100644 --- a/catos-iso/pacman.conf +++ b/catos-iso/pacman.conf @@ -31,6 +31,7 @@ Architecture = auto # Misc options #UseSyslog Color +ILoveCandy #NoProgressBar # We cannot check disk space from within a chroot environment #CheckSpace @@ -86,8 +87,8 @@ Include = /etc/pacman.d/mirrorlist #[multilib-testing] #Include = /etc/pacman.d/mirrorlist -#[multilib] -#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. @@ -97,15 +98,20 @@ Include = /etc/pacman.d/mirrorlist [archlinuxcn] SigLevel = Never 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 = Never 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] +[catos-extra] SigLevel = Never -Server = https://pkgs.catos.info/$arch - - +Server = file:///var/catos-extra +[catos] +SigLevel = Never +Server = https://pkgs.catos.info/$arch \ No newline at end of file diff --git a/catos-iso/profiledef.sh b/catos-iso/profiledef.sh index 74ea97e..1c31761 100644 --- a/catos-iso/profiledef.sh +++ b/catos-iso/profiledef.sh @@ -8,19 +8,20 @@ iso_application="CatOS Live/Rescue CD" iso_version="$(date +%Y.%m.%d)" install_dir="arch" buildmodes=('iso') -bootmodes=('bios.syslinux.mbr' 'bios.syslinux.eltorito' - 'uefi-ia32.grub.esp' 'uefi-x64.grub.esp' - 'uefi-ia32.grub.eltorito' 'uefi-x64.grub.eltorito') +bootmodes=('bios.syslinux' 'uefi.grub') arch="x86_64" pacman_conf="pacman.conf" airootfs_image_type="squashfs" -#airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') +# airootfs_image_tool_options=('-comp' 'xz' '-Xbcj' 'x86' '-b' '1M' '-Xdict-size' '1M') airootfs_image_tool_options=('-comp' 'zstd') file_permissions=( ["/etc/shadow"]="0:0:400" ["/root"]="0:0:750" ["/root/.automated_script.sh"]="0:0:755" + ["/etc/pacman.d/scripts/customize_airootfs.sh"]="0:0:755" ["/usr/local/bin/choose-mirror"]="0:0:755" ["/usr/local/bin/Installation_guide"]="0:0:755" ["/usr/local/bin/livecd-sound"]="0:0:755" + ["/usr/local/bin/remove-nvidia"]="0:0:755" + ["/usr/local/bin/removeun"]="0:0:755" ) diff --git a/catos-iso/syslinux/archiso_pxe-linux.cfg b/catos-iso/syslinux/archiso_pxe-linux.cfg index 44c97a0..ab906ba 100644 --- a/catos-iso/syslinux/archiso_pxe-linux.cfg +++ b/catos-iso/syslinux/archiso_pxe-linux.cfg @@ -5,7 +5,7 @@ It allows you to install CatOS or perform system maintenance. ENDTEXT MENU LABEL CatOS install medium (x86_64, NBD) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% archiso_nbd_srv=${pxeserver} cms_verify=y copytoram=no SYSAPPEND 3 @@ -16,7 +16,7 @@ It allows you to install CatOS or perform system maintenance. ENDTEXT MENU LABEL CatOS install medium (x86_64, NFS) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_nfs_srv=${pxeserver}:/run/archiso/bootmnt cms_verify=y copytoram=no SYSAPPEND 3 @@ -27,6 +27,6 @@ It allows you to install CatOS or perform system maintenance. ENDTEXT MENU LABEL CatOS install medium (x86_64, HTTP) LINUX ::/%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD ::/%INSTALL_DIR%/boot/intel-ucode.img,::/%INSTALL_DIR%/boot/amd-ucode.img,::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD ::/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archiso_http_srv=http://${pxeserver}/ cms_verify=y copytoram=no SYSAPPEND 3 diff --git a/catos-iso/syslinux/archiso_sys-linux.cfg b/catos-iso/syslinux/archiso_sys-linux.cfg index 31ad48b..d71dc56 100644 --- a/catos-iso/syslinux/archiso_sys-linux.cfg +++ b/catos-iso/syslinux/archiso_sys-linux.cfg @@ -5,7 +5,7 @@ It allows you to install CatOS or perform system maintenance. ENDTEXT MENU LABEL CatOS install medium (x86_64, BIOS) LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% copytoram=no cow_spacesize=1G # Accessibility boot option @@ -16,5 +16,5 @@ It allows you to install CatOS or perform system maintenance with speech feedbac ENDTEXT MENU LABEL CatOS install medium (x86_64, BIOS) with ^speech LINUX /%INSTALL_DIR%/boot/x86_64/vmlinuz-linux -INITRD /%INSTALL_DIR%/boot/intel-ucode.img,/%INSTALL_DIR%/boot/amd-ucode.img,/%INSTALL_DIR%/boot/x86_64/initramfs-linux.img +INITRD /%INSTALL_DIR%/boot/x86_64/initramfs-linux.img APPEND archisobasedir=%INSTALL_DIR% archisolabel=%ARCHISO_LABEL% accessibility=on copytoram=no cow_spacesize=1G