diff --git a/airootfs/etc/group b/airootfs/etc/group index 725b55e..7d05d17 100755 --- a/airootfs/etc/group +++ b/airootfs/etc/group @@ -1,8 +1,8 @@ root:x:0:root -adm:x:4:liveuser -wheel:x:10:liveuser -uucp:x:14:liveuser -nopasswdlogin:x:966:liveuser -rfkill:x:983:liveuser -sys:x:3:bin,liveuser -liveuser:x:1000: +adm:x:4:cachyos +wheel:x:10:cachyos +uucp:x:14:cachyos +nopasswdlogin:x:966:cachyos +rfkill:x:983:cachyos +sys:x:3:bin,cachyos +cachyos:x:1000: diff --git a/airootfs/etc/gshadow b/airootfs/etc/gshadow index 29a1e7b..2f136de 100755 --- a/airootfs/etc/gshadow +++ b/airootfs/etc/gshadow @@ -1,2 +1,2 @@ root:!*::root -liveuser:!*:: +cachyos:!*:: diff --git a/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig b/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig deleted file mode 100755 index 3159ec3..0000000 --- a/airootfs/etc/skel/.config/Kvantum/kvantum.kvconfig +++ /dev/null @@ -1,2 +0,0 @@ -[General] -theme=KvArc diff --git a/airootfs/etc/skel/.config/gtk-3.0/gtk.css b/airootfs/etc/skel/.config/gtk-3.0/gtk.css deleted file mode 100755 index 39bec62..0000000 --- a/airootfs/etc/skel/.config/gtk-3.0/gtk.css +++ /dev/null @@ -1,7 +0,0 @@ -window.xfce4-panel widget > box > button > image{ - padding: 0.2em 0.16em; -gtk-icon-transform: scale(0.8); -} - -window#whiskermenu-window treeview>* { - padding:0.2em 0.16em; -} diff --git a/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/airootfs/etc/skel/.config/gtk-3.0/settings.ini deleted file mode 100755 index 3012252..0000000 --- a/airootfs/etc/skel/.config/gtk-3.0/settings.ini +++ /dev/null @@ -1,16 +0,0 @@ -[Settings] -gtk-font-name=Noto Sans 10 -gtk-theme-name=Arc-Darker -gtk-icon-theme-name=Arc-X-D -gtk-cursor-theme-name=capitaine-cursors-light -gtk-cursor-theme-size=14 -gtk-toolbar-style=GTK_TOOLBAR_BOTH_HORIZ -gtk-toolbar-icon-size=GTK_ICON_SIZE_LARGE_TOOLBAR -gtk-button-images=1 -gtk-menu-images=1 -gtk-enable-event-sounds=0 -gtk-enable-input-feedback-sounds=0 -gtk-xft-antialias=1 -gtk-xft-hinting=1 -gtk-xft-hintstyle=hintfull -gtk-xft-rgba=none diff --git a/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf b/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf index 3905a1d..85caf3a 100755 --- a/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf +++ b/airootfs/etc/systemd/system/getty@tty1.service.d/autologin.conf @@ -3,4 +3,4 @@ [Service] ExecStart= -ExecStart=-/sbin/agetty --autologin liveuser --noclear %I 38400 linux +ExecStart=-/sbin/agetty --autologin cachyos --noclear %I 38400 linux diff --git a/packages.x86_64 b/packages.x86_64 index 381bdd6..72da364 100644 --- a/packages.x86_64 +++ b/packages.x86_64 @@ -277,9 +277,9 @@ calamares-branding-cachyos #rate-mirrors-bin mkinitcpio-openswap ckbcomp -cachyos-grub-theme -cachyos-nord-kde-theme-git -#cachyos-theming +#cachyos-grub-theme +#cachyos-nord-kde-theme-git +cachyos-theming paru yad #welcome diff --git a/run_before_squashfs.sh b/run_before_squashfs.sh index c830463..3491f6b 100755 --- a/run_before_squashfs.sh +++ b/run_before_squashfs.sh @@ -23,26 +23,26 @@ usermod -s /usr/bin/bash root cp -aT /etc/skel/ /root/ rm /root/xed.dconf chmod 700 /root -useradd -m -p \"\" -g users -G 'sys,rfkill,wheel' -s /bin/bash liveuser +useradd -m -p \"\" -g users -G 'sys,rfkill,wheel' -s /bin/bash cachyos git clone --single-branch https://gitlab.com/cachyos/liveuser-desktop-settings.git #git clone https://gitlab.com/cachyos/liveuser-desktop-settings.git cd liveuser-desktop-settings -rm -R /home/liveuser/.config -cp -R .config /home/liveuser/ -chown -R liveuser:liveuser /home/liveuser/.config -cp .xinitrc .xprofile .Xauthority /home/liveuser/ -chown liveuser:liveuser /home/liveuser/.xinitrc -chown liveuser:liveuser /home/liveuser/.xprofile -chown liveuser:liveuser /home/liveuser/.Xauthority -cp -R .local /home/liveuser/ -chown -R liveuser:liveuser /home/liveuser/.local -chmod +x /home/liveuser/.local/bin/* -cp user_pkglist.txt /home/liveuser/ -chown liveuser:liveuser /home/liveuser/user_pkglist.txt -rm /home/liveuser/.bashrc -cp .bashrc /home/liveuser/ -chown liveuser:liveuser /home/liveuser/.bashrc -cp LICENSE /home/liveuser/ +rm -R /home/cachyos/.config +cp -R .config /home/cachyos/ +chown -R cachyos:cachyos /home/cachyos/.config +cp .xinitrc .xprofile .Xauthority /home/cachyos/ +chown cachyos:cachyos /home/cachyos/.xinitrc +chown cachyos:cachyos /home/cachyos/.xprofile +chown cachyos:cachyos /home/cachyos/.Xauthority +cp -R .local /home/cachyos/ +chown -R cachyos:cachyos /home/cachyos/.local +chmod +x /home/cachyos/.local/bin/* +cp user_pkglist.txt /home/cachyos/ +chown cachyos:cachyos /home/cachyos/user_pkglist.txt +rm /home/cachyos/.bashrc +cp .bashrc /home/cachyos/ +chown cachyos:cachyos /home/cachyos/.bashrc +cp LICENSE /home/cachyos/ cd .. rm -R liveuser-desktop-settings chmod 755 /etc/sudoers.d @@ -90,7 +90,7 @@ echo 'GRUB_DISABLE_SUBMENU=y' >> /etc/default/grub rm /boot/grub/grub.cfg wget https://gitlab.com/cachyos/liveuser-desktop-settings/-/raw/master/dconf/xed.dconf dbus-launch dconf load / < xed.dconf -sudo -H -u liveuser bash -c 'dbus-launch dconf load / < xed.dconf' +sudo -H -u cachyos bash -c 'dbus-launch dconf load / < xed.dconf' rm xed.dconf chmod -R 700 /root chown root:root -R /root