ed
/
barzvoid
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Compare commits

base: ed:07b02f213a1854ac4e9066a474bf0f41bd68ed18
Branches Tags
ed:master
...
compare: ed:a5045303524b4e324273e8775aab9e8c002d1032
Branches Tags
ed:master

5 Commits
07b02f213a ... a504530352

Author SHA1 Message Date
ed barz a504530352 don't activate acpid service as it conflict with elogind 2020-10-30 13:48:21 +01:00
ed barz 061a1ab586 ask for root password at the end, just before new user to prevent install from halting 2020-10-30 13:47:24 +01:00
ed barz 09719f943f run dot-install.sh in nuser 2020-10-30 13:43:29 +01:00
ed barz f7c89fd48d clone dot files to /usr/local/src and install in post-install script 2020-10-30 13:42:26 +01:00
ed barz 6f48966afc htop added in post-install 2020-10-29 09:58:36 +01:00
3 changed files with 11 additions and 10 deletions
Show Stats Expand all files Collapse all files

12
Makefile
View File

@ -40,7 +40,6 @@ set-term:
set-root: set-root:
chroot $(MNTDIR) chown root:root / chroot $(MNTDIR) chown root:root /
chroot $(MNTDIR) chmod 755 / chroot $(MNTDIR) chmod 755 /
chroot $(MNTDIR) passwd root
set-resolv: set-resolv:
cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf.head cp files/resolv.conf.head $(MNTDIR)/etc/resolv.conf.head
@ -56,8 +55,6 @@ grub:
chroot $(MNTDIR) grub-mkconfig -o /boot/grub/grub.cfg chroot $(MNTDIR) grub-mkconfig -o /boot/grub/grub.cfg
chroot $(MNTDIR) grub-install $(BOOTLDR) chroot $(MNTDIR) grub-install $(BOOTLDR)
metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root set-keymap set-term grub
python: python:
$(call vinstall,python3 python3-pip python3-pipenv) $(call vinstall,python3 python3-pip python3-pipenv)
@ -85,12 +82,17 @@ post-install: tools
chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh chmod 755 $(MNTDIR)/usr/local/bin/first-boot.sh
chroot $(MNTDIR) /usr/local/bin/post-install.sh chroot $(MNTDIR) /usr/local/bin/post-install.sh
set-root-passwd:
chroot $(MNTDIR) passwd root
nuser: nuser:
chroot $(MNTDIR) useradd $(NUSRNAME) -G wheel,audio,lp,scanner chroot $(MNTDIR) useradd $(NUSRNAME) -G wheel,audio,lp,scanner
chroot $(MNTDIR) passwd $(NUSRNAME) chroot $(MNTDIR) passwd $(NUSRNAME)
#chroot $(MNTDIR) dot-install $(NUSRNAME) chroot $(MNTDIR) dot-install $(NUSRNAME)
laptop: metal python xorg audio wifi post-install nuser metal: mnt-drive mnt-system base set-loc set-resolv set-fstab set-root set-keymap set-term grub
laptop: metal python xorg audio wifi post-install set-root-passwd nuser
archive: archive:
tar -cvpjf void-fs.tar.bz2 \ tar -cvpjf void-fs.tar.bz2 \

1
first-boot.sh
View File

@ -1,6 +1,5 @@
#!/bin/sh #!/bin/sh
ln -s /etc/sv/acpid /var/service/
ln -s /etc/sv/dbus /var/service/ ln -s /etc/sv/dbus /var/service/
ln -s /etc/sv/NetworkManager /var/service/ ln -s /etc/sv/NetworkManager /var/service/

8
post-install.sh
View File

@ -1,14 +1,14 @@
#!/bin/sh #!/bin/sh
SDE_URL="https://git.brz9.dev/ed/sde.git" SDE_URL="https://git.brz9.dev/ed/sde.git"
#DOT_URL="https://git.brz9.dev/ed/dot.git" DOT_URL="https://git.brz9.dev/ed/dot.git"
WGT_URL="https://git.brz9.dev/ed/waterfox.git" WGT_URL="https://git.brz9.dev/ed/waterfox.git"
SRCPATH=/usr/local/src SRCPATH=/usr/local/src
git clone $SDE_URL $SRCPATH/sde git clone $SDE_URL $SRCPATH/sde
git clone $WGT_URL $SRCPATH/waterfox git clone $WGT_URL $SRCPATH/waterfox
#git clone $DOT_URL /usr/local/share/dot git clone $DOT_URL $SRCPATH/dot
#dependencies #dependencies
xbps-install -Sy libX11-devel libXft-devel libXinerama-devel imlib2-devel libexif-devel giflib-devel libXt-devel libXfixes-devel libXi-devel go ncurses-devel nfs-utils acpi font-awesome dejavu-fonts-ttf xbps-install -Sy libX11-devel libXft-devel libXinerama-devel imlib2-devel libexif-devel giflib-devel libXt-devel libXfixes-devel libXi-devel go ncurses-devel nfs-utils acpi font-awesome dejavu-fonts-ttf
@ -22,11 +22,11 @@ xbps-install -Sy libX11-devel libXft-devel libXinerama-devel imlib2-devel libexi
#waterfox deps #waterfox deps
xbps-install -Sy gtk+3-devel dbus-glib-devel adwaita-icon-theme xbps-install -Sy gtk+3-devel dbus-glib-devel adwaita-icon-theme
xbps-install -Sy fzf mpv cmus cmus-flac mupdf ffmpeg scrot picom dunst trash-cli unar xwallpaper gnupg2 ghostscript xbps-install -Sy fzf mpv cmus cmus-flac mupdf ffmpeg scrot picom dunst trash-cli unar xwallpaper gnupg2 ghostscript htop
make install -C $SRCPATH/sde/ make install -C $SRCPATH/sde/
make install -C $SRCPATH/waterfox/ make install -C $SRCPATH/waterfox/
#make install -C /usr/local/share/dot make install -C $SRCPATH/dot
#font-fix #font-fix
ln -s /usr/share/fontconfig/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d/ ln -s /usr/share/fontconfig/conf.avail/70-no-bitmaps.conf /etc/fonts/conf.d/