void

- enter the void 🪐
git clone git://git.acid.vegas/archlinux.git
Log | Files | Refs | Archive

commit f41d67cb2638ac94ba5381f21b80e1e70e32589c
parent f09943b668f88652d3fd6de219de6453e8538acc
Author: acidvegas <acid.vegas@acid.vegas>
Date: Fri, 29 Nov 2024 03:15:53 -0500

Various changes

Diffstat:
MKEYS.md | 26++++++++++++++------------
Mconfig/X11/xinitrc | 2+-
Mconfig/alacritty/alacritty.toml | 2+-
Rconfig/git/gitconfig -> config/git/config | 0
Mconfig/tmux/tmux.conf | 1-
Mdwm/config.h | 7++++---
Menterthevoid | 1+
Menterthezoid | 15+++++++--------
Mlocal/bin/scripts/gotimon | 0
Mlocal/bin/scripts/irc-post-commit-hook | 7+++----
Mlocal/share/bash/bash_aliases | 16++++++++--------
Mlocal/share/bash/bash_fun | 4++--
Mlocal/share/bash/bash_functions | 19+++++++++++++++----
Msetup | 87+++++++++++++++++++++++++++++++++++++++++--------------------------------------

14 files changed, 101 insertions(+), 86 deletions(-)

diff --git a/KEYS.md b/KEYS.md
@@ -1,16 +1,18 @@
 # DWM
-| Key              | Description                   |
-| ---------------- | ----------------------------- |
-| `W + h`          | Toggle statusbar              |
-| `W + k`          | Kill window                   |
-| `W + q`          | Quit                          |
-| `W + r`          | Dmenu                         |
-| `W + #`          | Switch to nth workspace       |
-| `W + s + #`      | Move program to nth workspace |
-| `W + Enter`      | Spawn a terminal              |
-| `W + Print`      | Take a scrot                  |
-| `W + Down/Up`    | Inc/Dec vertical  layout      |
-| `W + Left/Right` | Inc/Dec horizonal layout      |
+| Key                    | Description                   |
+| ---------------------- | ----------------------------- |
+| `W + h`                | Toggle statusbar              |
+| `W + k`                | Kill window                   |
+| `W + q`                | Quit                          |
+| `W + r`                | Dmenu                         |
+| `W + #`                | Switch to nth workspace       |
+| `W + Shift + #`        | Move program to nth workspace |
+| `W + Enter`            | Spawn a terminal              |
+| `W + Print`            | Take a scrot                  |
+| `W + Down/Up`          | Inc/Dec vertical  layout      |
+| `W + Left/Right`       | Inc/Dec horizonal layout      |
+| `W + Click Drag`       | Move window                   |
+| `W + Right Click Drag` | Resize window                 |
 
 # TMUX
 | Key                  | Description                   |
diff --git a/config/X11/xinitrc b/config/X11/xinitrc
@@ -6,7 +6,7 @@ xset fp rehash
 
 dunst &
 unclutter &
-$HOME/.scripts/statusbar.sh &
+$HOME/.scripts/statusbar &
 
 # Example of dual monitor setup
 #{ sleep 2; xrandr --output HDMI1 --mode 1920x1080 --output DP1 --mode 1920x1080 --above HDMI1; } &
diff --git a/config/alacritty/alacritty.toml b/config/alacritty/alacritty.toml
@@ -74,6 +74,6 @@ mods = "Control"
 [selection]
 save_to_clipboard = true
 
-[shell]
+[terminal.shell]
 args = ["new-session"]
 program = "/usr/bin/tmux"
diff --git a/config/git/gitconfig b/config/git/config
diff --git a/config/tmux/tmux.conf b/config/tmux/tmux.conf
@@ -30,7 +30,6 @@ set -g status-right "#[fg=yellow]#H#[default] | #[fg=cyan]Disk:#[default] #(df -
 
 setw -g window-status-current-style fg=cyan,bg=default
 setw -g window-status-activity-style fg=yellow,bg=default
-setw -g window-status-style fg=grey,bg=black
 setw -g window-status-format "#I: #W"
 setw -g window-status-current-format "#[bold]#I: #W"
 
diff --git a/dwm/config.h b/dwm/config.h
@@ -39,8 +39,8 @@ static const char *volume_toggle[]  = { "pactl", "set-sink-mute", "0", "toggle",
 static const char *volume_down[]    = { "amixer", "-q", "set", "Master", "10-", NULL };
 static const char *volume_up[]      = { "amixer", "-q", "set", "Master", "10+", NULL };
 static const char *music_toggle[]   = { "cmus-remote", "-u", NULL };
-static const char *backlight_down[] = { "xbacklight", "-dec", "10", NULL };
-static const char *backlight_up[]   = { "xbacklight", "-inc", "10", NULL };
+static const char *backlight_down[] = { "brightnessctl", "s", "10%-", NULL };
+static const char *backlight_up[]   = { "brightnessctl", "s", "+10%", NULL };
 
 static Key keys[] = {
 	{ MODKEY, XK_Return,             spawn,      {.v = termcmd } },
@@ -59,7 +59,7 @@ static Key keys[] = {
 	{      0, XF86AudioPlay,         spawn,      {.v = music_toggle   } },
 	{      0, XF86MonBrightnessDown, spawn,      {.v = backlight_down } },
 	{      0, XF86MonBrightnessUp,   spawn,      {.v = backlight_up   } },
-	{      0, XK_Print,              spawn,      SHCMD("~/.scripts/shotz -u") },
+	{      0, XK_Print,              spawn,      SHCMD("~/.local/bin/scripts/shotz -u") },
 	TAGKEYS(  XK_1, 0)
 	TAGKEYS(  XK_2, 1)
 	TAGKEYS(  XK_3, 2)
@@ -69,6 +69,7 @@ static Key keys[] = {
 	TAGKEYS(  XK_7, 6)
 	TAGKEYS(  XK_8, 7)
 	TAGKEYS(  XK_9, 8)
+	TAGKEYS(  XK_0, 9)
 };
 
 static Button buttons[] = {
diff --git a/enterthevoid b/enterthevoid
@@ -195,6 +195,7 @@ setup_chroot() {
 		cp /boot/efi/EFI/GRUB/grubx64.efi /boot/efi/EFI/boot/bootx64.efi # copy the EFI for tricking compatability
 	elif [ $BOOT_OPTION = "BIOS" ]; then
 		xbps-install grub
+		sleep 2 # I don't know why this is needed, but it is...grub-install fails and then works after running 2 seconds
 		grub-install /dev/$DRIVE
 	fi
 
diff --git a/enterthezoid b/enterthezoid
@@ -101,8 +101,8 @@ setup_chroot() {
     # Set the root password
 	echo "root:root" | chpasswd
 
-	# Update the package manager
-	xbps-install -Suy
+	# Update the package manager and install some basic packages
+	xbps-install -Suy nano wget
 
 	# Install the non-free repository
 	xbps-install -y void-repo-nonfree
@@ -122,6 +122,9 @@ setup_chroot() {
 	# Set the rc.conf variables
 	printf "HOSTNAME=\"$HOSTNAME\"\nHARDWARECLOCK=\"UTC\"\nTIMEZONE=\"America/New_York\"\nKEYMAP=us\n" > /etc/rc.conf
 
+	# Set nameservers
+	printf "nameserver 9.9.9.9" > /etc/resolv.conf
+
 	# Set the locales
 	printf "en_US.UTF-8 UTF-8\nen_US ISO-8859-1\n" > /etc/default/libc-locales
 	xbps-reconfigure -f glibc-locales
@@ -159,12 +162,8 @@ setup_chroot() {
         refind-install
     	rm /boot/refind_linux.conf
     	printf "\"Boot default\"  \"quiet loglevel=0 zbm.skip\"\n\"Boot to menu\"  \"quiet loglevel=0 zbm.show\"\n" > /boot/efi/EFI/ZBM/refind_linux.conf
-    	# Everything below this line is a "hacky" solution to a problem I was having with the zfsbootmenu package
-    	# https://github.com/zbm-dev/zfsbootmenu/issues/293
-    	# The developers of zfsbootmenu are rude and unhelpful, so I had to figure this out on my own:
-    	#	12:39 -- Mode #zfsbootmenu [+b *!*@big.dick.acid.vegas] by zdykstra
-    	#	12:39 ◀▬▬ zdykstra has kicked acidvegas (acidvegas)
-    	#	12:39 -- #zfsbootmenu: Cannot join channel (+b) - you are banned
+    	# Note     : Everything below this line is a "hacky" solution to a problem I was having with the zfsbootmenu package
+    	# Reference: https://github.com/zbm-dev/zfsbootmenu/issues/293
     	mkdir -p /boot/efi/EFI/BOOT
     	mvrefind /boot/efi/EFI/refind /boot/efi/EFI/BOOT
     	temp=$(mktemp -d)
diff --git a/local/bin/scripts/gotimon b/local/bin/scripts/gotimon
diff --git a/local/bin/scripts/irc-post-commit-hook b/local/bin/scripts/irc-post-commit-hook
@@ -4,7 +4,7 @@
 # Place this file in .git/hooks/post-commit and chmod +x
 
 # Configuration
-WEECHAT_NETWORK="irc.supernets.org"
+WEECHAT_NETWORK="supernets"
 WEECHAT_CHANNEL="#dev"
 WEECHAT_FIFO="/home/acidvegas/.local/share/weechat/weechat_fifo"
 SSH_SERVER="war"
@@ -20,7 +20,7 @@ _summary=$(git show $_hash --stat | grep -E "fil(e|es) changed" | awk '{files+=$
 _files=$(echo $_summary | cut -d'|' -f1)
 _inserts=$(echo $_summary | cut -d'|' -f2)
 _deletes=$(echo $_summary | cut -d'|' -f3)
-_ircmsg="irc.$WEECHAT_NETWORK.$WEECHAT_CHANNEL *^C14[^C11GitHub^C14]^O Commit pushed to ^C08$_name/$_repo^O (^C06$_hash^O) ^C14[^O$_files^C14|^C03$_inserts^C14|^C04$_deletes^C14]^O : $_msg"
+_ircmsg="irc.$WEECHAT_NETWORK.$WEECHAT_CHANNEL *14[11GitHub14] Commit pushed to 08$_name/$_repo (06$_hash) 14[$_files14|03$_inserts14|04$_deletes14] : $_msg"
 
 # Send the message to weechat
-echo "$_ircmsg" | ssh $SSH_SERVER tee $WEECHAT_FIFO > /dev/null
-\ No newline at end of file
+echo "$_ircmsg" | ssh $SSH_SERVER tee $WEECHAT_FIFO > /dev/null
diff --git a/local/share/bash/bash_aliases b/local/share/bash/bash_aliases
@@ -33,6 +33,7 @@ alias nrmcommits="git checkout --orphan latest_branch && git add -A && git commi
 alias ..="cd ../"
 alias dropkey="dropbearkey -y -f .dropbear/key | head -n 2 | tail -n 1"
 alias dump='setterm -dump 1 -file screen.dump'
+alias fzfind='grep --line-buffered --color=never -r "" * | fzf'
 alias newnym='echo -e "AUTHENTICATE \"CHANGEME\"\r\nSIGNAL NEWNYM\r\nQUIT" | nc 127.0.0.1 9051'
 alias mdcat='glow'
 alias mkgz='tar -cvzf'
@@ -44,10 +45,10 @@ alias y2m='youtube-dl --extract-audio --audio-format mp3 --audio-quality 0 -o "%
 alias up='sudo mount -o remount,rw /boot && sudo xbps-install -Su && sudo mount -o remount,ro /boot'
 
 # scripts
-alias dbc='~/.scripts/dbc'
-alias gitremote='~/.scripts/gitremote'
-alias irc2ansi='python3 ~/.scripts/irc2ansi.py'
-alias mutag='~/.scripts/mutag'
-alias pass='~/.scripts/pass'
-alias shotz='~/.scripts/shotz'
-alias todo='~/.scripts/todo'
-\ No newline at end of file
+alias dbc='~/.local/bin/scripts/dbc'
+alias gitremote='~/.local/bin/scripts/gitremote'
+alias irc2ansi='python3 ~/.local/bin/scripts/irc2ansi.py'
+alias mutag='~/.local/bin/scripts/mutag'
+alias pass='~/.local/bin/scripts/pass'
+alias shotz='~/.local/bin/scripts/shotz'
+alias todo='~/.local/bin/scripts/todo'
diff --git a/local/share/bash/bash_fun b/local/share/bash/bash_fun
@@ -9,6 +9,7 @@ alias chess='chess-tui'
 alias cmatrix='cmatrix -ab -u 1 -C magenta -s'
 alias crypto="curl rate.sx"
 alias donut="curl ascii.live/donut"
+alias emoji"curl -sSL 'https://git.io/JXXO7' | fzf"
 alias fireworks='confetty fireworks'
 alias lavat='lavat -c magenta -s 10 -r 1 -R 1 -k cyan -b 20'
 alias mapscii='telnet mapscii.me'
@@ -52,4 +53,4 @@ fun() {
     echo "tty-solitaire | Play solitaire in your terminal"
     echo "wh            | Weather in your terminal"
     echo "wipe          | Clear your terminal in style"
-}
-\ No newline at end of file
+}
diff --git a/local/share/bash/bash_functions b/local/share/bash/bash_functions
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # .bash_functions - developed by acidvegas (https://git.acid.vegas/void)
 
 cheat() {
@@ -17,7 +17,7 @@ color() {
 cctain() {
 	NAME=$1
 	incus storage create $NAME-pool dir
-	incus launch images:debian/12 $NAME-container -s $NAME-pool	
+	incus launch images:debian/12 $NAME-container -s $NAME-pool
 	incus config set $NAME-container boot.autostart true
 	sleep 10 # Delay to allow the container to start and get an IP address from the DHCP server
 	incus exec $NAME-container -- apt update  -y
@@ -29,6 +29,18 @@ cctain() {
 	incus exec $NAME-container -- systemctl restart systemd-journald
 }
 
+fkill() {
+    local pid
+    if [ "$UID" != "0" ]; then
+        pid=$(ps -f -u $UID | sed 1d | fzf -m | awk '{print $2}')
+    else
+        pid=$(ps -ef | sed 1d | fzf -m | awk '{print $2}')
+    fi
+    if [ "x$pid" != "x" ]; then
+        echo $pid | xargs kill -${1:-9}
+    fi
+}
+
 extract() {
 	if [ ! -z "$1" ]; then
 		if [ -f $1 ]; then
@@ -102,4 +114,4 @@ backup() {
 # Legacy comand for setting terminal titles in tabbed, might play with this ANSI escape later...
 #title() {
 #	echo -ne "\033]0;$1\007"
-#}
-\ No newline at end of file
+#}
diff --git a/setup b/setup
@@ -1,4 +1,4 @@
-#!/bin/sh
+#!/bin/bash
 # void setup script - developed by acidvegas (https://git.acid.vegas/void)
 
 # note: After importing keys: printf "FINGERPRINTHERE:6:" | gpg --import-ownertrust
@@ -27,10 +27,8 @@ setup_root() {
 	for item in 6x11 7x12 7x14; do
 		wget -O /usr/share/kbd/consolefonts/ohsnap${item}r.psfu $GIT_URL/font/ohsnap${item}r.psfu
 	done
-	printf "\nnohook resolv.conf\n" >> /etc/dhcpcd.conf
-	#printf "\nipv4only\nnodhcp6\n" >> /etc/dhcpcd.conf # For fixing "dhcpcd: ipv6nd_sendadvertisement: Operation not permitted" error
+	#printf "\nnohook resolv.conf\n" >> /etc/dhcpcd.conf
 	echo "CGROUP_MODE=\"unified\"" >> /etc/rc.conf
-	printf "nameserver 9.9.9.9\nnameserver149.112.112.112\nnameserver 2620:fe::fe\nnameserver 2620:fe::9" > /etc/resolv.conf
 	echo "proc /proc proc defaults,hidepid=2 0 0" >> /etc/fstab && mount -o remount /proc
 	printf "set boldtext\nset minibar\nset nohelp\nset nowrap\nset quickblank\nset tabsize 4\nunbind ^J main\nset selectedcolor black,red\ninclude \"/usr/share/nano/*.nanorc\"\n" > /etc/nanorc
 	printf "\nexport HISTFILE=/dev/null\nexport LESSHISTFILE=/dev/null\nexport PYTHONHISTFILE=/dev/null\n" >> /etc/profile
@@ -50,6 +48,7 @@ setup_root() {
 		printf '#!/bin/sh\nexec 2>&1\n[ -r conf ] && . ./conf\nexec dropbear -p $LOCAL_IP:$RND_PORT -w -s -R -F' > /etc/sv/dropbear/run
 	fi
 
+	# Need to optionally enable dhcp and wpa_supplicant incase we are using ethernet
 	for item in dhcpcd incus incus-user socklog-unix nanoklogd wpa_supplicant; do
 		ln -sfv /etc/sv/$item /var/service # Use /etc/runit/runsvdir/default/ instead of /var/service if in a chroot environemnt
 	done
@@ -71,23 +70,20 @@ setup_nonfree() {
 		elif [ $GFX_DRIVER = "amd" ]; then
 			xbps-install -y mesa-dri vulkan-loader mesa-vulkan-radeon radeon-video-accel # Un-tested
 		elif [ $GFX_DRIVER = "nvidia" ]; then
-			xbps-install -y nvidia nvidia-libs nvidia-settings nvidia-xconfig # Un-tested
+			xbps-install -y nvidia nvidia-libs
 		fi
 	fi
 
 	xbps-reconfigure -f linux
-
-	xbps-install -y Signal-Desktop
 }
 
 
 setup_packages() {
-	# Un-comment to enable non-free proprietary software to be installed
 	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 xorg libX11 libX11-devel libXft libXft-devel libXinerama libXinerama-devel libXrandr libXrandr-devel arandr xrandr brightnessctl
 		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 (noto)
 	fi
@@ -101,12 +97,7 @@ setup_packages() {
 	xbps-install -y bluetuith
 
 	# Essentials
-	if [ $REMOTE = "dropbear" ]; then
-		xbps-install -y dhcpcd dropbear
-	elif [ $REMOTE = "ssh" ] || [ $REMOTE = "openssh" ]; then
-		xbps-install -y dhcpcd openssh
-	fi
-	xbps-install -y curl dropbear git jq progress rsync socklog-void tmux tor tree unzip whois zip
+	xbps-install -y curl dropbear git jq openssh progress rsync socklog-void tmux tor tree unzip whois zip
 	xbps-install -y tailscale wireguard wireguard-tools wireproxy
 
 	xbps-install -y python3-zulip zulip-desktop zulip-term
@@ -114,7 +105,7 @@ setup_packages() {
 	# Raspberry Pi specific
 	#xbps-install -y rng-tools && ln -sfv /etc/sv/rngd /var/service/ && sv up rngd
 
-	xbps-install -y  glow gotify-cli gnupg2-scdaemon lxc incus incus-client incus-tools lazygit oath-toolkit websocat
+	xbps-install -y  fzf glow gotify-cli gnupg2-scdaemon lxc incus incus-client incus-tools lazygit oath-toolkit websocat
 	#xbps-install -y earlyoom && ln -sfv /etc/sv/earlyoom /var/service/
 
 	# Alternatives
@@ -130,7 +121,7 @@ setup_packages() {
 	xbps-install -y bluetuith gpsd
 
 	# Recon
-	xbps-install -y aircrack-ng bettercap bandwhich bpfmon ettercap kismet masscan tcpdump termshark wireshark
+	xbps-install -y aircrack-ng bettercap bandwhich bpfmon ettercap ghidra kismet masscan mitmproxy strace tcpdump termshark wireshark wuzz
 
 	# Radio
 	#xbps-install -y airspy chirp CubicSDR gnuradio gqrx inspectrum librtlsdr rtl-sdr rx_tools SoapyRTLSDR SDRPlusPlus
@@ -138,18 +129,21 @@ setup_packages() {
 
 
 setup_configs() {
-    mkdir -p $HOME/.config/alacritty/ && wget -O $HOME/.config/alacritty/alacritty.toml $GIT_URL/config/alacritty/alacritty.toml
-   	mkdir -p $HOME/.config/cmus  && wget -O $HOME/.config/cmus/autosave $GIT_URL/cmus/autosave
-	mkdir -p $HOME/.config/dunst && wget -O $HOME/.config/dunst/dunstrc $GIT_URL/dunst/dunstrc
-	mkdir -p $HOME/.config/git   && wget -O $HOME/.config/git/gitconfig $GIT_URL/config/git/gitconfig
-	mkdir -p $HOME/.config/tmux  && wget -O $HOME/.config/tmux/tmux.conf $GIT_URL/config/tmux/tmux.conf
-	mkdir -p $HOME/.config/X11/  && wget -O $HOME/.config/X11/xinitrc    $GIT_URL/config/X11/xinitrc
+    mkdir -p $HOME/.config/alacritty && wget -O $HOME/.config/alacritty/alacritty.toml $GIT_URL/config/alacritty/alacritty.toml
+   	mkdir -p $HOME/.config/cmus      && wget -O $HOME/.config/cmus/autosave            $GIT_URL/config/cmus/autosave
+	mkdir -p $HOME/.config/dunst     && wget -O $HOME/.config/dunst/dunstrc            $GIT_URL/config/dunst/dunstrc
+	mkdir -p $HOME/.config/git       && wget -O $HOME/.config/git/config               $GIT_URL/config/git/config
+	mkdir -p $HOME/.config/tmux      && wget -O $HOME/.config/tmux/tmux.conf           $GIT_URL/config/tmux/tmux.conf
+	mkdir -p $HOME/.config/X11       && wget -O $HOME/.config/X11/xinitrc              $GIT_URL/config/X11/xinitrc
+
+	sed -i "s|/dev/sda2|$(df $HOME | awk 'NR==2 {print $1}')|" $HOME/.config/tmux/tmux.conf
 
 	mkdir -p $HOME/.local/share/bash
 	for item in bash_aliases bash_functions bash_fun bash_recon; do
 		wget -O $HOME/.local/share/bash/$item $GIT_URL/local/share/bash/$item
 	done
 	wget -O $HOME/.bashrc $GIT_URL/.bashrc
+	echo "history -c && clear && reset" > $HOME/.bash_logout
 
 	mkdir -p $HOME/.local/share/gnupg && wget -O $HOME/.local/share/gnupg/gpg.conf $GIT_URL/local/share/gnupg/gpg.conf
 	printf "pinentry-program /usr/bin/pinentry-curses\ndefault-cache-ttl 3600" > $HOME/.local/share/gnupg/gpg-agent.conf
@@ -157,14 +151,15 @@ setup_configs() {
 
 	mkdir -p $HOME/.local/bin/scripts
 	for SCRIPT in cmus-now gitremote irc-post-commit-hook mutag pmf shotz statusbar todo; do
-		wget -O $HOME/.local/bin/scripts/$SCRIPT $GIT_URL/scripts/$SCRIPT && chmod +x $HOME/.scripts/$SCRIPT
+		wget -O $HOME/.local/bin/scripts/$SCRIPT $GIT_URL/scripts/$SCRIPT
 	done
-	wget -O $HOME/.scripts/dbc https://raw.githubusercontent.com/acidvegas/dbc/main/dbc && chmod +x $HOME/.scripts/dbc
+	wget -O $HOME/.local/bin/scripts/dbc  https://raw.githubusercontent.com/acidvegas/dbc/main/dbc
+	wget -O $HOME/.local/bin/scripts/pass https://raw.githubusercontent.com/acidvegas/pass/main/pass
+	chmod +x $HOME/.local/bin/scripts/*
 
 	mkdir -p $HOME/.local/share/fonts && wget -O $HOME/.local/share/fonts/BlockZone.ttf $GIT_URL/font/BlockZone.ttf && fc-cache -f -v
 
-	VERSION=$(curl -s https://api.github.com/repos/obsidianmd/obsidian-releases/releases/latest | jq -r .tag_name | cut -c2-)
-	wget -O $HOME/.local/bin/obsidian https://github.com/obsidianmd/obsidian-releases/releases/download/v${VERSION}/Obsidian-${VERSION}.AppImage
+	mkdir -p $HOME/.config/pip && printf "[global]\nbreak-system-packages = true" > ~/.config/pip/pip.conf
 }
 
 
@@ -172,9 +167,9 @@ setup_fun() {
 	BUILD=$HOME/dev/build
 	mkdir -p $BUILD
 
-	wget -O $HOME/.scripts/irc2ansi.py https://raw.githubusercontent.com/internet-relay-chat/archive/master/art/irc2ansi.py
-	wget -O $HOME/.scripts/bomber $GIT_URL/scripts/bomber && chmod +x $HOME/.scripts/bomber
-	wget -O $HOME/.scripts/pipes https://raw.githubusercontent.com/pipeseroni/pipes.sh/master/pipes.sh && chmod +x $HOME/.scripts/pipes
+	wget -O $HOME/.local/bin/scripts/irc2ansi.py https://raw.githubusercontent.com/internet-relay-chat/archive/master/art/irc2ansi.py
+	wget -O $HOME/.local/bin/scripts/bomber $GIT_URL/scripts/bomber && chmod +x $HOME/.local/bin/scripts/bomber
+	wget -O $HOME/.local/bin/scripts/pipes https://raw.githubusercontent.com/pipeseroni/pipes.sh/master/pipes.sh && chmod +x $HOME/.local/bin/scripts/pipes
 
 	git clone https://github.com/AngelJumbo/lavat.git $BUILD/lavat
 	sudo make -C $BUILD/lavat clean install
@@ -208,6 +203,9 @@ setup_builds() {
 
 
 setup_user_packages() {
+    VERSION=$(curl -s https://api.github.com/repos/boxdot/gurk-rs/releases/latest | jq -r .tag_name  | cut -c2-)
+    wget -O $HOME/.local/bin/gurk https://github.com/boxdot/gurk-rs/releases/download/v${VERSION}/gurk-x86_64-unknown-linux-gnu.tar.gz
+
 	wget -O $HOME/.local/bin/cursor https://downloader.cursor.sh/linux/appImage/x64
 	chmod u+x $HOME/.local/bin/cursor
 
@@ -215,22 +213,17 @@ setup_user_packages() {
 	wget -O $HOME/.local/bin/obsidian https://github.com/obsidianmd/obsidian-releases/releases/download/v${VERSION}/Obsidian-${VERSION}.AppImage
 	chmod u+x $HOME/.local/bin/obsidian
 
-	VERSION=$(curl -s https://api.github.com/repos/boxdot/gurk-rs/releases/latest | jq -r .tag_name)
-	wget -O $HOME/.local/bin/gurk https://github.com/boxdot/gurk-rs/releases/download/${VERSION}/gurk-x86_64-unknown-linux-gnu.tar.gz
-	chmod u+x $HOME/.local/bin/gurk
-
 	TEMP=$(mktemp -d)
 	wget -O $TEMP/zed.tar.gz https://zed.dev/api/releases/stable/latest/zed-linux-x86_64.tar.gz
-	tar -xzf $TEMP/zed.tar.gz -C $TEMP
-	mv $TEMP/zed.app/bin/zed $HOME/.local/bin/zed
+	tar -xzf $TEMP/zed.tar.gz -C $HOME/.local
+	ln -s $HOME/.local/zed.app/zed $HOME/.local/bin/zed
 	rm -rf $TEMP
 
-	mkdir -p $HOME/.config/pip && printf "[global]\nbreak-system-packages = true" > $HOME/.config/pip/pip.conf
+	mkdir -p $HOME/.config/pip
+	printf "[global]\nbreak-system-packages = true" > $HOME/.config/pip/pip.conf
 	pip install --user asyncwhois ecs elasticsearch meshtastic scalene
 
-	cargo install binsider
-	cargo install git-dumper
-	cargo install netscanner
+	cargo install binsider csvlens git-dumper netscanner
 
 	go install -v github.com/nxtrace/NTrace-core@latest
 	go install -v github.com/projectdiscovery/asnmap/cmd/asnmap@latest
@@ -244,8 +237,6 @@ setup_user_packages() {
 	go install -v github.com/projectdiscovery/subfinder/v2/cmd/subfinder@latest
 	go install -v github.com/projectdiscovery/tlsx/cmd/tlsx@latest
 
-	git clone https://github.com/projectdiscovery/nuclei-templates.git $HOME/dev/git/mirror/nuclei-templates
-
 	git clone https://github.com/blechschmidt/massdns.git $HOME/dev/git/mirror/massdns
 	make -C $HOME/dev/git/mirror/massdns && sudo make -C $HOME/dev/git/mirror/massdns install
 }
@@ -261,3 +252,15 @@ case "$1" in
 	fun)    setup_fun     ;;
 	*)      echo "usage: $0 [root|config|build|fun]\n"; exit 1 ;;
 esac
+
+
+
+xbps-install -Syu && vkpurge rm all && xbps-install -y openssh
+>/etc/ssh/sshd_config
+printf "Port XXX\nAddressFamily inet\nListenAddress 0.0.0.0\nPasswordAuthentication no\nPrintMotd yes\nPrintLastLog no\nBanner none" > /etc/ssh/sshd_config
+ln -s /etc/sv/sshd /var/service
+nano /etc/ssh/sshd_config
+sv restart sshd
+printf "\nssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIKoWLkmkbkwgivwqbzXBsIa8EbTGAEibGkX6CC/tiKZe admin@supernets.org" >> /home/acidvegas/.ssh/authorized_keys
+chown acidvegas:acidvegas /home/acidvegas/.ssh/authorized_keys
+chmod 400 /home/acidvegas/.ssh/authorized_keys