From 90982f82fd8bc33255190e4d45cd63f6cc754cf4 Mon Sep 17 00:00:00 2001 From: acidvegas Date: Tue, 16 Jul 2024 17:39:19 -0400 Subject: [PATCH] Removed nano command from installer --- enterthevoid | 2 -- setup | 6 +++++- xorg/.xinitrc | 2 +- 3 files changed, 6 insertions(+), 4 deletions(-) diff --git a/enterthevoid b/enterthevoid index 753856c..ec5c9a0 100755 --- a/enterthevoid +++ b/enterthevoid @@ -192,8 +192,6 @@ setup_chroot() { if [ $BOOT_OPTION = "UEFI" ]; then xbps-install gummiboot gummiboot install - nano /boot/loader/void-options.conf - xbps-reconfigure -f linux$(unamer -r) # Optional, copy the EFI /boot/efi/EFI/boot/bootx64.efi to for tricking compatability elif [ $BOOT_OPTION = "BIOS" ]; then xbps-install grub diff --git a/setup b/setup index 3d9aa22..87fb586 100755 --- a/setup +++ b/setup @@ -70,13 +70,14 @@ setup_packages() { #setup_nonfree if [ $DISPLAY_SERVER = "xorg" ]; then + #xbps-install -y mesa-dri # Raspberry Pi xbps-install -y xorg libX11 libX11-devel libXft libXft-devel libXinerama libXinerama-devel libXrandr libXrandr-devel xbacklight xrandr xbps-install -y alacritty dmenu dunst firefox pinentry-dmenu redshift scrot unclutter xclip xbps-install -y ohsnap-font font-unifont-bdf freefont-ttf noto-fonts-ttf noto-fonts-ttf-extra noto-fonts-cjk noto-fonts-emoji # These fonts give you the most unicode support coverage fi # Development - if [ ! $ARCH = 'x86_64' ]; then + if [ $ARCH = 'x86_64' ]; then xbps-install -y gcc fi xbps-install -y checkbashisms go make patch pkg-config python3 python3-pip @@ -84,6 +85,9 @@ setup_packages() { # Essentials xbps-install -y curl dropbear git jq progress rsync socklog-void tmux tor tree unzip zip + # Raspberry Pi specific + xbps-install -y rng-tools && ln -sfv /etc/sv/rngd /var/service/ && sv up rngd + xbps-install -y bandwhich bpfmon glow gnupg2-scdaemon lxc incus incus-client incus-tools lazygit oath-toolkit websocat #xbps-install -y earlyoom && ln -sfv /etc/sv/earlyoom /var/service/ diff --git a/xorg/.xinitrc b/xorg/.xinitrc index c80e5db..4adad18 100644 --- a/xorg/.xinitrc +++ b/xorg/.xinitrc @@ -14,6 +14,6 @@ $HOME/.scripts/statusbar.sh & # Example rotation #{ sleep 2; xrandr --output DSI-1 --rotate right; } & -redshift -P -O 4000 & +redshift -P -O 4000 & # How do we get this working on DSI-1 with the uConsole ? exec dwm