diff --git a/.linux_items/include/airootfs/etc/skel/.zlogin b/.linux_items/include/airootfs/etc/skel/.zlogin index 04b1316e..68868d8e 100644 --- a/.linux_items/include/airootfs/etc/skel/.zlogin +++ b/.linux_items/include/airootfs/etc/skel/.zlogin @@ -3,30 +3,6 @@ if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then # Connect to network and update hostname $HOME/.update_network - # Update settings if using i3 - if fgrep -q "i3" /proc/cmdline; then - sed -i -r 's/#(own_window_type override)/\1/' ~/.conkyrc - sed -i -r 's/openbox-session/i3/' ~/.xinitrc - fi - - # Update Conky - $HOME/.update_conky - - # Start X or HW-diags - if ! fgrep -q "nox" /proc/cmdline; then - # Kill Xorg after 30 seconds if it doesn't fully initialize - (sleep 30s; if ! [[ -f "/tmp/x_ok" ]]; then pkill '(Xorg|startx)'; fi) & - - # Try starting X - startx >/dev/null - - # Run Hw-Diags CLI if necessary - if ! [[ -f "/tmp/x_ok" ]]; then - echo "There was an issue starting Xorg, starting CLI interface..." - sleep 2s - hw-diags --cli - fi - else - hw-diags --cli - fi + # Start HW-diags + hw-diags --cli fi diff --git a/.linux_items/include/airootfs/etc/oblogout.conf b/.linux_items/include_x/airootfs/etc/oblogout.conf similarity index 100% rename from .linux_items/include/airootfs/etc/oblogout.conf rename to .linux_items/include_x/airootfs/etc/oblogout.conf diff --git a/.linux_items/include/airootfs/etc/skel/.Xresources b/.linux_items/include_x/airootfs/etc/skel/.Xresources similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.Xresources rename to .linux_items/include_x/airootfs/etc/skel/.Xresources diff --git a/.linux_items/include/airootfs/etc/skel/.config/Thunar/accels.scm b/.linux_items/include_x/airootfs/etc/skel/.config/Thunar/accels.scm similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/Thunar/accels.scm rename to .linux_items/include_x/airootfs/etc/skel/.config/Thunar/accels.scm diff --git a/.linux_items/include/airootfs/etc/skel/.config/Thunar/uca.xml b/.linux_items/include_x/airootfs/etc/skel/.config/Thunar/uca.xml similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/Thunar/uca.xml rename to .linux_items/include_x/airootfs/etc/skel/.config/Thunar/uca.xml diff --git a/.linux_items/include/airootfs/etc/skel/.config/dunst/dunstrc b/.linux_items/include_x/airootfs/etc/skel/.config/dunst/dunstrc similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/dunst/dunstrc rename to .linux_items/include_x/airootfs/etc/skel/.config/dunst/dunstrc diff --git a/.linux_items/include/airootfs/etc/skel/.config/gtk-3.0/settings.ini b/.linux_items/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/gtk-3.0/settings.ini rename to .linux_items/include_x/airootfs/etc/skel/.config/gtk-3.0/settings.ini diff --git a/.linux_items/include/airootfs/etc/skel/.config/i3/config b/.linux_items/include_x/airootfs/etc/skel/.config/i3/config similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/i3/config rename to .linux_items/include_x/airootfs/etc/skel/.config/i3/config diff --git a/.linux_items/include/airootfs/etc/skel/.config/i3status/config b/.linux_items/include_x/airootfs/etc/skel/.config/i3status/config similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/i3status/config rename to .linux_items/include_x/airootfs/etc/skel/.config/i3status/config diff --git a/.linux_items/include/airootfs/etc/skel/.config/mimeapps.list b/.linux_items/include_x/airootfs/etc/skel/.config/mimeapps.list similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/mimeapps.list rename to .linux_items/include_x/airootfs/etc/skel/.config/mimeapps.list diff --git a/.linux_items/include/airootfs/etc/skel/.config/openbox/autostart b/.linux_items/include_x/airootfs/etc/skel/.config/openbox/autostart similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/openbox/autostart rename to .linux_items/include_x/airootfs/etc/skel/.config/openbox/autostart diff --git a/.linux_items/include/airootfs/etc/skel/.config/openbox/environment b/.linux_items/include_x/airootfs/etc/skel/.config/openbox/environment similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/openbox/environment rename to .linux_items/include_x/airootfs/etc/skel/.config/openbox/environment diff --git a/.linux_items/include/airootfs/etc/skel/.config/openbox/menu.xml b/.linux_items/include_x/airootfs/etc/skel/.config/openbox/menu.xml similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/openbox/menu.xml rename to .linux_items/include_x/airootfs/etc/skel/.config/openbox/menu.xml diff --git a/.linux_items/include/airootfs/etc/skel/.config/openbox/rc.xml b/.linux_items/include_x/airootfs/etc/skel/.config/openbox/rc.xml similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/openbox/rc.xml rename to .linux_items/include_x/airootfs/etc/skel/.config/openbox/rc.xml diff --git a/.linux_items/include/airootfs/etc/skel/.config/rofi/config b/.linux_items/include_x/airootfs/etc/skel/.config/rofi/config similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/rofi/config rename to .linux_items/include_x/airootfs/etc/skel/.config/rofi/config diff --git a/.linux_items/include/airootfs/etc/skel/.config/tint2/tint2rc b/.linux_items/include_x/airootfs/etc/skel/.config/tint2/tint2rc similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/tint2/tint2rc rename to .linux_items/include_x/airootfs/etc/skel/.config/tint2/tint2rc diff --git a/.linux_items/include/airootfs/etc/skel/.config/volumeicon/volumeicon b/.linux_items/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.config/volumeicon/volumeicon rename to .linux_items/include_x/airootfs/etc/skel/.config/volumeicon/volumeicon diff --git a/.linux_items/include/airootfs/etc/skel/.conky_start b/.linux_items/include_x/airootfs/etc/skel/.conky_start similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.conky_start rename to .linux_items/include_x/airootfs/etc/skel/.conky_start diff --git a/.linux_items/include/airootfs/etc/skel/.conkyrc b/.linux_items/include_x/airootfs/etc/skel/.conkyrc similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.conkyrc rename to .linux_items/include_x/airootfs/etc/skel/.conkyrc diff --git a/.linux_items/include/airootfs/etc/skel/.gtkrc-2.0 b/.linux_items/include_x/airootfs/etc/skel/.gtkrc-2.0 similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.gtkrc-2.0 rename to .linux_items/include_x/airootfs/etc/skel/.gtkrc-2.0 diff --git a/.linux_items/include/airootfs/etc/skel/.update_conky b/.linux_items/include_x/airootfs/etc/skel/.update_conky similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.update_conky rename to .linux_items/include_x/airootfs/etc/skel/.update_conky diff --git a/.linux_items/include/airootfs/etc/skel/.update_x b/.linux_items/include_x/airootfs/etc/skel/.update_x similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.update_x rename to .linux_items/include_x/airootfs/etc/skel/.update_x diff --git a/.linux_items/include/airootfs/etc/skel/.wallpaper b/.linux_items/include_x/airootfs/etc/skel/.wallpaper similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.wallpaper rename to .linux_items/include_x/airootfs/etc/skel/.wallpaper diff --git a/.linux_items/include/airootfs/etc/skel/.xinitrc b/.linux_items/include_x/airootfs/etc/skel/.xinitrc similarity index 100% rename from .linux_items/include/airootfs/etc/skel/.xinitrc rename to .linux_items/include_x/airootfs/etc/skel/.xinitrc diff --git a/.linux_items/include_x/airootfs/etc/skel/.zlogin b/.linux_items/include_x/airootfs/etc/skel/.zlogin new file mode 100644 index 00000000..04b1316e --- /dev/null +++ b/.linux_items/include_x/airootfs/etc/skel/.zlogin @@ -0,0 +1,32 @@ +setterm -blank 0 -powerdown 0 2>/dev/null +if [ "$(fgconsole 2>/dev/null)" -eq "1" ]; then + # Connect to network and update hostname + $HOME/.update_network + + # Update settings if using i3 + if fgrep -q "i3" /proc/cmdline; then + sed -i -r 's/#(own_window_type override)/\1/' ~/.conkyrc + sed -i -r 's/openbox-session/i3/' ~/.xinitrc + fi + + # Update Conky + $HOME/.update_conky + + # Start X or HW-diags + if ! fgrep -q "nox" /proc/cmdline; then + # Kill Xorg after 30 seconds if it doesn't fully initialize + (sleep 30s; if ! [[ -f "/tmp/x_ok" ]]; then pkill '(Xorg|startx)'; fi) & + + # Try starting X + startx >/dev/null + + # Run Hw-Diags CLI if necessary + if ! [[ -f "/tmp/x_ok" ]]; then + echo "There was an issue starting Xorg, starting CLI interface..." + sleep 2s + hw-diags --cli + fi + else + hw-diags --cli + fi +fi diff --git a/.linux_items/include/airootfs/usr/share/applications/Hardware Diagnostics.desktop b/.linux_items/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop similarity index 100% rename from .linux_items/include/airootfs/usr/share/applications/Hardware Diagnostics.desktop rename to .linux_items/include_x/airootfs/usr/share/applications/Hardware Diagnostics.desktop diff --git a/.linux_items/include/airootfs/usr/share/applications/Hardware Information.desktop b/.linux_items/include_x/airootfs/usr/share/applications/Hardware Information.desktop similarity index 100% rename from .linux_items/include/airootfs/usr/share/applications/Hardware Information.desktop rename to .linux_items/include_x/airootfs/usr/share/applications/Hardware Information.desktop diff --git a/.linux_items/include/airootfs/usr/share/applications/NetworkTest.desktop b/.linux_items/include_x/airootfs/usr/share/applications/NetworkTest.desktop similarity index 100% rename from .linux_items/include/airootfs/usr/share/applications/NetworkTest.desktop rename to .linux_items/include_x/airootfs/usr/share/applications/NetworkTest.desktop diff --git a/.linux_items/packages/live_add b/.linux_items/packages/live_add index a6da5f71..85ea5489 100644 --- a/.linux_items/packages/live_add +++ b/.linux_items/packages/live_add @@ -1,86 +1,47 @@ aic94xx-firmware alsa-utils antiword -arandr -arc-gtk-theme bash-pipes bc bluez bluez-utils -cbatticon chntpw cmatrix colordiff -compton -conky cpio curl dmidecode dos2unix -dunst e2fsprogs -evince -feh -ffmpeg -firefox -gnome-keyring -gparted -gpicview-gtk3 -gsmartcontrol -hardinfo hexedit hfsprogs htop -i3-gaps -i3lock-fancy-git -i3status ldns -leafpad lha libewf -libinput linux-firmware lm_sensors lzip mdadm mediainfo -mesa-demos -mkvtoolnix-cli mprime -mpv ncdu -network-manager-applet networkmanager -noto-fonts -noto-fonts-cjk -oblogout -openbox-patched -otf-font-awesome-4 p7zip -papirus-icon-theme progsreiserfs python python-psutil python-requests -qemu-guest-agent reiserfsprogs rfkill rng-tools -rofi -rxvt-unicode +rxvt-unicode-terminfo smartmontools-svn speedtest-cli -spice-vdagent terminus-font testdisk-wip -thunar -tigervnc -tint2 -tk tmux tree -ttf-font-awesome-4 -ttf-inconsolata udevil udisks2 ufw @@ -88,23 +49,8 @@ unarj unrar unzip util-linux -veracrypt vim -virtualbox-guest-modules-arch -virtualbox-guest-utils -volumeicon wd719x-firmware wimlib -xarchiver -xf86-input-libinput -xf86-video-amdgpu -xf86-video-fbdev -xf86-video-nouveau -xf86-video-vesa -xorg-server -xorg-xdpyinfo -xorg-xev -xorg-xinit -xorg-xinput zip zsh diff --git a/.linux_items/packages/live_add_x b/.linux_items/packages/live_add_x new file mode 100644 index 00000000..ab7d23b3 --- /dev/null +++ b/.linux_items/packages/live_add_x @@ -0,0 +1,55 @@ +arandr +arc-gtk-theme +cbatticon +compton +conky +dunst +evince +feh +ffmpeg +firefox +gnome-keyring +gparted +gpicview-gtk3 +gsmartcontrol +hardinfo +i3-gaps +i3lock-fancy-git +i3status +leafpad +libinput +mesa-demos +mkvtoolnix-cli +mpv +network-manager-applet +noto-fonts +noto-fonts-cjk +oblogout +openbox-patched +otf-font-awesome-4 +papirus-icon-theme +qemu-guest-agent +rofi +rxvt-unicode +spice-vdagent +thunar +tigervnc +tint2 +tk +ttf-font-awesome-4 +ttf-inconsolata +veracrypt +virtualbox-guest-modules-arch +virtualbox-guest-utils +volumeicon +xarchiver +xf86-input-libinput +xf86-video-amdgpu +xf86-video-fbdev +xf86-video-nouveau +xf86-video-vesa +xorg-server +xorg-xdpyinfo +xorg-xev +xorg-xinit +xorg-xinput diff --git a/Build Linux b/Build Linux index 87e93e2d..52e060d2 100755 --- a/Build Linux +++ b/Build Linux @@ -119,6 +119,9 @@ function copy_live_env() { # Add items rsync -aI "$ROOT_DIR/.linux_items/include/" "$LIVE_DIR/" + if [[ "${1:-}" != "--minimal" ]]; then + rsync -aI "$ROOT_DIR/.linux_items/include_x/" "$LIVE_DIR/" + fi mkdir -p "$LIVE_DIR/airootfs/usr/local/bin" rsync -aI "$ROOT_DIR/.bin/Scripts/" "$LIVE_DIR/airootfs/usr/local/bin/" cp -a "$BUILD_DIR/main.py" "$LIVE_DIR/airootfs/usr/local/bin/settings/" @@ -195,6 +198,9 @@ function update_live_env() { sed -i "/$p/d" "$LIVE_DIR/packages.x86_64" done < "$ROOT_DIR/.linux_items/packages/live_remove" cat "$ROOT_DIR/.linux_items/packages/live_add" >> "$LIVE_DIR/packages.x86_64" + if [[ "${1:-}" != "--minimal" ]]; then + cat "$ROOT_DIR/.linux_items/packages/live_add_x" >> "$LIVE_DIR/packages.x86_64" + fi echo "[custom]" >> "$LIVE_DIR/pacman.conf" echo "SigLevel = Optional TrustAll" >> "$LIVE_DIR/pacman.conf" echo "Server = file://$REPO_DIR" >> "$LIVE_DIR/pacman.conf" @@ -213,10 +219,12 @@ function update_live_env() { rm -Rf "$SKEL_DIR/.oh-my-zsh/.git" curl -o "$SKEL_DIR/.oh-my-zsh/themes/lean.zsh-theme" https://raw.githubusercontent.com/miekg/lean/master/prompt_lean_setup - # Openbox theme - git clone --depth=1 https://github.com/addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes" - mkdir -p "$LIVE_DIR/airootfs/usr/share/themes" - cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$LIVE_DIR/airootfs/usr/share/themes/" + if [[ "${1:-}" != "--minimal" ]]; then + # Openbox theme + git clone --depth=1 https://github.com/addy-dclxvi/Openbox-Theme-Collections.git "$TEMP_DIR/ob-themes" + mkdir -p "$LIVE_DIR/airootfs/usr/share/themes" + cp -a "$TEMP_DIR/ob-themes/Triste-Orange" "$LIVE_DIR/airootfs/usr/share/themes/" + fi # Services sed -i -r 's/^(.*pacman-init.*)$/#NOPE#\1/' "$LIVE_DIR/airootfs/root/customize_airootfs.sh" @@ -259,13 +267,15 @@ function update_live_env() { # udevil fix echo "mkdir /media" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" - # VNC password - echo "mkdir '/home/$username/.vnc'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" - echo "echo '$TECH_PASSWORD' | vncpasswd -f > '/home/$username/.vnc/passwd'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" + if [[ "${1:-}" != "--minimal" ]]; then + # VNC password + echo "mkdir '/home/$username/.vnc'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" + echo "echo '$TECH_PASSWORD' | vncpasswd -f > '/home/$username/.vnc/passwd'" >> "$LIVE_DIR/airootfs/root/customize_airootfs.sh" - # Wallpaper - mkdir -p "$LIVE_DIR/airootfs/usr/share/wallpaper" - cp "$ROOT_DIR/Images/Linux.png" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in" + # Wallpaper + mkdir -p "$LIVE_DIR/airootfs/usr/share/wallpaper" + cp "$ROOT_DIR/Images/Linux.png" "$LIVE_DIR/airootfs/usr/share/wallpaper/burned.in" + fi } function update_repo() { @@ -386,6 +396,13 @@ case ${1:-} in echo Done ;; + -m|--prep-minimal-env) + load_settings --edit + copy_live_env --minimal + update_live_env --minimal + echo Done + ;; + -o|--build-iso) load_settings build_iso @@ -414,6 +431,7 @@ case ${1:-} in echo "Advanced options:" echo " -f --fix-perms Fix folder permissions" echo " -i --install-deps Install build dependencies" + echo " -m --prep-minimal-env Prep live & airootfs folders (minimal packages)" echo " -o --build-iso Build ISO (using current setup)" echo " -p --prep-live-env Prep live & airootfs folders" echo " -u --update-repo Update custom pacman repo"