commit 2830f1e626f84e536ab13f845974b992ee701fef
parent 9db14ea4aaaff766c0728b1c39ad129b78fa0c43
Author: regexghost <dev@regexghost.com>
Date: Tue, 21 Jul 2026 20:01:26 +0100
some fixes to init process script, still need to refine it, get dotfiles loading before scripts etc
Diffstat:
4 files changed, 41 insertions(+), 21 deletions(-)
diff --git a/apt-install.sh b/apt-install.sh
@@ -1,3 +1,3 @@
#!/bin/sh
-sudo apt install curl wget golang xorg xinit x11-xserver-utils bluetooth unzip git firefox-esr mpv vlc tar moc fasd fonts-roboto fonts-firacode figlet jq xcompmgr picom trash-cli ncdu pulsemixer feh moc-ffmpeg-plugin keepassxc-full fzf libnotify-bin dunst texinfo xmlstarlet duf gh tidy w3m bluetooth xclip wbritish wbritish-huge rsync pup rename ifuse libimobiledevice-utils chromium groff xdotool pulseaudio-module-bluetooth sqlite3 expect aria2 gammastep qimgv kimageformat-plugins kimageformat6-plugins nomacs mediainfo mpd mpc htop python3-venv
+sudo apt install curl wget golang xorg xinit x11-xserver-utils bluetooth unzip git firefox-esr mpv vlc tar moc fasd fonts-roboto fonts-firacode figlet jq xcompmgr picom trash-cli ncdu pulsemixer feh moc-ffmpeg-plugin keepassxc-full fzf libnotify-bin dunst texinfo xmlstarlet duf gh tidy w3m bluetooth xclip wbritish wbritish-huge rsync pup rename ifuse libimobiledevice-utils chromium groff xdotool pulseaudio-module-bluetooth sqlite3 expect aria2 gammastep qimgv kimageformat-plugins kimageformat6-plugins nomacs mediainfo mpd mpc htop python3-venv btop alpine
diff --git a/init.sh b/init.sh
@@ -2,6 +2,22 @@
set -e
+export PATH="$HOME/.local/bin:$PATH"
+
+export XDG_STATE_HOME="$HOME/.local/state"
+export XDG_CONFIG_HOME="$HOME/.config"
+export XDG_DATA_HOME="$HOME/.local/share"
+export XDG_CACHE_HOME="$HOME/.cache"
+
+[ -d "$XDG_CACHE_HOME" ] || mkdir -p "$XDG_CACHE_HOME"
+[ -d "$XDG_DATA_HOME" ] || mkdir -p "$XDG_DATA_HOME"
+[ -d "$XDG_CONFIG_HOME" ] || mkdir -p "$XDG_CONFIG_HOME"
+[ -d "$XDG_STATE_HOME" ] || mkdir -p "$XDG_STATE_HOME"
+
+./setup.sh make dotfiles
+
+. ~/.profile
+
# Install programs
./apt-install.sh
@@ -20,31 +36,32 @@ cd helpers/subgo/; make full; cd ../../
touch ~/.config/wgetrc
# Shell stuff
-cp /etc/shells ~/Downloads/shells_backup
-echo "/usr/local/bin/oksh" | sudo tee -a /etc/shells
+if ! grep -q "/usr/local/bin/oksh" /etc/shells; then
+ cp /etc/shells ~/Downloads/shells_backup
+ echo "/usr/local/bin/oksh" | sudo tee -a /etc/shells
+fi
chsh
# Random setup
echo "50" > ~/.cache/volume
echo "no" > ~/.cache/muted
-mkdir ~/.config/aspell/
-mkdir ~/.local/share/aspell/
+mkdir -p ~/.config/aspell/
+mkdir -p ~/.local/share/aspell/
sudo systemctl enable --now bluetooth
systemctl --user restart pulseaudio
# Make dirs
-mkdir ~/Videos
-mkdir ~/Videos/Podcasts
-mkdir ~/Videos/YouTube
-mkdir ~/Videos/YouTube/Videos
-mkdir ~/Videos/YouTube/Shorts
-mkdir ~/Videos/YouTube/toDownload
+mkdir -p ~/Videos
+mkdir -p ~/Videos/Podcasts
+mkdir -p ~/Videos/YouTube
+mkdir -p ~/Videos/YouTube/Videos
+mkdir -p ~/Videos/YouTube/Shorts
+mkdir -p ~/Videos/YouTube/toDownload
touch ~/Videos/Podcasts/toDownload.txt
-mkdir ~/.local/state/mpd
-mkdir ~/.cache/mpd
+mkdir -p ~/.local/state/mpd
+mkdir -p ~/.cache/mpd
cd ~/.local/share/regexghost
python3 -m venv .venv
-~/.local/share/regexghost/.venv/bin/pip install music-tag pillow requests
-beautifulsoup4
+~/.local/share/regexghost/.venv/bin/pip install music-tag pillow requests beautifulsoup4
diff --git a/otherPrograms.sh b/otherPrograms.sh
@@ -17,11 +17,11 @@ set -e
mkdir -p temp_programs
cd temp_programs
-[ -d patches/ ] || git clone https://github.com/regexghost/patches
-
# dev tools
sudo apt install git make gcc automake cmake meson unzip gettext autopoint pkg-config libtool build-essential
+[ -d patches/ ] || git clone https://github.com/regexghost/patches
+
jwm () {
sudo apt install libxext-dev libxmu-dev libxinerama-dev libxpm-dev libjpeg-dev libpng-dev libpango1.0-dev
git clone https://github.com/regexghost/jwm
@@ -293,6 +293,8 @@ sbase () {
}
sxiv () {
+ sudo apt install libexif-dev
+
git clone https://github.com/xyb3rt/sxiv
cd sxiv
make
@@ -438,7 +440,6 @@ zathura () {
cd mupdf
git checkout 205b8cf
git submodule update --init
- make build=release XCFLAGS=-fPIC XCXXFLAGS=-fPIC
make shared=yes build=release XCFLAGS="-fPIC" XCXXFLAGS="-fPIC" USE_SYSTEM_FREETYPE=yes USE_SYSTEM_GUMBO=yes USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_JBIG2DEC=yes USE_SYSTEM_LIBJPEG=yes USE_SYSTEM_OPENJPEG=no USE_SYSTEM_ZLIB=yes USE_SYSTEM_GLUT=yes USE_SYSTEM_CURL=yes USE_SYSTEM_LEPTONICA=yes USE_SYSTEM_TESSERACT=yes USE_SYSTEM_ZXINGCPP=yes USE_SYSTEM_BROTLI=yes
sudo make shared=yes build=release XCFLAGS="-fPIC" XCXXFLAGS="-fPIC" USE_SYSTEM_FREETYPE=yes USE_SYSTEM_GUMBO=yes USE_SYSTEM_HARFBUZZ=yes USE_SYSTEM_JBIG2DEC=yes USE_SYSTEM_LIBJPEG=yes USE_SYSTEM_OPENJPEG=no USE_SYSTEM_ZLIB=yes USE_SYSTEM_GLUT=yes USE_SYSTEM_CURL=yes USE_SYSTEM_LEPTONICA=yes USE_SYSTEM_TESSERACT=yes USE_SYSTEM_ZXINGCPP=yes USE_SYSTEM_BROTLI=yes install
cd ..
diff --git a/setup.sh b/setup.sh
@@ -2,6 +2,8 @@
file="lists/$2"
+sub="$HOME/.local/bin/sub"
+
exec 3<&0
if [ "$1" = "save" ]; then
while read -r filepath; do
@@ -12,8 +14,8 @@ if [ "$1" = "save" ]; then
mkdir -p "$repo_dirname"
echo $filepath
if grep -q "Start Substitute" "$real_path"; then
- sub save "$basename" "$repo_dirname" "$real_path" <&3
- sub clean "$basename" "$repo_dirname" "$real_path" "$repo_path"
+ "$sub" save "$basename" "$repo_dirname" "$real_path" <&3
+ "$sub" clean "$basename" "$repo_dirname" "$real_path" "$repo_path"
else
cp "$real_path" "$repo_path"
fi
@@ -28,7 +30,7 @@ elif [ "$1" = "make" ]; then
echo $filepath
mkdir -p "$real_dirname"
if grep -q "Start Substitute" "$repo_path"; then
- sub make "$basename" "$repo_dirname" "$repo_path" "$real_path" <&3
+ "$sub" make "$basename" "$repo_dirname" "$repo_path" "$real_path" <&3
else
cp "$repo_path" "$real_path"
fi
