Summary Files Commits Branches @commit @diff @stats
diff options
context:
space:
mode:
Commit375d11b33142e971a82f28ddb4cc7d386e3551cf (patch)
Author
 Syndamia <kamen@syndamia.com>
2026-11-01 17:50:07 +0200
Committer
 Syndamia <kamen@syndamia.com>
2026-11-01 17:50:07 +0200
Files85373ae415fcff7142ee1194594e8bb1e381176b
.files-375d11b33142e971a82f28ddb4cc7d386e3551cf.tar
.files-375d11b33142e971a82f28ddb4cc7d386e3551cf.tar.gz
.files-375d11b33142e971a82f28ddb4cc7d386e3551cf.zip
Parente41b78ee956a6adcfc07b3c453f70198214ca599 (diff)
feat!: Rework how .files are managed
83 files changed, 191 insertions, 34 deletions
-rw-r--r--.gitignore2
-rw-r--r--SYSTEM/jove6
-rw-r--r--bash/.bash_logout (renamed from .bash_logout)0
-rw-r--r--bash/.bash_profile (renamed from .bash_profile)0
-rw-r--r--bash/.bashrc (renamed from .bashrc)0
-rw-r--r--bash/.inputrc (renamed from .inputrc)0
-rw-r--r--git/.gitconfig (renamed from .gitconfig)0
-rw-r--r--git/.globalgitignore (renamed from .globalgitignore)0
-rwxr-xr-xinstall.sh34
-rw-r--r--mail/.claws-mail/clawsrc (renamed from .claws-mail/clawsrc)0
-rw-r--r--mail/.claws-mail/colorlabelrc (renamed from .claws-mail/colorlabelrc)0
-rw-r--r--mail/.claws-mail/pagesetuprc (renamed from .claws-mail/pagesetuprc)0
-rw-r--r--mail/.claws-mail/toolbar_compose.xml (renamed from .claws-mail/toolbar_compose.xml)0
-rw-r--r--mail/.claws-mail/toolbar_main.xml (renamed from .claws-mail/toolbar_main.xml)0
-rw-r--r--mail/.claws-mail/toolbar_msgview.xml (renamed from .claws-mail/toolbar_msgview.xml)0
-rw-r--r--mail/.sylpheed-2.0/actionsrc (renamed from .sylpheed-2.0/actionsrc)0
-rw-r--r--mail/.sylpheed-2.0/colorlabelrc (renamed from .sylpheed-2.0/colorlabelrc)0
-rw-r--r--mail/.sylpheed-2.0/pagesetuprc (renamed from .sylpheed-2.0/pagesetuprc)0
-rw-r--r--mail/.sylpheed-2.0/sylpheedrc (renamed from .sylpheed-2.0/sylpheedrc)0
-rwxr-xr-xmake183
-rw-r--r--misc/.config/PulseEffects/Bass & Vocal Clarity.json (renamed from .config/PulseEffects/Bass & Vocal Clarity.json)0
-rw-r--r--misc/.config/PulseEffects/output/Advanced Auto Gain.json (renamed from .config/PulseEffects/output/Advanced Auto Gain.json)0
-rw-r--r--misc/.config/PulseEffects/output/Bass Boosted - Calmer.json (renamed from .config/PulseEffects/output/Bass Boosted - Calmer.json)0
-rw-r--r--misc/.config/PulseEffects/output/Bass Boosted.json (renamed from .config/PulseEffects/output/Bass Boosted.json)0
-rw-r--r--misc/.config/PulseEffects/output/Bass Enhancing + Perfect EQ.json (renamed from .config/PulseEffects/output/Bass Enhancing + Perfect EQ.json)0
-rw-r--r--misc/.config/PulseEffects/output/Boosted.json (renamed from .config/PulseEffects/output/Boosted.json)0
-rw-r--r--misc/.config/PulseEffects/output/Loudness Equalizer.json (renamed from .config/PulseEffects/output/Loudness Equalizer.json)0
-rw-r--r--misc/.config/PulseEffects/output/Perfect EQ.json (renamed from .config/PulseEffects/output/Perfect EQ.json)0
-rw-r--r--misc/.config/PulseEffects/output/README.md (renamed from .config/PulseEffects/output/README.md)0
-rw-r--r--misc/.config/PulseEffects/output/Razer Sorround.json (renamed from .config/PulseEffects/output/Razer Sorround.json)0
-rw-r--r--misc/.config/StarTubeSettings.json (renamed from .config/StarTubeSettings.json)0
-rw-r--r--misc/.config/VLTakeout_Localdb_CONFIG_1747466646871.json (renamed from .config/VLTakeout_Localdb_CONFIG_1747466646871.json)0
-rw-r--r--misc/.config/devilspie2/devilspie2.lua (renamed from .config/devilspie2/devilspie2.lua)0
-rwxr-xr-xmisc/.config/devilspie2/set-xdg-icon.sh (renamed from .config/devilspie2/set-xdg-icon.sh)0
-rw-r--r--misc/.config/joplin-desktop/userchrome.css (renamed from .config/joplin-desktop/userchrome.css)0
-rw-r--r--misc/.config/joplin-desktop/userstyle.css (renamed from .config/joplin-desktop/userstyle.css)0
-rwxr-xr-xmisc/.config/libinput-gestures.conf (renamed from .config/libinput-gestures.conf)0
-rw-r--r--misc/.runelite/settings.properties (renamed from .runelite/settings.properties)0
-rw-r--r--misc/.sxhkdrc (renamed from .sxhkdrc)0
-rw-r--r--misc_tray/.config/copyq/copyq.conf (renamed from .config/copyq/copyq.conf)0
-rw-r--r--misc_tray/.config/flameshot/flameshot.ini (renamed from .config/flameshot/flameshot.ini)0
-rw-r--r--misc_tray/.config/pavucontrol.ini (renamed from .config/pavucontrol.ini)0
-rw-r--r--misc_tray/.config/pnmixer/config (renamed from .config/pnmixer/config)0
-rw-r--r--misc_tray/.config/redshift.conf (renamed from .config/redshift.conf)0
-rw-r--r--misc_tui/.moc/themes/rapture (renamed from .moc/themes/rapture)0
-rw-r--r--misc_tui/.moc/timidity.cfg (renamed from .moc/timidity.cfg)0
-rw-r--r--nixos/.config/nix/nix.conf (renamed from .config/nix/nix.conf)0
-rw-r--r--openbox_de/.config/dunst/dunstrc (renamed from .config/dunst/dunstrc)0
-rw-r--r--openbox_de/.config/gtk-3.0/gtk.css (renamed from .config/gtk-3.0/gtk.css)0
-rw-r--r--openbox_de/.config/gtk-3.0/settings.ini (renamed from .config/gtk-3.0/settings.ini)0
-rw-r--r--openbox_de/.config/jgmenu/append.csv (renamed from .config/jgmenu/append.csv)0
-rw-r--r--openbox_de/.config/jgmenu/jgmenurc (renamed from .config/jgmenu/jgmenurc)0
-rw-r--r--openbox_de/.config/jgmenu/jgmenusimplerc (renamed from .config/jgmenu/jgmenusimplerc)0
-rw-r--r--openbox_de/.config/jgmenu/prepend.csv (renamed from .config/jgmenu/prepend.csv)0
-rw-r--r--openbox_de/.config/lead/lead.conf (renamed from .config/lead/lead.conf)0
-rwxr-xr-x[-rw-r--r--]openbox_de/.config/openbox/autostart (renamed from .config/openbox/autostart)0
-rw-r--r--openbox_de/.config/openbox/environment (renamed from .config/openbox/environment)0
-rw-r--r--openbox_de/.config/openbox/rc.xml (renamed from .config/openbox/rc.xml)0
-rw-r--r--openbox_de/.config/openbox/terminals.menu (renamed from .config/openbox/terminals.menu)0
-rw-r--r--openbox_de/.config/picom.conf (renamed from .config/picom.conf)0
-rw-r--r--openbox_de/.config/tint2/gaming.tint2rc (renamed from .config/tint2/gaming.tint2rc)0
-rw-r--r--openbox_de/.config/tint2/programmer.tint2rc (renamed from .config/tint2/programmer.tint2rc)0
-rw-r--r--openbox_de/.config/tint2/switcher.tint2rc (renamed from .config/tint2/switcher.tint2rc)0
-rw-r--r--openbox_de/.config/tint2/tint2rc (renamed from .config/tint2/tint2rc)0
-rw-r--r--openbox_de/.config/tint2/work.tint2rc (renamed from .config/tint2/work.tint2rc)0
-rw-r--r--openbox_de/.dmrc (renamed from .dmrc)0
-rw-r--r--openbox_de/.gtkrc-2.0 (renamed from .gtkrc-2.0)0
-rwxr-xr-xopenbox_de/.xsession (renamed from .xsession)0
-rw-r--r--openbox_de/jgmenu (renamed from jgmenu)0
-rwxr-xr-xscripts/bin/autostart (renamed from .scripts/autostart)0
-rwxr-xr-xscripts/bin/battery-status (renamed from .scripts/battery-status)0
-rwxr-xr-xscripts/bin/brightness-control (renamed from .scripts/brightness-control)0
-rwxr-xr-xscripts/bin/lock (renamed from .scripts/lock)0
-rwxr-xr-xscripts/bin/on-logout (renamed from .scripts/on-logout)0
-rwxr-xr-xscripts/bin/plumb (renamed from .scripts/plumb)0
-rwxr-xr-xscripts/bin/rclone.sh (renamed from .scripts/rclone.sh)0
-rwxr-xr-xscripts/bin/start-panels (renamed from .scripts/start-panels)0
-rwxr-xr-xscripts/bin/toggle-desktop (renamed from .scripts/toggle-desktop)0
-rw-r--r--terminal/.Xresources (renamed from .Xresources)0
-rw-r--r--terminal/.config/terminator/config (renamed from .config/terminator/config)0
-rw-r--r--terminal/.screenrc (renamed from .screenrc)0
-rw-r--r--terminal/.tmux.conf (renamed from .tmux.conf)0
-rw-r--r--wakatime/.wakatime.cfg (renamed from .wakatime.cfg)0
diff --git a/.gitignore b/.gitignore
new file mode 100644
index 0000000..3819313
--- /dev/null
+++ b/.gitignore
@@ -0,0 +1,2 @@
+*.swp
+*.swo
diff --git a/SYSTEM/jove b/SYSTEM/jove
new file mode 100644
index 0000000..63510d6
--- /dev/null
+++ b/SYSTEM/jove
@@ -0,0 +1,6 @@
+bash
+openbox_de
+terminal
+scripts
+git
+misc_tray
diff --git a/.bash_logout b/bash/.bash_logout
index af7c6fd..af7c6fd 100644
--- a/.bash_logout
+++ b/bash/.bash_logout
diff --git a/.bash_profile b/bash/.bash_profile
index 55136b9..55136b9 100644
--- a/.bash_profile
+++ b/bash/.bash_profile
diff --git a/.bashrc b/bash/.bashrc
index 86967cc..86967cc 100644
--- a/.bashrc
+++ b/bash/.bashrc
diff --git a/.inputrc b/bash/.inputrc
index f12eb5f..f12eb5f 100644
--- a/.inputrc
+++ b/bash/.inputrc
diff --git a/.gitconfig b/git/.gitconfig
index 8c0adc8..8c0adc8 100644
--- a/.gitconfig
+++ b/git/.gitconfig
diff --git a/.globalgitignore b/git/.globalgitignore
index 3849cb1..3849cb1 100644
--- a/.globalgitignore
+++ b/git/.globalgitignore
diff --git a/install.sh b/install.sh
deleted file mode 100755
index 000f9d1..0000000
--- a/install.sh
+++ /dev/null
@@ -1,34 +0,0 @@
-#!/usr/bin/env bash
-
-copy=""
-while [ -n "$1" ]
-do
- case "$1" in
- (cp | copy) copy="yes" ;;
- esac
- shift
-done
-
-while read -r conf
-do
- [ -z "$conf" ] && continue
- [ ! -f "$conf" ] && echo "warning: $conf is not a regular file, skipping!" && continue
-
- dest="$HOME/${conf##\./}"
- if [ -f "$dest" ] && ! cmp --silent -- "$dest" "$conf"
- then
- diff "$dest" "$conf"
- printf "Files $dest and $conf are not the same! Overwrite? [y/N] "
- read -n1 overwrite </dev/tty
- echo
- [ "$overwrite" != 'y' -a "$overwrite" != 'Y' ] && continue
- fi
-
- dir="$(dirname "$dest")"
- [ ! -d "$dir" ] && mkdir -p "$dir" || rm "$dest" >/dev/null 2>&1
-
- [ -n "$copy" ] && cp "$PWD/$conf" "$dest" || ln -s "$PWD/$conf" "$dest"
- echo "Installed ${conf##\./}"
-done <<EOF
-$(find . -type f -not -path './.git/*' -not -name 'README.md' -not -name 'install.sh')
-EOF
diff --git a/.claws-mail/clawsrc b/mail/.claws-mail/clawsrc
index 9ee3e06..9ee3e06 100644
--- a/.claws-mail/clawsrc
+++ b/mail/.claws-mail/clawsrc
diff --git a/.claws-mail/colorlabelrc b/mail/.claws-mail/colorlabelrc
index 9e5f5f8..9e5f5f8 100644
--- a/.claws-mail/colorlabelrc
+++ b/mail/.claws-mail/colorlabelrc
diff --git a/.claws-mail/pagesetuprc b/mail/.claws-mail/pagesetuprc
index e9374d8..e9374d8 100644
--- a/.claws-mail/pagesetuprc
+++ b/mail/.claws-mail/pagesetuprc
diff --git a/.claws-mail/toolbar_compose.xml b/mail/.claws-mail/toolbar_compose.xml
index 0dc3c87..0dc3c87 100644
--- a/.claws-mail/toolbar_compose.xml
+++ b/mail/.claws-mail/toolbar_compose.xml
diff --git a/.claws-mail/toolbar_main.xml b/mail/.claws-mail/toolbar_main.xml
index e67d25f..e67d25f 100644
--- a/.claws-mail/toolbar_main.xml
+++ b/mail/.claws-mail/toolbar_main.xml
diff --git a/.claws-mail/toolbar_msgview.xml b/mail/.claws-mail/toolbar_msgview.xml
index ec913c8..ec913c8 100644
--- a/.claws-mail/toolbar_msgview.xml
+++ b/mail/.claws-mail/toolbar_msgview.xml
diff --git a/.sylpheed-2.0/actionsrc b/mail/.sylpheed-2.0/actionsrc
index a1fc2ff..a1fc2ff 100644
--- a/.sylpheed-2.0/actionsrc
+++ b/mail/.sylpheed-2.0/actionsrc
diff --git a/.sylpheed-2.0/colorlabelrc b/mail/.sylpheed-2.0/colorlabelrc
index 9e5f5f8..9e5f5f8 100644
--- a/.sylpheed-2.0/colorlabelrc
+++ b/mail/.sylpheed-2.0/colorlabelrc
diff --git a/.sylpheed-2.0/pagesetuprc b/mail/.sylpheed-2.0/pagesetuprc
index e9374d8..e9374d8 100644
--- a/.sylpheed-2.0/pagesetuprc
+++ b/mail/.sylpheed-2.0/pagesetuprc
diff --git a/.sylpheed-2.0/sylpheedrc b/mail/.sylpheed-2.0/sylpheedrc
index f192ea0..f192ea0 100644
--- a/.sylpheed-2.0/sylpheedrc
+++ b/mail/.sylpheed-2.0/sylpheedrc
diff --git a/make b/make
new file mode 100755
index 0000000..9731008
--- /dev/null
+++ b/make
@@ -0,0 +1,183 @@
+#!/bin/sh
+# IMPORTANT NOTE: The "local" keyword is not defined in POSIX, so I've decided to work without it.
+# For this reason, I do "$X/$f" instead of assigning local variables.
+# Another thing to consider is that in recursive functions, backtracking logic
+# CANNOT depend on variables, which are changed somewhere in the body before
+# the recursive step.
+
+cd "${0%/*}"
+
+[ -z "$HOSTNAME" ] && HOSTNAME="$(hostname)"
+if [ -z "$HOSTNAME" ]
+then
+ echo "Set HOSTNAME variable to the system's name!" >/dev/stderr
+ exit 1
+fi
+if [ ! -f "./SYSTEM/$HOSTNAME" ]
+then
+ echo "No configuration in ./SYSTEM for '$HOSTNAME'!" >/dev/stderr
+ exit 1
+fi
+
+# __merge_link <.FILES_DIR> <HOME_DIR>
+__merge_link() {
+ while read -r f
+ do
+ # Output file doesn't exist -> Create link
+ # This is also true on broken symlinks
+ if [ ! -e "$2/$f" ]
+ then
+ if [ -h "$2/$f" ]
+ then
+ echo "Warn: '$2/$f' is a broken link to '$(readlink "$2/$f")', updating!"
+ rm "$2/$f"
+ fi
+ ln -s "$1/$f" "$2/$f"
+ # Output file is already linked to current -> Do nothing
+ elif [ -h "$2/$f" -a "$(readlink $2/$f)" = "$1/$f" ]
+ then
+ :
+ # Current file is a file (and output exists) -> Create link but also update current
+ elif [ -f "$1/$f" ]
+ then
+ if [ -f "$2/$f" ]
+ then
+ # When output is NOT a link inside .files,
+ # update current file with the contents of the output
+ # Otherwise,
+ # replace output file with (link to) current
+ if ! cmp -s "$1/$f" "$2/$f"
+ then
+ if [ -h "$2/$f" ]
+ then
+ real="$(readlink "$2/$f")"
+ if [ "${real#$PWD}" = "$real" ]
+ then
+ cp "$real" "$1/$f" 2>/dev/null
+ echo "Warn: '$2/$f' already existed, '$1/$f' updated with its contents!" >/dev/stderr
+ fi
+ else
+ cp "$2/$f" "$1/$f"
+ echo "Warn: '$2/$f' already existed, '$1/$f' updated with its contents!" >/dev/stderr
+ fi
+ fi
+ rm "$2/$f"
+
+ ln -s "$1/$f" "$2/$f"
+ else
+ echo "Error: '$2/$f' already exists and is not a regular file!"
+ fi
+ # Current file is a directory (and output exists) -> Link current's files & dirs in output directory
+ elif [ -d "$1/$f" ]
+ then
+ if [ -d "$2/$f" ]
+ then
+ # If output is a link to directory in .files, continuing with merge
+ # will place links inside a directory in .files, which is bad.
+ # Instead, we'll make the link to directory become a directory with
+ # links to all inner files.
+ if [ -h "$2/$f" ]
+ then
+ real="$(realpath "$2/$f")"
+ if [ "${real#$PWD}" != "$real" ]
+ then
+ rm "$2/$f"
+ mkdir "$2/$f"
+ while read -r ff
+ do
+ ln -s "$real/$ff" "$2/$f/$ff"
+ done <<FILES
+$(ls -A1 "$real")
+FILES
+ fi
+ fi
+ __merge_link "$1/$f" "$2/$f"
+ else
+ echo "Error: '$2/$f' already exists and is not a directory!"
+ fi
+ else
+ echo "Error: '$1/$f' is neither a file or directory!"
+ fi
+ done <<FILES
+$(ls -A1 "$1")
+FILES
+}
+
+link() {
+ while read -r dir
+ do
+ dir="${dir%%*/}"
+ if [ ! -d "./$dir" ]
+ then
+ echo "Unknown directory '$dir'!" >/dev/stderr
+ continue
+ fi
+
+ __merge_link "$PWD/$dir" "$HOME"
+ echo "Linked $dir"
+ done <"./SYSTEM/$HOSTNAME"
+}
+
+# __remove_link <.FILES_DIR> <HOME_DIR>
+__remove_link() {
+ while read -r f
+ do
+ if [ -h "$2/$f" ]
+ then
+ real="$(realpath "$2/$f")"
+ # Output file exists and is a link to current -> Remove output
+ if [ "$real" = "$1/$f" ]
+ then
+ rm "$2/$f"
+ continue
+ # Output file exists and is a link in .files -> Do nothing (do not remove from .files)
+ # This is possible in the case when we have .files/X/A and .files/Y/A, and we linked
+ # .files/X but are now unlinking .files/Y
+ elif [ "${real#$PWD}" != "$real" ]
+ then
+ continue
+ fi
+ fi
+ if [ -d "$1/$f" -a -d "$2/$f" ]
+ then
+ __remove_link "$1/$f" "$2/$f"
+ fi
+ done <<FILES
+$(ls -A1 "$1")
+FILES
+ # See IMPORTANT NOTE, since we're aiming for full POSIX compatibility,
+ # the variable f will be overwritten by recursive calls, so this loop
+ # cannot be merged with the loop above (remove dirs on backtracking)
+ while read -r f
+ do
+ # Output file exists and is an empty directory -> Remove it
+ # We're assuming this directory was created by the script and/or the user
+ # will not care for empty dirs
+ if [ -d "$2/$f" -a -z "$(ls -A "$2/$f" 2>/dev/null)" ]
+ then
+ rm -r "$2/$f"
+ fi
+ done <<FILES
+$(ls -A1 "$1")
+FILES
+}
+
+unlink() {
+ while read -r dir
+ do
+ dir="${dir%%*/}"
+ if [ ! -d "./$dir" ]
+ then
+ echo "Unknown directory '$dir'!" >/dev/stderr
+ continue
+ fi
+
+ __remove_link "$PWD/$dir" "$HOME"
+ echo "Unlinked $dir"
+ done <"./SYSTEM/$HOSTNAME"
+}
+
+case "$1" in
+ (unlink) unlink ;;
+ (link|*) link ;;
+esac
diff --git a/.config/PulseEffects/Bass & Vocal Clarity.json b/misc/.config/PulseEffects/Bass & Vocal Clarity.json
index 70c7c08..70c7c08 100644
--- a/.config/PulseEffects/Bass & Vocal Clarity.json
+++ b/misc/.config/PulseEffects/Bass & Vocal Clarity.json
diff --git a/.config/PulseEffects/output/Advanced Auto Gain.json b/misc/.config/PulseEffects/output/Advanced Auto Gain.json
index ed61b44..ed61b44 100644
--- a/.config/PulseEffects/output/Advanced Auto Gain.json
+++ b/misc/.config/PulseEffects/output/Advanced Auto Gain.json
diff --git a/.config/PulseEffects/output/Bass Boosted - Calmer.json b/misc/.config/PulseEffects/output/Bass Boosted - Calmer.json
index b36a856..b36a856 100644
--- a/.config/PulseEffects/output/Bass Boosted - Calmer.json
+++ b/misc/.config/PulseEffects/output/Bass Boosted - Calmer.json
diff --git a/.config/PulseEffects/output/Bass Boosted.json b/misc/.config/PulseEffects/output/Bass Boosted.json
index 1ae2d89..1ae2d89 100644
--- a/.config/PulseEffects/output/Bass Boosted.json
+++ b/misc/.config/PulseEffects/output/Bass Boosted.json
diff --git a/.config/PulseEffects/output/Bass Enhancing + Perfect EQ.json b/misc/.config/PulseEffects/output/Bass Enhancing + Perfect EQ.json
index 62eb4ee..62eb4ee 100644
--- a/.config/PulseEffects/output/Bass Enhancing + Perfect EQ.json
+++ b/misc/.config/PulseEffects/output/Bass Enhancing + Perfect EQ.json
diff --git a/.config/PulseEffects/output/Boosted.json b/misc/.config/PulseEffects/output/Boosted.json
index 6e16733..6e16733 100644
--- a/.config/PulseEffects/output/Boosted.json
+++ b/misc/.config/PulseEffects/output/Boosted.json
diff --git a/.config/PulseEffects/output/Loudness Equalizer.json b/misc/.config/PulseEffects/output/Loudness Equalizer.json
index 199da23..199da23 100644
--- a/.config/PulseEffects/output/Loudness Equalizer.json
+++ b/misc/.config/PulseEffects/output/Loudness Equalizer.json
diff --git a/.config/PulseEffects/output/Perfect EQ.json b/misc/.config/PulseEffects/output/Perfect EQ.json
index 380416b..380416b 100644
--- a/.config/PulseEffects/output/Perfect EQ.json
+++ b/misc/.config/PulseEffects/output/Perfect EQ.json
diff --git a/.config/PulseEffects/output/README.md b/misc/.config/PulseEffects/output/README.md
index e23f5b0..e23f5b0 100644
--- a/.config/PulseEffects/output/README.md
+++ b/misc/.config/PulseEffects/output/README.md
diff --git a/.config/PulseEffects/output/Razer Sorround.json b/misc/.config/PulseEffects/output/Razer Sorround.json
index d989278..d989278 100644
--- a/.config/PulseEffects/output/Razer Sorround.json
+++ b/misc/.config/PulseEffects/output/Razer Sorround.json
diff --git a/.config/StarTubeSettings.json b/misc/.config/StarTubeSettings.json
index 99d4430..99d4430 100644
--- a/.config/StarTubeSettings.json
+++ b/misc/.config/StarTubeSettings.json
diff --git a/.config/VLTakeout_Localdb_CONFIG_1747466646871.json b/misc/.config/VLTakeout_Localdb_CONFIG_1747466646871.json
index d179063..d179063 100644
--- a/.config/VLTakeout_Localdb_CONFIG_1747466646871.json
+++ b/misc/.config/VLTakeout_Localdb_CONFIG_1747466646871.json
diff --git a/.config/devilspie2/devilspie2.lua b/misc/.config/devilspie2/devilspie2.lua
index 8babe1d..8babe1d 100644
--- a/.config/devilspie2/devilspie2.lua
+++ b/misc/.config/devilspie2/devilspie2.lua
diff --git a/.config/devilspie2/set-xdg-icon.sh b/misc/.config/devilspie2/set-xdg-icon.sh
index 704d64b..704d64b 100755
--- a/.config/devilspie2/set-xdg-icon.sh
+++ b/misc/.config/devilspie2/set-xdg-icon.sh
diff --git a/.config/joplin-desktop/userchrome.css b/misc/.config/joplin-desktop/userchrome.css
index 29ce612..29ce612 100644
--- a/.config/joplin-desktop/userchrome.css
+++ b/misc/.config/joplin-desktop/userchrome.css
diff --git a/.config/joplin-desktop/userstyle.css b/misc/.config/joplin-desktop/userstyle.css
index 5f02386..5f02386 100644
--- a/.config/joplin-desktop/userstyle.css
+++ b/misc/.config/joplin-desktop/userstyle.css
diff --git a/.config/libinput-gestures.conf b/misc/.config/libinput-gestures.conf
index 6c1e9de..6c1e9de 100755
--- a/.config/libinput-gestures.conf
+++ b/misc/.config/libinput-gestures.conf
diff --git a/.runelite/settings.properties b/misc/.runelite/settings.properties
index 003df00..003df00 100644
--- a/.runelite/settings.properties
+++ b/misc/.runelite/settings.properties
diff --git a/.sxhkdrc b/misc/.sxhkdrc
index 77daebc..77daebc 100644
--- a/.sxhkdrc
+++ b/misc/.sxhkdrc
diff --git a/.config/copyq/copyq.conf b/misc_tray/.config/copyq/copyq.conf
index 01b10ce..01b10ce 100644
--- a/.config/copyq/copyq.conf
+++ b/misc_tray/.config/copyq/copyq.conf
diff --git a/.config/flameshot/flameshot.ini b/misc_tray/.config/flameshot/flameshot.ini
index 2c6fc1a..2c6fc1a 100644
--- a/.config/flameshot/flameshot.ini
+++ b/misc_tray/.config/flameshot/flameshot.ini
diff --git a/.config/pavucontrol.ini b/misc_tray/.config/pavucontrol.ini
index 9585a0f..9585a0f 100644
--- a/.config/pavucontrol.ini
+++ b/misc_tray/.config/pavucontrol.ini
diff --git a/.config/pnmixer/config b/misc_tray/.config/pnmixer/config
index 534c7d7..534c7d7 100644
--- a/.config/pnmixer/config
+++ b/misc_tray/.config/pnmixer/config
diff --git a/.config/redshift.conf b/misc_tray/.config/redshift.conf
index 38558a3..38558a3 100644
--- a/.config/redshift.conf
+++ b/misc_tray/.config/redshift.conf
diff --git a/.moc/themes/rapture b/misc_tui/.moc/themes/rapture
index 5cb5324..5cb5324 100644
--- a/.moc/themes/rapture
+++ b/misc_tui/.moc/themes/rapture
diff --git a/.moc/timidity.cfg b/misc_tui/.moc/timidity.cfg
index a5479c1..a5479c1 100644
--- a/.moc/timidity.cfg
+++ b/misc_tui/.moc/timidity.cfg
diff --git a/.config/nix/nix.conf b/nixos/.config/nix/nix.conf
index c7d7291..c7d7291 100644
--- a/.config/nix/nix.conf
+++ b/nixos/.config/nix/nix.conf
diff --git a/.config/dunst/dunstrc b/openbox_de/.config/dunst/dunstrc
index d10c054..d10c054 100644
--- a/.config/dunst/dunstrc
+++ b/openbox_de/.config/dunst/dunstrc
diff --git a/.config/gtk-3.0/gtk.css b/openbox_de/.config/gtk-3.0/gtk.css
index 7a0ec72..7a0ec72 100644
--- a/.config/gtk-3.0/gtk.css
+++ b/openbox_de/.config/gtk-3.0/gtk.css
diff --git a/.config/gtk-3.0/settings.ini b/openbox_de/.config/gtk-3.0/settings.ini
index b65c536..b65c536 100644
--- a/.config/gtk-3.0/settings.ini
+++ b/openbox_de/.config/gtk-3.0/settings.ini
diff --git a/.config/jgmenu/append.csv b/openbox_de/.config/jgmenu/append.csv
index d33d0ea..d33d0ea 100644
--- a/.config/jgmenu/append.csv
+++ b/openbox_de/.config/jgmenu/append.csv
diff --git a/.config/jgmenu/jgmenurc b/openbox_de/.config/jgmenu/jgmenurc
index bca16d9..bca16d9 100644
--- a/.config/jgmenu/jgmenurc
+++ b/openbox_de/.config/jgmenu/jgmenurc
diff --git a/.config/jgmenu/jgmenusimplerc b/openbox_de/.config/jgmenu/jgmenusimplerc
index bb97010..bb97010 100644
--- a/.config/jgmenu/jgmenusimplerc
+++ b/openbox_de/.config/jgmenu/jgmenusimplerc
diff --git a/.config/jgmenu/prepend.csv b/openbox_de/.config/jgmenu/prepend.csv
index c4a55b7..c4a55b7 100644
--- a/.config/jgmenu/prepend.csv
+++ b/openbox_de/.config/jgmenu/prepend.csv
diff --git a/.config/lead/lead.conf b/openbox_de/.config/lead/lead.conf
index 77aa77d..77aa77d 100644
--- a/.config/lead/lead.conf
+++ b/openbox_de/.config/lead/lead.conf
diff --git a/.config/openbox/autostart b/openbox_de/.config/openbox/autostart
index eb863cf..eb863cf 100644..100755
--- a/.config/openbox/autostart
+++ b/openbox_de/.config/openbox/autostart
diff --git a/.config/openbox/environment b/openbox_de/.config/openbox/environment
index 3311bd6..3311bd6 100644
--- a/.config/openbox/environment
+++ b/openbox_de/.config/openbox/environment
diff --git a/.config/openbox/rc.xml b/openbox_de/.config/openbox/rc.xml
index d92531c..d92531c 100644
--- a/.config/openbox/rc.xml
+++ b/openbox_de/.config/openbox/rc.xml
diff --git a/.config/openbox/terminals.menu b/openbox_de/.config/openbox/terminals.menu
index 450543e..450543e 100644
--- a/.config/openbox/terminals.menu
+++ b/openbox_de/.config/openbox/terminals.menu
diff --git a/.config/picom.conf b/openbox_de/.config/picom.conf
index e4ff1b7..e4ff1b7 100644
--- a/.config/picom.conf
+++ b/openbox_de/.config/picom.conf
diff --git a/.config/tint2/gaming.tint2rc b/openbox_de/.config/tint2/gaming.tint2rc
index 306d450..306d450 100644
--- a/.config/tint2/gaming.tint2rc
+++ b/openbox_de/.config/tint2/gaming.tint2rc
diff --git a/.config/tint2/programmer.tint2rc b/openbox_de/.config/tint2/programmer.tint2rc
index 3a4a0a5..3a4a0a5 100644
--- a/.config/tint2/programmer.tint2rc
+++ b/openbox_de/.config/tint2/programmer.tint2rc
diff --git a/.config/tint2/switcher.tint2rc b/openbox_de/.config/tint2/switcher.tint2rc
index bdbc422..bdbc422 100644
--- a/.config/tint2/switcher.tint2rc
+++ b/openbox_de/.config/tint2/switcher.tint2rc
diff --git a/.config/tint2/tint2rc b/openbox_de/.config/tint2/tint2rc
index 96c853b..96c853b 100644
--- a/.config/tint2/tint2rc
+++ b/openbox_de/.config/tint2/tint2rc
diff --git a/.config/tint2/work.tint2rc b/openbox_de/.config/tint2/work.tint2rc
index 3d12e30..3d12e30 100644
--- a/.config/tint2/work.tint2rc
+++ b/openbox_de/.config/tint2/work.tint2rc
diff --git a/.dmrc b/openbox_de/.dmrc
index 4b2ee06..4b2ee06 100644
--- a/.dmrc
+++ b/openbox_de/.dmrc
diff --git a/.gtkrc-2.0 b/openbox_de/.gtkrc-2.0
index c64e9c5..c64e9c5 100644
--- a/.gtkrc-2.0
+++ b/openbox_de/.gtkrc-2.0
diff --git a/.xsession b/openbox_de/.xsession
index c44e7f2..c44e7f2 100755
--- a/.xsession
+++ b/openbox_de/.xsession
diff --git a/jgmenu b/openbox_de/jgmenu
index 4c92f66..4c92f66 100644
--- a/jgmenu
+++ b/openbox_de/jgmenu
diff --git a/.scripts/autostart b/scripts/bin/autostart
index 0473e7b..0473e7b 100755
--- a/.scripts/autostart
+++ b/scripts/bin/autostart
diff --git a/.scripts/battery-status b/scripts/bin/battery-status
index 4201b58..4201b58 100755
--- a/.scripts/battery-status
+++ b/scripts/bin/battery-status
diff --git a/.scripts/brightness-control b/scripts/bin/brightness-control
index 3aa2139..3aa2139 100755
--- a/.scripts/brightness-control
+++ b/scripts/bin/brightness-control
diff --git a/.scripts/lock b/scripts/bin/lock
index e0f8365..e0f8365 100755
--- a/.scripts/lock
+++ b/scripts/bin/lock
diff --git a/.scripts/on-logout b/scripts/bin/on-logout
index 8be0a81..8be0a81 100755
--- a/.scripts/on-logout
+++ b/scripts/bin/on-logout
diff --git a/.scripts/plumb b/scripts/bin/plumb
index 6f42d7c..6f42d7c 100755
--- a/.scripts/plumb
+++ b/scripts/bin/plumb
diff --git a/.scripts/rclone.sh b/scripts/bin/rclone.sh
index c8e0e16..c8e0e16 100755
--- a/.scripts/rclone.sh
+++ b/scripts/bin/rclone.sh
diff --git a/.scripts/start-panels b/scripts/bin/start-panels
index 9184f6c..9184f6c 100755
--- a/.scripts/start-panels
+++ b/scripts/bin/start-panels
diff --git a/.scripts/toggle-desktop b/scripts/bin/toggle-desktop
index b5906bc..b5906bc 100755
--- a/.scripts/toggle-desktop
+++ b/scripts/bin/toggle-desktop
diff --git a/.Xresources b/terminal/.Xresources
index 7f8a212..7f8a212 100644
--- a/.Xresources
+++ b/terminal/.Xresources
diff --git a/.config/terminator/config b/terminal/.config/terminator/config
index 839941c..839941c 100644
--- a/.config/terminator/config
+++ b/terminal/.config/terminator/config
diff --git a/.screenrc b/terminal/.screenrc
index 543e198..543e198 100644
--- a/.screenrc
+++ b/terminal/.screenrc
diff --git a/.tmux.conf b/terminal/.tmux.conf
index 207d7e8..207d7e8 100644
--- a/.tmux.conf
+++ b/terminal/.tmux.conf
diff --git a/.wakatime.cfg b/wakatime/.wakatime.cfg
index a4f74fc..a4f74fc 100644
--- a/.wakatime.cfg
+++ b/wakatime/.wakatime.cfg