Compare commits

..

No commits in common. "c0d40900dcb9ab1eebb04c45c282dba5f03b21fc" and "ab0c36ff5f6ecc8de68a02991756a78937b27379" have entirely different histories.

6 changed files with 11 additions and 54 deletions

View File

@ -16,6 +16,7 @@ make our own or extract (if feasible) kb selection and time zone selection to hi
overview of the installation process at the start overview of the installation process at the start
overall progress indication (step x out of y) overall progress indication (step x out of y)
look into roxterm as an alternative terminal look into roxterm as an alternative terminal
include arandr or something similar in fully featured desktop utils
deal with the entropy thing that runs after rc.shutdown deal with the entropy thing that runs after rc.shutdown
first run message in .xinitrc.d first run message in .xinitrc.d
- auto-removes itself - auto-removes itself
@ -23,25 +24,14 @@ first run message in .xinitrc.d
add online check to all the selections that need internet add online check to all the selections that need internet
sort out /etc/resolv.conf for the chroot sort out /etc/resolv.conf for the chroot
set keyboard layout for initramfs set keyboard layout for initramfs
tell user about expected GRUB error messaegs
disable suspend and hibernate
when shutting down, let Xorg exit first, then run `loginctl {poweroff,reboot}`
add polkit to common packages
https://github.com/aarnt/octoxbps
system-image
make all output appear on current TTY
sync before and after creating the image
package selections: package selections:
desktop desktop
icewm-full icewm-full
packages packages
-> audio applet -> volctl -> audio applet
-> system monitor, file browser, image viewer, text editor, archive manager -> system monitor, file browser, image viewer, text editor, archive manager
-> GUI package manager? GUI update manager? -> GUI package manager? GUI update manager?
-> notification daemon? -> notification daemon?
xscreensaver
blueman
-> BT support?
post-install post-install
add ultimate.bashrc add ultimate.bashrc
add backgrounds add backgrounds
@ -49,21 +39,16 @@ package selections:
kick off scripts in .xinitrc.d from .xinitrc kick off scripts in .xinitrc.d from .xinitrc
exec icewm-session from .xinitrc exec icewm-session from .xinitrc
add to .xinitrc.d add to .xinitrc.d
choose random background
start pipewire, pipewire-pulse, wireplumber start pipewire, pipewire-pulse, wireplumber
start conky start conky
start nm-applet, audio applet start nm-applet, audio applet
display README display README
start xscreensaver
start blueman
put README.txt with relevant information on root dir of F2FS partition put README.txt with relevant information on root dir of F2FS partition
symlink to /home/README.txt symlink to /home/README.txt
add a symlink ~/.local/bin/xterm that points to lxterminal add a symlink ~/.local/bin/xterm that points to lxterminal
configure icewm configure icewm
startup script
choose random background
configuration
configure conky configure conky
configure xscreensaver
icewm-lite icewm-lite
post-install post-install
add ultimate.bashrc add ultimate.bashrc
@ -104,6 +89,7 @@ Stage 2:
-> useradd --groups "comma,separated,groups" --create-home --shell /bin/bash $USERNAME -> useradd --groups "comma,separated,groups" --create-home --shell /bin/bash $USERNAME
-> groups: dialout users wheel -> groups: dialout users wheel
-> ?? groups: -> ?? groups:
-> video - Can use GUI? Can use webcam?
-> cdrom optical - can listen to CDs? Can watch DVDs? Can mount / unmount CDs/DVDs? -> cdrom optical - can listen to CDs? Can watch DVDs? Can mount / unmount CDs/DVDs?
-> storage - can mount / unmount disks from GUI? -> storage - can mount / unmount disks from GUI?
-> scanner - can scan things (for example using XSane?) -> scanner - can scan things (for example using XSane?)

View File

@ -1,3 +1 @@
resources/common_packages resources/common_packages
resources/xinitrc
resources/bashrc

View File

@ -6,7 +6,7 @@ function check {
DESCRIPTION="Fully featured desktop with IceWM" DESCRIPTION="Fully featured desktop with IceWM"
# TODO # TODO
PACKAGES="$(cat /opt/void-usb/installer/package_selections/desktop/resources/common_packages) pavucontrol network-manager-applet vlc lxterminal bash-completion gufw conky icewm firefox arandr" PACKAGES="$(cat /opt/void-usb/installer/package_selections/desktop/resources/common_packages) pavucontrol network-manager-applet vlc lxterminal bash-completion gufw conky icewm firefox"
function post_install { function post_install {
echo "desktop/icewm-light" >> /tmp/stage-2-choices echo "desktop/icewm-light" >> /tmp/stage-2-choices

View File

@ -1,18 +0,0 @@
#!/bin/sh
if grep -F ".local/bin" <<< "$PATH"; then
true
else
PATH="$HOME/.local/bin:$PATH"
fi
export PATH
if [ -d "$HOME/.xinitrc.d" ]; then
for FILE in "$HOME/.xinitrc.d"/*; do
[ -x "$FILE" ] && "$FILE" &
done
fi
# The line below is placed by the package selection script.

View File

@ -2,15 +2,12 @@
# ========== # ==========
# things to always set up, even for non-interactive shells # things to always set up, even for non-interactive shells
# Fuck vi!
EDITOR=nano EDITOR=nano
# On FreeBSD this is being set for whatever reason in the other shell rc files. I'll leave it here for compatibility.
PAGER=less PAGER=less
# add a user-specific bin directory to PATH
if grep -F ".local/bin" <<< "$PATH"; then PATH=$HOME/.local/bin:$PATH
true
else
PATH="$HOME/.local/bin:$PATH"
fi
export EDITOR PAGER PATH export EDITOR PAGER PATH
# CHECK INTERACTIVE # CHECK INTERACTIVE
@ -21,14 +18,6 @@ case $- in
*) return ;; *) return ;;
esac esac
# START XORG
# ==========
# TODO
# check if login shell
# if yes, check if .xinitrc exists
# if yes, check if xorg is already running
# if no, startx
# ALIASES # ALIASES
# ======= # =======
alias aliases="nano $HOME/.bashrc_aliases && source $HOME/.bashrc_aliases" alias aliases="nano $HOME/.bashrc_aliases && source $HOME/.bashrc_aliases"

2
skel/xinitrc Normal file
View File

@ -0,0 +1,2 @@
#TODO: open user-readme once and then never again
#TODO: check which software selection of Void-USB has been installed and start the appropriate things