From c61f8c13d7e05b3690f8462e208aa70dc4361b55 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Sat, 10 Feb 2024 16:34:09 +0100 Subject: [PATCH 1/9] overwrite colorls.sh --- files/etc/profile.d/colorls.sh | 0 1 file changed, 0 insertions(+), 0 deletions(-) create mode 100644 files/etc/profile.d/colorls.sh diff --git a/files/etc/profile.d/colorls.sh b/files/etc/profile.d/colorls.sh new file mode 100644 index 0000000..e69de29 From d2f06c67f6637c305e58e2076067fdc292b15483 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Sun, 11 Feb 2024 19:35:02 +0100 Subject: [PATCH 2/9] add cjk fonts --- packages.txt | 1 + 1 file changed, 1 insertion(+) diff --git a/packages.txt b/packages.txt index e8da16f..2f3bcd6 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 From abd89189bf29ec7d09d7ee998968668ae939ea2d Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Mon, 12 Feb 2024 16:27:24 +0100 Subject: [PATCH 3/9] change readme --- README.md | 2 -- 1 file changed, 2 deletions(-) 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. From 43684d8496683eb394dbc956b00f78dbe84fda8c Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 23 Feb 2024 10:55:42 +0100 Subject: [PATCH 4/9] switch to ncpamixer, reactivate tokyonight stuff --- packages.txt | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/packages.txt b/packages.txt index 2f3bcd6..5eb6eca 100644 --- a/packages.txt +++ b/packages.txt @@ -13,7 +13,7 @@ ffmpeg man-db pipewire wireplumber -pulsemixer +ncpamixer maim unclutter xcape @@ -71,8 +71,8 @@ ranger brave-bin ueberzug seahorse -# tokyonight-theme -# tokyonight-icons +tokyonight-theme +tokyonight-icons polkit font-firacode-nf-ttf cups @@ -88,3 +88,6 @@ ImageMagick simple-mtpfs docker socklog-void +perl-YAML +perl-JSON +perl-WWW-Curl From a9600b369e195d37dc19130ad0d5d593b28e2351 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 23 Feb 2024 14:57:10 +0100 Subject: [PATCH 5/9] update directories --- directories.txt | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) diff --git a/directories.txt b/directories.txt index 6ce4dd0..8082d33 100644 --- a/directories.txt +++ b/directories.txt @@ -5,8 +5,9 @@ .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 @@ -14,4 +15,3 @@ Downloads,755 Pictures,755 Pictures/Screenshots,755 Videos,755 -test,700 From a020d954c3c05b841d1bc062677b0f6036d1f135 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 23 Feb 2024 16:17:11 +0100 Subject: [PATCH 6/9] new sudoers rules --- files/etc/sudoers.d/brightness-notify | 1 - files/etc/sudoers.d/mount | 1 + files/etc/sudoers.d/sv | 1 + files/etc/sudoers.d/xbps | 1 + 4 files changed, 3 insertions(+), 1 deletion(-) create mode 100644 files/etc/sudoers.d/mount create mode 100644 files/etc/sudoers.d/sv create mode 100644 files/etc/sudoers.d/xbps 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 From b7ad8273bed67b86c96cb3e239fd65b8b5358967 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 23 Feb 2024 16:17:21 +0100 Subject: [PATCH 7/9] cleanup --- directories.txt | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) diff --git a/directories.txt b/directories.txt index 8082d33..2a9b5c9 100644 --- a/directories.txt +++ b/directories.txt @@ -1,6 +1,6 @@ .cache,755 .config/zsh/configs,755 -.config/X11/xsession.d,755 +.config/X11,755 .config/gnupg,700 .local/state,755 .local/log,755 @@ -12,6 +12,5 @@ Desktop,755 Documents,755 Downloads,755 -Pictures,755 Pictures/Screenshots,755 Videos,755 From b630ebc430d0dbc4f2886dbf08992a4cdef1540d Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 23 Feb 2024 16:19:33 +0100 Subject: [PATCH 8/9] add some more packages --- packages.txt | 5 +++++ 1 file changed, 5 insertions(+) diff --git a/packages.txt b/packages.txt index 5eb6eca..51886e1 100644 --- a/packages.txt +++ b/packages.txt @@ -91,3 +91,8 @@ socklog-void perl-YAML perl-JSON perl-WWW-Curl +ansible +thunderbird +ferdium +python3-ansible-lint +base-devel From 0543d7e5c538e47bfa4b84a71844f15904b83144 Mon Sep 17 00:00:00 2001 From: Luca Bilke Date: Fri, 23 Feb 2024 18:20:38 +0100 Subject: [PATCH 9/9] WIP: add user cron --- bootstrap.sh | 22 +++++++++++----------- files/var/spool/cron/ | 4 ++++ runsvdir-user | 9 --------- 3 files changed, 15 insertions(+), 20 deletions(-) create mode 100644 files/var/spool/cron/ delete mode 100644 runsvdir-user 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/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/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"