added packages, some cosmetics, replaced zenity
This commit is contained in:
parent
43d0e1479a
commit
ecca375059
4 changed files with 32 additions and 34 deletions
|
@ -6,7 +6,7 @@
|
||||||
### 2023
|
### 2023
|
||||||
|
|
||||||
CHROOTCMD="sudo chroot build/chroot/"
|
CHROOTCMD="sudo chroot build/chroot/"
|
||||||
VERSION="$(git describe --tags)" #-$(git rev-parse --short HEAD)"
|
test -n "$VERSION" || VERSION="$(git describe --tags)" #-$(git rev-parse --short HEAD)"
|
||||||
|
|
||||||
MIRROR=$1
|
MIRROR=$1
|
||||||
if [ -z "$MIRROR" ]
|
if [ -z "$MIRROR" ]
|
||||||
|
@ -50,8 +50,6 @@ error ()
|
||||||
}
|
}
|
||||||
|
|
||||||
message "installing requirements"
|
message "installing requirements"
|
||||||
# ~fakeroot fakechroot~
|
|
||||||
# debootstrap chroot
|
|
||||||
### https://www.willhaley.com/blog/custom-debian-live-environment/
|
### https://www.willhaley.com/blog/custom-debian-live-environment/
|
||||||
sudo apt install \
|
sudo apt install \
|
||||||
debootstrap \
|
debootstrap \
|
||||||
|
@ -131,6 +129,7 @@ test -f build/staging/live/filesystem.squashfs && sudo rm build/staging/live/fil
|
||||||
sudo mksquashfs \
|
sudo mksquashfs \
|
||||||
build/chroot \
|
build/chroot \
|
||||||
build/staging/live/filesystem.squashfs \
|
build/staging/live/filesystem.squashfs \
|
||||||
|
-comp xz \
|
||||||
-e boot || error
|
-e boot || error
|
||||||
|
|
||||||
message "copy kernel and initrd images"
|
message "copy kernel and initrd images"
|
||||||
|
|
|
@ -5,10 +5,10 @@
|
||||||
<RootMenu onroot="12">
|
<RootMenu onroot="12">
|
||||||
<!-- <Include>/etc/jwm/debian-menu</Include> -->
|
<!-- <Include>/etc/jwm/debian-menu</Include> -->
|
||||||
<Include>exec: xdgmenumaker -n -i -f jwm</Include>
|
<Include>exec: xdgmenumaker -n -i -f jwm</Include>
|
||||||
<Program icon="terminal.png" label="Terminal">xterm</Program>
|
<Program icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg" label="Display settings">arandr</TrayButton>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Program icon="lock.png" label="Lock">
|
<Program icon="lock.png" label="Lock">
|
||||||
xlock -mode blank
|
xscreensaver-command -lock
|
||||||
</Program>
|
</Program>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Restart label="Restart JWM" icon="restart.png"/>
|
<Restart label="Restart JWM" icon="restart.png"/>
|
||||||
|
@ -17,10 +17,10 @@
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Separator/>
|
<Separator/>
|
||||||
<Program label="Reboot" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg">
|
<Program label="Reboot" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-synchronizing-symbolic.svg">
|
||||||
zenity --question --text="Reboot?" --no-markup --default-cancel && systemctl reboot
|
gxmessage "Reboot?" -title "Reboot?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl reboot
|
||||||
</Program>
|
</Program>
|
||||||
<Program label="Shutdown" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-system-symbolic.svg">
|
<Program label="Shutdown" icon="/usr/share/icons/Adwaita/scalable/emblems/emblem-system-symbolic.svg">
|
||||||
zenity --question --text="Shutdown?" --no-markup --default-cancel && systemctl poweroff
|
gxmessage "Shutdown?"-title "Shutdown?" -center -buttons Yes:0,No:1 -default No -font "bold 14" && systemctl reboot
|
||||||
</Program>
|
</Program>
|
||||||
|
|
||||||
</RootMenu>
|
</RootMenu>
|
||||||
|
@ -57,14 +57,8 @@
|
||||||
<Spacer width="2"/>
|
<Spacer width="2"/>
|
||||||
<TrayButton popup="Firefox" icon="/usr/share/icons/hicolor/32x32/apps/firefox-esr.png">exec:firefox</TrayButton>
|
<TrayButton popup="Firefox" icon="/usr/share/icons/hicolor/32x32/apps/firefox-esr.png">exec:firefox</TrayButton>
|
||||||
<Spacer width="2"/>
|
<Spacer width="2"/>
|
||||||
<TrayButton popup="Transmission" icon="/usr/share/icons/hicolor/scalable/apps/transmission.svg">exec:transmission-gtk</TrayButton>
|
|
||||||
<Spacer width="2"/>
|
|
||||||
<TrayButton popup="X File Explorer" icon="/usr/share/pixmaps/xfe.xpm">exec:xfe</TrayButton>
|
|
||||||
<Spacer width="2"/>
|
|
||||||
<TrayButton popup="PCManFM" icon="/usr/share/icons/Adwaita/32x32/legacy/system-file-manager.png">exec:pcmanfm</TrayButton>
|
<TrayButton popup="PCManFM" icon="/usr/share/icons/Adwaita/32x32/legacy/system-file-manager.png">exec:pcmanfm</TrayButton>
|
||||||
<Spacer width="2"/>
|
<Spacer width="2"/>
|
||||||
<TrayButton popup="ARandR" icon="/usr/share/icons/Adwaita/scalable/devices/video-display-symbolic.svg">exec:arandr</TrayButton>
|
|
||||||
<Spacer width="2"/>
|
|
||||||
|
|
||||||
|
|
||||||
<Pager labeled="true"/>
|
<Pager labeled="true"/>
|
||||||
|
@ -124,8 +118,8 @@
|
||||||
</PagerStyle>
|
</PagerStyle>
|
||||||
<MenuStyle>
|
<MenuStyle>
|
||||||
<Font>Sans-9</Font>
|
<Font>Sans-9</Font>
|
||||||
<Foreground>#FFFFFF</Foreground>
|
<Foreground>#111111</Foreground>
|
||||||
<Background>#333333</Background>
|
<Background>#777888</Background>
|
||||||
<Outline>#000000</Outline>
|
<Outline>#000000</Outline>
|
||||||
<Active>
|
<Active>
|
||||||
<Foreground>#FFFFFF</Foreground>
|
<Foreground>#FFFFFF</Foreground>
|
||||||
|
@ -244,6 +238,7 @@
|
||||||
<Key mask="A" key="Up">udesktop</Key>
|
<Key mask="A" key="Up">udesktop</Key>
|
||||||
<Key mask="A" key="Down">ddesktop</Key>
|
<Key mask="A" key="Down">ddesktop</Key>
|
||||||
<StartupCommand>$(find ~/.screenlayout/ -type f -executable|head -n 1)</StartupCommand>
|
<StartupCommand>$(find ~/.screenlayout/ -type f -executable|head -n 1)</StartupCommand>
|
||||||
<StartupCommand>zenity --text-info --html --width=640 --height=480 --filename=/usr/share/nanodesk/firstlogin/welcome.html</StartupCommand>
|
<StartupCommand>xscreensaver -no-splash</StartupCommand>
|
||||||
|
<StartupCommand>gxmessage -center -file /usr/share/nanodesk/firstlogin/welcome.md -title "Welcome to nanodesk"</StartupCommand>
|
||||||
|
|
||||||
</JWM>
|
</JWM>
|
||||||
|
|
|
@ -1,2 +1,3 @@
|
||||||
apt install -y \
|
apt install -y \
|
||||||
audacious
|
transmission \
|
||||||
|
audacious
|
||||||
|
|
|
@ -50,26 +50,28 @@ apt update || error
|
||||||
|
|
||||||
### packages
|
### packages
|
||||||
message "install nanodesk base packages"
|
message "install nanodesk base packages"
|
||||||
apt install -y \
|
apt install -y \
|
||||||
live-boot \
|
live-boot \
|
||||||
|
dialog \
|
||||||
|
sudo \
|
||||||
|
console-data \
|
||||||
|
locales \
|
||||||
|
man \
|
||||||
grub-pc \
|
grub-pc \
|
||||||
ifupdown \
|
ifupdown \
|
||||||
net-tools \
|
net-tools \
|
||||||
|
isc-dhcp-client \
|
||||||
|
host \
|
||||||
wireless-tools \
|
wireless-tools \
|
||||||
wpagui \
|
wpagui \
|
||||||
isc-dhcp-client \
|
|
||||||
man \
|
|
||||||
console-data \
|
|
||||||
locales \
|
|
||||||
sudo \
|
|
||||||
xserver-xorg \
|
xserver-xorg \
|
||||||
jwm \
|
xscreensaver \
|
||||||
xdm \
|
xfonts-75dpi \
|
||||||
|
xfonts-100dpi \
|
||||||
xterm \
|
xterm \
|
||||||
|
xdm \
|
||||||
|
jwm \
|
||||||
xfe \
|
xfe \
|
||||||
pcmanfm \
|
|
||||||
htop \
|
|
||||||
host \
|
|
||||||
mc \
|
mc \
|
||||||
wget \
|
wget \
|
||||||
curl \
|
curl \
|
||||||
|
@ -77,14 +79,15 @@ apt install -y \
|
||||||
rsync \
|
rsync \
|
||||||
vim \
|
vim \
|
||||||
links2 \
|
links2 \
|
||||||
firefox-esr \
|
|
||||||
transmission-gtk \
|
|
||||||
lxterminal \
|
|
||||||
arandr \
|
|
||||||
zenity \
|
|
||||||
ncdu \
|
ncdu \
|
||||||
gparted \
|
htop \
|
||||||
git \
|
git \
|
||||||
|
gxmessage \
|
||||||
|
arandr \
|
||||||
|
lxterminal \
|
||||||
|
gparted \
|
||||||
|
firefox-esr \
|
||||||
|
pcmanfm \
|
||||||
/tmp/xdgmenumaker*.deb || error
|
/tmp/xdgmenumaker*.deb || error
|
||||||
|
|
||||||
######
|
######
|
||||||
|
|
Loading…
Reference in a new issue