diff --git a/README.md b/README.md index f73965a..e968687 100644 --- a/README.md +++ b/README.md @@ -5,6 +5,4 @@ This script is meant to be run on a fresh install of void linux and will set up ## Warnings ___Please note that this script will add my custom XBPS repository and install packages from it.___ - I use the dvorak keyboard layout, so many of the DWM keybinds may be unergonomic on a QWERTY layout. -The source code for my build of DWM is available [here](https://github.com/ssnailed/dwm) if you wish to make any configuration changes. diff --git a/bootstrap.sh b/bootstrap.sh index 898ae32..6274c67 100755 --- a/bootstrap.sh +++ b/bootstrap.sh @@ -194,17 +194,17 @@ select_keymap() { } enable_services() { - tput sc - info "Installing user service service..." - target="/etc/sv/runsvdir-${username}" - mkdir -p "$target" - sed "s//$username/" "${SCRIPT_DIR}/runsvdir-user" >"$target/run" - [ ! -L "/var/service/$(basename "$target")" ] && - ln -s "$target" "/var/service/" - chmod 755 "$target" - chmod 755 "$target/run" - tput rc - tput el + # tput sc + # info "Installing user service service..." + # target="/etc/sv/runsvdir-${username}" + # mkdir -p "$target" + # sed "s//$username/" "${SCRIPT_DIR}/runsvdir-user" >"$target/run" + # [ ! -L "/var/service/$(basename "$target")" ] && + # ln -s "$target" "/var/service/" + # chmod 755 "$target" + # chmod 755 "$target/run" + # tput rc + # tput el #shellcheck disable=SC2016 _loop_wrapper "$1" \ 'Enabling ${x} service' \ diff --git a/directories.txt b/directories.txt index 6ce4dd0..2a9b5c9 100644 --- a/directories.txt +++ b/directories.txt @@ -1,17 +1,16 @@ .cache,755 .config/zsh/configs,755 -.config/X11/xsession.d,755 +.config/X11,755 .config/gnupg,700 .local/state,755 .local/log,755 .local/share/applications,755 -.local/bin/cron,755 -.local/libexec/dwm/autostart.d,755 +.local/libexec/cron,755 +.config/dwm/autorun.d,755 +.local/sv,755 .ssh,700 Desktop,755 Documents,755 Downloads,755 -Pictures,755 Pictures/Screenshots,755 Videos,755 -test,700 diff --git a/files/etc/profile.d/colorls.sh b/files/etc/profile.d/colorls.sh new file mode 100644 index 0000000..e69de29 diff --git a/files/etc/sudoers.d/brightness-notify b/files/etc/sudoers.d/brightness-notify index 2c68b5e..372995d 100644 --- a/files/etc/sudoers.d/brightness-notify +++ b/files/etc/sudoers.d/brightness-notify @@ -1,2 +1 @@ %wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/tee /sys/class/backlight/*/brightness -%wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/tee /sys/class/backlight/*/brightness diff --git a/files/etc/sudoers.d/mount b/files/etc/sudoers.d/mount new file mode 100644 index 0000000..2d88798 --- /dev/null +++ b/files/etc/sudoers.d/mount @@ -0,0 +1 @@ +%wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/mount, /usr/bin/umount diff --git a/files/etc/sudoers.d/sv b/files/etc/sudoers.d/sv new file mode 100644 index 0000000..83c465e --- /dev/null +++ b/files/etc/sudoers.d/sv @@ -0,0 +1 @@ +%wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/vsv, /usr/bin/svlogtail diff --git a/files/etc/sudoers.d/xbps b/files/etc/sudoers.d/xbps new file mode 100644 index 0000000..7868565 --- /dev/null +++ b/files/etc/sudoers.d/xbps @@ -0,0 +1 @@ +%wheel ALL=(ALL:ALL) NOPASSWD: /usr/bin/xbps-install, /usr/bin/xbps-remove, /usr/bin/xi diff --git a/files/var/spool/cron/ b/files/var/spool/cron/ new file mode 100644 index 0000000..b264369 --- /dev/null +++ b/files/var/spool/cron/ @@ -0,0 +1,4 @@ +*/15 * * * * . $HOME/.local/share/cronprofile; trash-prune +0 * * * * . $HOME/.local/share/cronprofile; checkup +15 * * * * . xlocate -S +30 * * * * . $HOME/.local/share/cronprofile; backup >$HOME/.local/log/backup.log 2>&1 diff --git a/packages.txt b/packages.txt index e0badfd..eb782bd 100644 --- a/packages.txt +++ b/packages.txt @@ -4,6 +4,7 @@ stow zsh xorg noto-fonts-ttf +noto-fonts-cjk noto-fonts-ttf-extra noto-fonts-emoji nsxiv @@ -12,7 +13,7 @@ ffmpeg man-db pipewire wireplumber -pulsemixer +ncpamixer maim unclutter xcape @@ -70,8 +71,8 @@ ranger brave-bin ueberzug seahorse -# tokyonight-theme -# tokyonight-icons +tokyonight-theme +tokyonight-icons polkit font-firacode-nf-ttf cups @@ -87,8 +88,13 @@ ImageMagick simple-mtpfs docker socklog-void -perl perl-YAML -perl-WWW-curl +perl-JSON +perl-WWW-Curl +ansible +thunderbird +ferdium +python3-ansible-lint +base-devel vsv lynx diff --git a/runsvdir-user b/runsvdir-user deleted file mode 100644 index c50199a..0000000 --- a/runsvdir-user +++ /dev/null @@ -1,9 +0,0 @@ -#!/bin/sh - -export USER="" -export HOME="/home/" - -groups="$(id -Gn "$USER" | tr ' ' ':')" -svdir="$HOME/.local/sv/" - -exec chpst -u "$USER:$groups" runsvdir "$svdir"