Theme stuff

40 files changed, 498 insertions, 1402 deletions

diff --git a/.editorconfig b/.editorconfig
index 0e5e74d..24ccccc 100644
--- a/.editorconfig
+++ b/.editorconfig
@@ -5,3 +5,4 @@ indent_style=space
 indent_size=2
 tab_width=2
 end_of_line=lf
+trim_trailing_whitespace = true
diff --git a/files/fonts/Envy Code R Bold.ttf b/files/fonts/Envy Code R Bold.ttf
new file mode 100644
index 0000000..5e04b16
--- /dev/null
+++ b/files/fonts/Envy Code R Bold.ttf
diff --git a/files/fonts/Envy Code R Italic.ttf b/files/fonts/Envy Code R Italic.ttf
new file mode 100644
index 0000000..cf67fe0
--- /dev/null
+++ b/files/fonts/Envy Code R Italic.ttf
diff --git a/files/fonts/Envy Code R.ttf b/files/fonts/Envy Code R.ttf
new file mode 100644
index 0000000..e8e4a60
--- /dev/null
+++ b/files/fonts/Envy Code R.ttf
diff --git a/files/hollywood_uptodate.diff b/files/hollywood_uptodate.diff
deleted file mode 100644
index 97b025d..0000000
--- a/files/hollywood_uptodate.diff
+++ /dev/null
@@ -1,487 +0,0 @@
-diff --git a/bin/hollywood b/bin/hollywood
-index 63471ee..917811c 100755
---- a/bin/hollywood
-+++ b/bin/hollywood
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- # N.B.: Use bash for $RANDOM
- #
- # hollywood: create a hollywood suitable consoles of tech geekery
-@@ -74,7 +74,8 @@ if [ -z "$TMUX" ]; then
- 	else
- 		tmux_launcher=tmux
- 	fi
--	$tmux_launcher new-session -d -s $PKG "/bin/bash"
-+	$tmux_launcher new-session -d -s $PKG "/usr/bin/env bash"
-+	$tmux_launcher bind -n C-c kill-session
- 	$tmux_launcher send-keys -t $PKG "$0 -s $SPLITS -d $DELAY"
- 	$tmux_launcher send-keys -t $PKG Enter
- 	exec $tmux_launcher attach-session -t $PKG
-@@ -83,7 +84,9 @@ fi
- 
- tmux new-window -n $PKG "$WIDGET_DIR/$widget1" \; \
- 	set-option -g pane-active-border-bg "default" \; \
--	set-option -g pane-active-border-fg "default" >/dev/null 2>&1
-+	set-option -g pane-active-border-fg "default" \;
-+	set-option -g remain-on-exit "off" \;
-+    >/dev/null 2>&1
- 
- spin_up
- 
-diff --git a/bin/wallstreet b/bin/wallstreet
-index 5463c89..fa14c5b 100755
---- a/bin/wallstreet
-+++ b/bin/wallstreet
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- # N.B.: Use bash for $RANDOM
- #
- # wallstreet: create wallstreet suitable consoles of news nerdery
-@@ -42,7 +42,8 @@ if [ -z "$TMUX" ]; then
- 	else
- 		tmux_launcher=tmux
- 	fi
--	$tmux_launcher new-session -d -s $PKG "/bin/bash"
-+	$tmux_launcher new-session -d -s $PKG "/usr/bin/env bash"
-+	$tmux_launcher bind -n C-c kill-session
- 	$tmux_launcher send-keys -t $PKG "$0 $1"
- 	$tmux_launcher send-keys -t $PKG Enter
- 	exec $tmux_launcher attach-session -t $PKG
-diff --git a/lib/hollywood/apg b/lib/hollywood/apg
-index 3dcea9f..15cc295 100755
---- a/lib/hollywood/apg
-+++ b/lib/hollywood/apg
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v apg >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	apg -qlt -c /dev/urandom -n 1 -m 4 | ccze -A -c default=$(printf "red\ngreen\nyellow\nblue\nmagenta\ncyan" | sort -R | head -n1)
- 	sleep 0.2
-diff --git a/lib/hollywood/atop b/lib/hollywood/atop
-index 8822296..b175e1c 100755
---- a/lib/hollywood/atop
-+++ b/lib/hollywood/atop
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2019 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v atop >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	atop
- done
-diff --git a/lib/hollywood/bmon b/lib/hollywood/bmon
-index 1361709..ea71235 100755
---- a/lib/hollywood/bmon
-+++ b/lib/hollywood/bmon
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/hollywood/cmatrix b/lib/hollywood/cmatrix
-index 1f6fc24..a3c7228 100755
---- a/lib/hollywood/cmatrix
-+++ b/lib/hollywood/cmatrix
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v cmatrix >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	cmatrix -b
- done
-diff --git a/lib/hollywood/code b/lib/hollywood/code
-index 8a40314..8a826b4 100755
---- a/lib/hollywood/code
-+++ b/lib/hollywood/code
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- #
- # Copyright 2014-2023 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -19,9 +19,11 @@ command -v find >/dev/null 2>&1 || exit 1
- # try to colorize our code, but if not, just print it to screen
- command -v pygmentize >/dev/null 2>&1 && viewer="pygmentize" || viewer="cat"
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
--	FILES=$(find /usr -readable -size +0 -type f -name \*.java -o -name \*.c -o -name \*.cpp -o -name \*.py 2>/dev/null | sort -R)
-+	FILES=$(find /usr /run/current-system/sw/ -readable -size +0 -type f -name \*.java -o -name \*.c -o -name \*.cpp -o -name \*.py 2>/dev/null | sort -R)
- 	for f in $FILES; do
- 		$viewer "$f" 2>/dev/null || true
- 		sleep 2
-diff --git a/lib/hollywood/errno b/lib/hollywood/errno
-index 934d678..7b65de8 100755
---- a/lib/hollywood/errno
-+++ b/lib/hollywood/errno
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -17,7 +17,9 @@
- command -v errno >/dev/null 2>&1 || exit 1
- command -v ccze >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	errno --list | sort -R | ccze -A
- 	sleep 0.6
-diff --git a/lib/hollywood/hexdump b/lib/hollywood/hexdump
-index f2fb0bd..56ccfdb 100755
---- a/lib/hollywood/hexdump
-+++ b/lib/hollywood/hexdump
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -17,10 +17,12 @@
- command -v hexdump >/dev/null 2>&1 || exit 1
- command -v ccze >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
--	for f in $(ls /usr/bin/ | sort -R); do
--		head -c 4096 "/usr/bin/$f" | hexdump -C | ccze -A -c default=green -c dir="bold green"
-+	for f in $(find /usr/bin/ /run/current-system/sw/bin/ | sort -R); do
-+		head -c 4096 "$f" | hexdump -C | ccze -A -c default=green -c dir="bold green"
- 		sleep 0.7
- 	done
- done
-diff --git a/lib/hollywood/htop b/lib/hollywood/htop
-index d44f1e5..c1ab4b1 100755
---- a/lib/hollywood/htop
-+++ b/lib/hollywood/htop
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v htop >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	htop
- done
-diff --git a/lib/hollywood/jp2a b/lib/hollywood/jp2a
-index a4c0987..0434386 100755
---- a/lib/hollywood/jp2a
-+++ b/lib/hollywood/jp2a
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- #
- # Copyright 2014-2023 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -20,9 +20,11 @@ command -v find >/dev/null 2>&1 || exit 1
- # try to render images to ascii art
- command -v jp2a >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
--	FILES=$(find /usr -readable -size +0 -type f -name \*.jpg 2>/dev/null | sort -R)
-+	FILES=$(find /usr /run/current-system/sw -readable -size +0 -type f -name \*.jpg 2>/dev/null | sort -R)
- 	for f in $FILES; do
- 		clear
- 		jp2a --colors --term-fit "$f"
-diff --git a/lib/hollywood/logs b/lib/hollywood/logs
-index 566d825..8ce8087 100755
---- a/lib/hollywood/logs
-+++ b/lib/hollywood/logs
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v ccze >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	LOGS=$(find /var/log -type f -name "*.log" 2>/dev/null | head -n 4096 | sort -R)
- 	for log in $LOGS; do
-diff --git a/lib/hollywood/man b/lib/hollywood/man
-index 2d42513..046aa9a 100755
---- a/lib/hollywood/man
-+++ b/lib/hollywood/man
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -17,9 +17,11 @@
- command -v man >/dev/null 2>&1 || exit 1
- command -v ccze >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
--	FILES=$(ls /usr/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096)
-+	FILES=$(ls /usr/share/man/man1/ /run/current-system/sw/share/man/man1/ | sort -R | sed "s/\.1\.gz.*$//" | head -n 4096)
- 	for f in $FILES; do
- 		man "$f" | ccze -A
- 		sleep 0.2
-diff --git a/lib/hollywood/map b/lib/hollywood/map
-index 47beb7d..7a5d21e 100755
---- a/lib/hollywood/map
-+++ b/lib/hollywood/map
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2019 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v jp2a >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- 
- PKG=hollywood
- dir="$(dirname $0)/../../share/$PKG"
-diff --git a/lib/hollywood/mplayer b/lib/hollywood/mplayer
-index b56f7f9..e0f61a7 100755
---- a/lib/hollywood/mplayer
-+++ b/lib/hollywood/mplayer
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -14,8 +14,8 @@
- # See the License for the specific language governing permissions and
- # limitations under the License.
- 
--command -v mplayer >/dev/null 2>&1 || exit 1
-+command -v mpv >/dev/null 2>&1 || exit 1
- trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- PKG=hollywood
- dir="$(dirname $0)/../../share/$PKG"
--DISPLAY= mplayer -vo caca -loop 0 -ss $((RANDOM % 100)) -speed 100 $MPLAYER_OPTS $dir/soundwave.mp4
-+DISPLAY= mpv -vo caca --loop --start=$((RANDOM % 100)) --speed=100 $MPLAYER_OPTS $dir/soundwave.mp4
-diff --git a/lib/hollywood/speedometer b/lib/hollywood/speedometer
-index b0295f9..a00ea55 100755
---- a/lib/hollywood/speedometer
-+++ b/lib/hollywood/speedometer
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v speedometer >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	while read Iface Destination Gateway Flags RefCnt Use Metric Mask MTU Window IRTT; do
- 		[ "$Mask" = "00000000" ] && break
-diff --git a/lib/hollywood/sshart b/lib/hollywood/sshart
-index 1a053ba..46ebad1 100755
---- a/lib/hollywood/sshart
-+++ b/lib/hollywood/sshart
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -19,12 +19,14 @@ command -v ccze >/dev/null 2>&1 || exit 1
- 
- PKG=hollywood
- tmpdir="/tmp/$PKG"
--trap "rm -rf $tmpdir 2>/dev/null && pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "rm -rf $tmpdir 2>/dev/null && pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	mkdir -p "$tmpdir"
- 	tmpfile=$(mktemp -p "$tmpdir" -t XXXXXX)
- 	rm -f $tmpfile
--	art=$(ssh-keygen -vvv -b 1024 -t dsa -N "" -f $tmpfile)
-+	art=$(ssh-keygen -vvv -b 1024 -t rsa -N "" -f $tmpfile)
- 	rm -f $tmpfile $tmpfile.pub
- 	wait
- 	clear
-diff --git a/lib/hollywood/stat b/lib/hollywood/stat
-index 7ecb715..6f8e19e 100755
---- a/lib/hollywood/stat
-+++ b/lib/hollywood/stat
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -17,7 +17,9 @@
- command -v stat >/dev/null 2>&1 || exit 1
- command -v ccze >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- while true; do
- 	for f in $(find /sys /dev 2>/dev/null | head -n 4096 | sort -R); do
- 		stat "$f" | ccze -A -c default=yellow
-diff --git a/lib/hollywood/tree b/lib/hollywood/tree
-index 6a16197..8b816c0 100755
---- a/lib/hollywood/tree
-+++ b/lib/hollywood/tree
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2014 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-@@ -16,7 +16,9 @@
- 
- command -v tree >/dev/null 2>&1 || exit 1
- 
--trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
-+set -e
-+set -o pipefail
-+#trap "pkill -f -9 lib/hollywood/ >/dev/null 2>&1; exit" INT
- DIRS="/sys /dev"
- 
- while true; do
-diff --git a/lib/wallstreet/breaks b/lib/wallstreet/breaks
-index 6920a62..abdd6b7 100755
---- a/lib/wallstreet/breaks
-+++ b/lib/wallstreet/breaks
-@@ -1,4 +1,4 @@
--#!/usr/bin/python3
-+#! /usr/bin/env python3
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/wallstreet/img2txt b/lib/wallstreet/img2txt
-index 8fce26d..15e6059 100755
---- a/lib/wallstreet/img2txt
-+++ b/lib/wallstreet/img2txt
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/wallstreet/jp2a b/lib/wallstreet/jp2a
-index 03dee2a..98db8e1 100755
---- a/lib/wallstreet/jp2a
-+++ b/lib/wallstreet/jp2a
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/wallstreet/newsboat b/lib/wallstreet/newsboat
-index 6d89b1b..beffdba 100755
---- a/lib/wallstreet/newsboat
-+++ b/lib/wallstreet/newsboat
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/wallstreet/rsstail b/lib/wallstreet/rsstail
-index bab8494..949a8db 100755
---- a/lib/wallstreet/rsstail
-+++ b/lib/wallstreet/rsstail
-@@ -1,4 +1,4 @@
--#!/bin/bash
-+#! /usr/bin/env bash
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/wallstreet/ticker b/lib/wallstreet/ticker
-index 6cdc7ce..73ffb1f 100755
---- a/lib/wallstreet/ticker
-+++ b/lib/wallstreet/ticker
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
-diff --git a/lib/wallstreet/w3m b/lib/wallstreet/w3m
-index a53bbff..b4f4926 100755
---- a/lib/wallstreet/w3m
-+++ b/lib/wallstreet/w3m
-@@ -1,4 +1,4 @@
--#!/bin/sh
-+#! /usr/bin/env sh
- #
- # Copyright 2016 Dustin Kirkland <dustin.kirkland@gmail.com>
- #
diff --git a/files/nixpkgs-patches/.gitignore b/files/nixpkgs-patches/.gitignore
new file mode 100644
index 0000000..e69de29
--- /dev/null
+++ b/files/nixpkgs-patches/.gitignore
diff --git a/files/nixpkgs-patches/321026.diff b/files/nixpkgs-patches/321026.diff
deleted file mode 100644
index db9721a..0000000
--- a/files/nixpkgs-patches/321026.diff
+++ /dev/null
@@ -1,529 +0,0 @@
-diff --git a/neo-tree filesystem [1] b/neo-tree filesystem [1]
-new file mode 100644
-index 0000000000000..e69de29bb2d1d
-diff --git a/pkgs/by-name/cq/cq/package.nix b/pkgs/by-name/cq/cq/package.nix
-index 82fc31a7bbdd3..25c2b9c94656b 100644
---- a/pkgs/by-name/cq/cq/package.nix
-+++ b/pkgs/by-name/cq/cq/package.nix
-@@ -2,7 +2,7 @@
- , fetchFromGitHub
- , fetchurl
- , buildGraalvmNativeImage
--, graalvmCEPackages
-+, graalvmPackages
- }:
- 
- buildGraalvmNativeImage rec {
-@@ -23,7 +23,7 @@ buildGraalvmNativeImage rec {
-     hash = "sha256-yjAC2obipdmh+JlHzVUTMtTXN2VKe4WKkyJyu2Q93c8=";
-   };
- 
--  graalvmDrv = graalvmCEPackages.graalvm-ce;
-+  graalvmDrv = graalvmPackages.graalvm-ce;
- 
-   executable = "cq";
- 
-diff --git a/pkgs/development/compilers/graalvm/buildGraalvm.nix b/pkgs/development/compilers/graalvm/buildGraalvm.nix
-new file mode 100644
-index 0000000000000..b465dda84113c
---- /dev/null
-+++ b/pkgs/development/compilers/graalvm/buildGraalvm.nix
-@@ -0,0 +1,241 @@
-+{
-+  lib,
-+  stdenv,
-+  alsa-lib,
-+  autoPatchelfHook,
-+  cairo,
-+  cups,
-+  darwin,
-+  fontconfig,
-+  glib,
-+  glibc,
-+  gtk3,
-+  makeWrapper,
-+  musl,
-+  runCommandCC,
-+  setJavaClassPath,
-+  unzip,
-+  xorg,
-+  zlib,
-+  # extra params
-+  extraCLibs ? [ ],
-+  gtkSupport ? stdenv.isLinux,
-+  useMusl ? false,
-+  ...
-+}@args:
-+
-+assert useMusl -> stdenv.isLinux;
-+let
-+  extraArgs = builtins.removeAttrs args [
-+    "lib"
-+    "stdenv"
-+    "alsa-lib"
-+    "autoPatchelfHook"
-+    "cairo"
-+    "cups"
-+    "darwin"
-+    "fontconfig"
-+    "glib"
-+    "glibc"
-+    "gtk3"
-+    "makeWrapper"
-+    "musl"
-+    "runCommandCC"
-+    "setJavaClassPath"
-+    "unzip"
-+    "xorg"
-+    "zlib"
-+    "extraCLibs"
-+    "gtkSupport"
-+    "useMusl"
-+    "passthru"
-+    "meta"
-+  ];
-+
-+  cLibs = lib.optionals stdenv.isLinux (
-+    [
-+      glibc
-+      zlib.static
-+    ]
-+    ++ lib.optionals (!useMusl) [ glibc.static ]
-+    ++ lib.optionals useMusl [ musl ]
-+    ++ extraCLibs
-+  );
-+
-+  # GraalVM 21.3.0+ expects musl-gcc as <system>-musl-gcc
-+  musl-gcc = (
-+    runCommandCC "musl-gcc" { } ''
-+      mkdir -p $out/bin
-+      ln -s ${lib.getDev musl}/bin/musl-gcc $out/bin/${stdenv.hostPlatform.system}-musl-gcc
-+    ''
-+  );
-+  binPath = lib.makeBinPath (lib.optionals useMusl [ musl-gcc ] ++ [ stdenv.cc ]);
-+
-+  runtimeLibraryPath = lib.makeLibraryPath (
-+    [ cups ]
-+    ++ lib.optionals gtkSupport [
-+      cairo
-+      glib
-+      gtk3
-+    ]
-+  );
-+
-+  graalvm-ce = stdenv.mkDerivation (
-+    {
-+      pname = "graalvm-ce";
-+
-+      unpackPhase = ''
-+        runHook preUnpack
-+
-+        mkdir -p "$out"
-+
-+        # The tarball on Linux has the following directory structure:
-+        #
-+        #   graalvm-ce-java11-20.3.0/*
-+        #
-+        # while on Darwin it looks like this:
-+        #
-+        #   graalvm-ce-java11-20.3.0/Contents/Home/*
-+        #
-+        # We therefor use --strip-components=1 vs 3 depending on the platform.
-+        tar xf "$src" -C "$out" --strip-components=${if stdenv.isLinux then "1" else "3"}
-+
-+        # Sanity check
-+        if [ ! -d "$out/bin" ]; then
-+          echo "The `bin` is directory missing after extracting the graalvm"
-+          echo "tarball, please compare the directory structure of the"
-+          echo "tarball with what happens in the unpackPhase (in particular"
-+          echo "with regards to the `--strip-components` flag)."
-+          exit 1
-+        fi
-+
-+        runHook postUnpack
-+      '';
-+
-+      dontStrip = true;
-+
-+      nativeBuildInputs = [
-+        unzip
-+        makeWrapper
-+      ] ++ lib.optional stdenv.isLinux autoPatchelfHook;
-+
-+      propagatedBuildInputs = [
-+        setJavaClassPath
-+        zlib
-+      ] ++ lib.optional stdenv.isDarwin darwin.apple_sdk_11_0.frameworks.Foundation;
-+
-+      buildInputs = lib.optionals stdenv.isLinux [
-+        alsa-lib # libasound.so wanted by lib/libjsound.so
-+        fontconfig
-+        stdenv.cc.cc.lib # libstdc++.so.6
-+        xorg.libX11
-+        xorg.libXext
-+        xorg.libXi
-+        xorg.libXrender
-+        xorg.libXtst
-+      ];
-+
-+      postInstall = ''
-+        # jni.h expects jni_md.h to be in the header search path.
-+        ln -sf $out/include/linux/*_md.h $out/include/
-+
-+        # copy-paste openjdk's preFixup
-+        # Set JAVA_HOME automatically.
-+        mkdir -p $out/nix-support
-+        cat > $out/nix-support/setup-hook << EOF
-+        if [ -z "\''${JAVA_HOME-}" ]; then export JAVA_HOME=$out; fi
-+        EOF
-+
-+        wrapProgram $out/bin/native-image \
-+          --prefix PATH : ${binPath} \
-+          ${toString (map (l: "--add-flags '-H:CLibraryPath=${l}/lib'") cLibs)}
-+      '';
-+
-+      preFixup = lib.optionalString (stdenv.isLinux) ''
-+        for bin in $(find "$out/bin" -executable -type f); do
-+          wrapProgram "$bin" --prefix LD_LIBRARY_PATH : "${runtimeLibraryPath}"
-+        done
-+      '';
-+
-+      doInstallCheck = true;
-+      installCheckPhase = ''
-+        runHook preInstallCheck
-+
-+        ${
-+          # broken in darwin
-+          lib.optionalString stdenv.isLinux ''
-+            echo "Testing Jshell"
-+            echo '1 + 1' | $out/bin/jshell
-+          ''
-+        }
-+
-+        echo ${lib.escapeShellArg ''
-+          public class HelloWorld {
-+            public static void main(String[] args) {
-+              System.out.println("Hello World");
-+            }
-+          }
-+        ''} > HelloWorld.java
-+        $out/bin/javac HelloWorld.java
-+
-+        # run on JVM with Graal Compiler
-+        echo "Testing GraalVM"
-+        $out/bin/java -XX:+UnlockExperimentalVMOptions -XX:+EnableJVMCI -XX:+UseJVMCICompiler HelloWorld | fgrep 'Hello World'
-+
-+        extraNativeImageArgs="$(export -p | sed -n 's/^declare -x \([^=]\+\)=.*$/ -E\1/p' | tr -d \\n)"
-+
-+        echo "Ahead-Of-Time compilation"
-+        $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:-CheckToolchain -H:+ReportExceptionStackTraces -march=compatibility $extraNativeImageArgs HelloWorld
-+        ./helloworld | fgrep 'Hello World'
-+
-+        ${
-+          # -H:+StaticExecutableWithDynamicLibC is only available in Linux
-+          lib.optionalString (stdenv.isLinux && !useMusl) ''
-+            echo "Ahead-Of-Time compilation with -H:+StaticExecutableWithDynamicLibC"
-+            $out/bin/native-image -H:+UnlockExperimentalVMOptions -H:+StaticExecutableWithDynamicLibC -march=compatibility $extraNativeImageArgs HelloWorld
-+            ./helloworld | fgrep 'Hello World'
-+          ''
-+        }
-+
-+        ${
-+          # --static is only available in Linux
-+          lib.optionalString (stdenv.isLinux && useMusl) ''
-+            echo "Ahead-Of-Time compilation with --static and --libc=musl"
-+            $out/bin/native-image $extraNativeImageArgs -march=compatibility --libc=musl --static HelloWorld
-+            ./helloworld | fgrep 'Hello World'
-+          ''
-+        }
-+
-+        runHook postInstallCheck
-+      '';
-+
-+      passthru = {
-+        home = graalvm-ce;
-+        updateScript = [
-+          ./update.sh
-+          "graalvm-ce"
-+        ];
-+      } // (args.passhtru or { });
-+
-+      meta =
-+        with lib;
-+        (
-+          {
-+            homepage = "https://www.graalvm.org/";
-+            description = "High-Performance Polyglot VM";
-+            license = with licenses; [
-+              upl
-+              gpl2Classpath
-+              bsd3
-+            ];
-+            sourceProvenance = with sourceTypes; [ binaryNativeCode ];
-+            mainProgram = "java";
-+            maintainers = with maintainers; teams.graalvm-ce.members ++ [ ];
-+          }
-+          // (args.meta or { })
-+        );
-+    }
-+    // extraArgs
-+  );
-+in
-+graalvm-ce
-diff --git a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix
-index ec662e156721c..a3b47516b0df4 100644
---- a/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix
-+++ b/pkgs/development/compilers/graalvm/community-edition/graaljs/default.nix
-@@ -1,9 +1,9 @@
- { stdenv
- , fetchurl
--, graalvmCEPackages
-+, graalvmPackages
- }:
- 
--graalvmCEPackages.buildGraalvmProduct {
-+graalvmPackages.buildGraalvmProduct {
-   src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
-   version = (import ./hashes.nix).version;
- 
-diff --git a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix
-index d98f4b0e380f4..8df0ab5a38e15 100644
---- a/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix
-+++ b/pkgs/development/compilers/graalvm/community-edition/graalnodejs/default.nix
-@@ -1,9 +1,9 @@
- { stdenv
- , fetchurl
--, graalvmCEPackages
-+, graalvmPackages
- }:
- 
--graalvmCEPackages.buildGraalvmProduct {
-+graalvmPackages.buildGraalvmProduct {
-   src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
-   version = (import ./hashes.nix).version;
- 
-diff --git a/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix
-index e2b28500f7fe4..ff73a7dde8c60 100644
---- a/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix
-+++ b/pkgs/development/compilers/graalvm/community-edition/graalpy/default.nix
-@@ -1,9 +1,9 @@
- { stdenv
- , fetchurl
--, graalvmCEPackages
-+, graalvmPackages
- }:
- 
--graalvmCEPackages.buildGraalvmProduct {
-+graalvmPackages.buildGraalvmProduct {
-   src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
-   version = (import ./hashes.nix).version;
- 
-diff --git a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
-index b7f7db61097f2..da5b59417e20b 100644
---- a/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
-+++ b/pkgs/development/compilers/graalvm/community-edition/graalvm-ce/default.nix
-@@ -1,10 +1,10 @@
- { stdenv
- , fetchurl
--, graalvmCEPackages
-+, graalvmPackages
- , useMusl ? false
- }:
- 
--graalvmCEPackages.buildGraalvm {
-+graalvmPackages.buildGraalvm {
-   inherit useMusl;
-   src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
-   version = (import ./hashes.nix).version;
-diff --git a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix
-index da971347652e1..de9e93c180fd6 100644
---- a/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix
-+++ b/pkgs/development/compilers/graalvm/community-edition/truffleruby/default.nix
-@@ -1,12 +1,12 @@
- { lib
- , stdenv
- , fetchurl
--, graalvmCEPackages
-+, graalvmPackages
- , libyaml
- , openssl
- }:
- 
--graalvmCEPackages.buildGraalvmProduct {
-+graalvmPackages.buildGraalvmProduct {
-   src = fetchurl (import ./hashes.nix).hashes.${stdenv.system};
-   version = (import ./hashes.nix).version;
- 
-diff --git a/pkgs/development/compilers/graalvm/default.nix b/pkgs/development/compilers/graalvm/default.nix
-new file mode 100644
-index 0000000000000..6dc0715a7bd8d
---- /dev/null
-+++ b/pkgs/development/compilers/graalvm/default.nix
-@@ -0,0 +1,13 @@
-+{ callPackage }:
-+
-+let
-+  cePackages = callPackage ./community-edition { };
-+in
-+cePackages
-+// rec {
-+  buildGraalvm = callPackage ./buildGraalvm.nix;
-+
-+  graalvm-oracle_22 = callPackage ./graalvm-oracle { version = "22"; };
-+  graalvm-oracle_17 = callPackage ./graalvm-oracle { version = "17"; };
-+  graalvm-oracle = graalvm-oracle_22;
-+}
-diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
-new file mode 100644
-index 0000000000000..d8a9f14e70e3f
---- /dev/null
-+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/default.nix
-@@ -0,0 +1,16 @@
-+{
-+  lib,
-+  stdenv,
-+  fetchurl,
-+  graalvmPackages,
-+  useMusl ? false,
-+  version ? "22",
-+}:
-+
-+graalvmPackages.buildGraalvm {
-+  inherit useMusl version;
-+  src = fetchurl (import ./hashes.nix).${version}.${stdenv.system};
-+  meta.platforms = builtins.attrNames (import ./hashes.nix).${version};
-+  meta.license = lib.licenses.unfree;
-+  pname = "graalvm-oracle";
-+}
-diff --git a/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
-new file mode 100644
-index 0000000000000..1df3f67dc3e4f
---- /dev/null
-+++ b/pkgs/development/compilers/graalvm/graalvm-oracle/hashes.nix
-@@ -0,0 +1,38 @@
-+{
-+  "22" = {
-+    "aarch64-linux" = {
-+      hash = "sha256-E0Fm6mFB7o39pu7JVWOoXT9BdPWiSXBx2hPvlruD5ls=";
-+      url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-aarch64_bin.tar.gz";
-+    };
-+    "x86_64-linux" = {
-+      hash = "sha256-1YPNsBygI6N+7UXZ0YS2i3qNf1C1jd4TaQQfKUw09KM=";
-+      url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_linux-x64_bin.tar.gz";
-+    };
-+    "x86_64-darwin" = {
-+      hash = "sha256-waR39L44Ew8wznRc67tYD3HGFZ2UUD4+ELerWnxNpms=";
-+      url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-x64_bin.tar.gz";
-+    };
-+    "aarch64-darwin" = {
-+      hash = "sha256-dzUVPih81jopuxAx8sAYdwonNOXHyyirUUOhvStK1F8=";
-+      url = "https://download.oracle.com/graalvm/22/archive/graalvm-jdk-22.0.1_macos-aarch64_bin.tar.gz";
-+    };
-+  };
-+  "17" = {
-+    "aarch64-linux" = {
-+      hash = "sha256-0J/XaXGzNyBgxrW1HgUvtBCPPRfAvzwOx67p/QcY4u0=";
-+      url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-aarch64_bin.tar.gz";
-+    };
-+    "x86_64-linux" = {
-+      hash = "sha256-t0GHR7MGSZDSAGeX7bsI1ziugaP4euRcJq+covDBUYw=";
-+      url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_linux-x64_bin.tar.gz";
-+    };
-+    "x86_64-darwin" = {
-+      hash = "sha256-q9b6I5hSVt67gkYzUtsJDSi4bPEkzpkoeC5ZyxfqJRc=";
-+      url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-x64_bin.tar.gz";
-+    };
-+    "aarch64-darwin" = {
-+      hash = "sha256-o4BGCfnD25AVYwG1Ol+2eDVCgiB+mk4I1JBIjyETK6s=";
-+      url = "https://download.oracle.com/graalvm/17/archive/graalvm-jdk-17.0.11_macos-aarch64_bin.tar.gz";
-+    };
-+  };
-+}
-diff --git a/pkgs/development/interpreters/babashka/default.nix b/pkgs/development/interpreters/babashka/default.nix
-index f4b51b37c480f..7b82513a15c70 100644
---- a/pkgs/development/interpreters/babashka/default.nix
-+++ b/pkgs/development/interpreters/babashka/default.nix
-@@ -1,6 +1,6 @@
- { lib
- , buildGraalvmNativeImage
--, graalvmCEPackages
-+, graalvmPackages
- , fetchurl
- , writeScript
- , installShellFiles
-@@ -16,7 +16,7 @@ let
-       sha256 = "sha256-uVRk1/lfOXMSp3qOdeMoAFpwJaEBxF1MYtFOv364H7Y=";
-     };
- 
--    graalvmDrv = graalvmCEPackages.graalvm-ce;
-+    graalvmDrv = graalvmPackages.graalvm-ce;
- 
-     executable = "bb";
- 
-diff --git a/pkgs/development/tools/clj-kondo/default.nix b/pkgs/development/tools/clj-kondo/default.nix
-index e764f34c91253..5a68182352e47 100644
---- a/pkgs/development/tools/clj-kondo/default.nix
-+++ b/pkgs/development/tools/clj-kondo/default.nix
-@@ -1,4 +1,4 @@
--{ lib, buildGraalvmNativeImage, graalvmCEPackages, fetchurl
-+{ lib, buildGraalvmNativeImage, graalvmPackages, removeReferencesTo, fetchurl
- }:
- 
- buildGraalvmNativeImage rec {
-@@ -11,7 +11,7 @@ buildGraalvmNativeImage rec {
-     sha256 = "sha256-DrSfL1WazlNd5H0jG6m0S5aED4BLVufr1rGIAyifn6E=";
-   };
- 
--  graalvmDrv = graalvmCEPackages.graalvm-ce;
-+  graalvmDrv = graalvmPackages.graalvm-ce;
- 
-   extraNativeImageBuildArgs =
-     [ "-H:+ReportExceptionStackTraces" "--no-fallback" ];
-diff --git a/pkgs/top-level/aliases.nix b/pkgs/top-level/aliases.nix
-index 91596ddfd6ed5..7cb01b21b2349 100644
---- a/pkgs/top-level/aliases.nix
-+++ b/pkgs/top-level/aliases.nix
-@@ -646,6 +646,8 @@ mapAliases {
-   graalvm11-ce = throw "graalvm11-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26
-   graalvm17-ce = throw "graalvm17-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26
-   graalvm19-ce = throw "graalvm19-ce has been removed because upstream dropped support to different JDK versions for each GraalVM release. Please use graalvm-ce instead"; # Added 2023-09-26
-+  graalvmCEPackages = graalvmPackages; # Added 2024-08-10
-+  graalvm-ce = graalvmPackages.graalvm-ce; # Added 2024-08-10
-   grab-site = throw "grab-site has been removed because it's unmaintained and broken"; # Added 2023-11-12
-   gradle_4 = throw "gradle_4 has been removed because it's no longer being updated"; # Added 2023-01-17
-   gradle_5 = throw "gradle_5 has been removed because it's no longer being updated"; # Added 2023-01-17
-diff --git a/pkgs/top-level/all-packages.nix b/pkgs/top-level/all-packages.nix
-index 271c5ee0343db..1ab15851e8683 100644
---- a/pkgs/top-level/all-packages.nix
-+++ b/pkgs/top-level/all-packages.nix
-@@ -8003,7 +8003,7 @@ with pkgs;
-   };
-   dapl-native = callPackage ../development/interpreters/dzaima-apl {
-     buildNativeImage = true;
--    jdk = graalvm-ce;
-+    jdk = graalvmPackages.graalvm-ce;
-   };
- 
-   gnucap-full = gnucap.withPlugins(p: [ p.verilog ]);
-@@ -15217,10 +15217,9 @@ with pkgs;
-   openjdk = jdk;
-   openjdk_headless = jdk_headless;
- 
--  graalvmCEPackages = callPackage ../development/compilers/graalvm/community-edition { };
--  graalvm-ce = graalvmCEPackages.graalvm-ce;
-+  graalvmPackages = recurseIntoAttrs (callPackage ../development/compilers/graalvm { });
-   buildGraalvmNativeImage = (callPackage ../build-support/build-graalvm-native-image {
--    graalvmDrv = graalvm-ce;
-+    graalvmDrv = graalvmPackages.graalvm-ce;
-   }).override;
- 
-   openshot-qt = libsForQt5.callPackage ../applications/video/openshot-qt {
-@@ -16179,7 +16178,7 @@ with pkgs;
- 
-   dbqn-native = dbqn.override {
-     buildNativeImage = true;
--    jdk = graalvm-ce;
-+    jdk = graalvmPackages.graalvm-ce;
-   };
- 
-   chibi = callPackage ../development/interpreters/chibi { };
diff --git a/files/nixpkgs-patches/amdvlk_new.diff b/files/nixpkgs-patches/amdvlk_new.diff
deleted file mode 100644
index 1899443..0000000
--- a/files/nixpkgs-patches/amdvlk_new.diff
+++ /dev/null
@@ -1,20 +0,0 @@
-diff --git a/pkgs/by-name/am/amdvlk/package.nix b/pkgs/by-name/am/amdvlk/package.nix
-index 2c7b0c918..6651de573 100644
---- a/pkgs/by-name/am/amdvlk/package.nix
-+++ b/pkgs/by-name/am/amdvlk/package.nix
-@@ -29,13 +29,13 @@ let
- in
- stdenv.mkDerivation (finalAttrs: {
-   pname = "amdvlk";
--  version = "2024.Q3.3";
-+  version = "2024.Q4.1";
- 
-   src = fetchRepoProject {
-     name = "amdvlk-src";
-     manifest = "https://github.com/GPUOpen-Drivers/AMDVLK.git";
-     rev = "refs/tags/v-${finalAttrs.version}";
--    hash = "sha256-wIPubMsSaNGTykD/K0gxdba128TqW5nu4CjXoLkprc0=";
-+    hash = "sha256-x1g4VKXbkYM2S0tfXWFESyHwalNwH813mtwWjCQK2ew=";
-   };
- 
-   buildInputs =
diff --git a/files/nixpkgs-patches/hollywood_update_and_mpv.diff b/files/nixpkgs-patches/hollywood_update_and_mpv.diff
deleted file mode 100644
index 98f2a91..0000000
--- a/files/nixpkgs-patches/hollywood_update_and_mpv.diff
+++ /dev/null
@@ -1,39 +0,0 @@
-diff --git a/pkgs/applications/misc/hollywood/default.nix b/pkgs/applications/misc/hollywood/default.nix
-index 1b655e5af..46649a8b0 100644
---- a/pkgs/applications/misc/hollywood/default.nix
-+++ b/pkgs/applications/misc/hollywood/default.nix
-@@ -12,7 +12,7 @@
- , util-linux
- , jp2a
- , man
--, mplayer
-+, mpv
- , openssh
- , tree
- , mlocate
-@@ -36,13 +36,13 @@ stdenv.mkDerivation {
-   src = fetchFromGitHub {
-     owner = "dustinkirkland";
-     repo = "hollywood";
--    rev = "35275a68c37bbc39d8b2b0e4664a0c2f5451e5f6";
--    sha256 = "sha256-faIm1uXERvIDZ6SK6uarVkWGNJskAroHgq5Cg7nUZc4=";
-+    rev = "fa93536a7ce1f2697da2016ee09937d113e259b3";
-+    sha256 = "sha256-fSlkFSoaMzVAlIWx2uZsNHLNW5/2fA/YFPcTW2veP34=";
-   };
- 
-   nativeBuildInputs = [ makeWrapper ];
- 
--  patches = [ ./nixos-paths.patch ];
-+  patches = [ ];
-   postPatch = ''
-     rm lib/hollywood/speedometer
-     rm bin/wallstreet
-@@ -67,7 +67,7 @@ stdenv.mkDerivation {
-       util-linux
-       jp2a
-       man
--      mplayer
-+      mpv
-       openssh
-       tree
-       findutils
diff --git a/files/nixpkgs-patches/noto_cjk_no_variable.diff b/files/nixpkgs-patches/noto_cjk_no_variable.diff
deleted file mode 100644
index 152c140..0000000
--- a/files/nixpkgs-patches/noto_cjk_no_variable.diff
+++ /dev/null
@@ -1,40 +0,0 @@
-diff --git a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
-index 5c7ab768..79981e27 100644
---- a/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
-+++ b/pkgs/by-name/no/noto-fonts-cjk-sans/package.nix
-@@ -13,12 +13,12 @@ stdenvNoCC.mkDerivation rec {
-     owner = "notofonts";
-     repo = "noto-cjk";
-     rev = "Sans${version}";
--    hash = "sha256-IgalJkiOAVjNxKaPAQWfb5hKeqclliR4qVXCq63FGWY=";
--    sparseCheckout = [ "Sans/Variable/OTC" ];
-+    hash = "sha256-GXULnRPsIJRdiL3LdFtHbqTqSvegY2zodBxFm4P55to=";
-+    sparseCheckout = [ "Sans/OTC" ];
-   };
- 
-   installPhase = ''
--    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/Variable/OTC/*.otf.ttc
-+    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Sans/OTC/*.ttc
-   '';
- 
-   passthru.tests.noto-fonts = nixosTests.noto-fonts;
-diff --git a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
-index d9fddcc6..55cde591 100644
---- a/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
-+++ b/pkgs/by-name/no/noto-fonts-cjk-serif/package.nix
-@@ -13,12 +13,12 @@ stdenvNoCC.mkDerivation rec {
-     owner = "notofonts";
-     repo = "noto-cjk";
-     rev = "Serif${version}";
--    hash = "sha256-GLjpTAiHfygj1J4AdUVDJh8kykkFOglq+h4kyat5W9s=";
--    sparseCheckout = [ "Serif/Variable/OTC" ];
-+    hash = "sha256-ihbhbv875XEHupFUzIdEweukqEmwQXCXCiTG7qisE64=";
-+    sparseCheckout = [ "Serif/OTC" ];
-   };
- 
-   installPhase = ''
--    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/Variable/OTC/*.otf.ttc
-+    install -m444 -Dt $out/share/fonts/opentype/noto-cjk Serif/OTC/*.ttc
-   '';
- 
-   passthru.tests.noto-fonts = nixosTests.noto-fonts;
diff --git a/files/nvim/init.vim b/files/nvim/init.vim
index 70ba94d..aa6cd7d 100644
--- a/files/nvim/init.vim
+++ b/files/nvim/init.vim
@@ -6,7 +6,12 @@ set updatetime=250
 set scrolloff=5
 
 " Change directory based on current file.
-set autochdir
+if !empty($NIX_SHELL)
+  " Attempt to conflict less with plugins.
+  autocmd BufEnter * if gitbranch#name() != '' | silent! lcd %:p:h
+else
+  set autochdir
+endif
 
 " inotify compat?
 set backupcopy=yes
@@ -28,7 +33,7 @@ set autoindent
 
 " C syntax preference.
 let g:c_syntax_for_h=1
-set cinoptions=l1,:0,g2,h2,(4,u0
+set cinoptions=:0,=4,l1,g2,h2,(4,u4,+4,m1
 set cindent
 
 " Set different format for mail and text files.
@@ -56,16 +61,6 @@ if !isdirectory(view_dir)
   call mkdir(view_dir, "p", 0700)
 endif
 let &viewdir=view_dir
-" https://github.com/zhimsel/vim-stay/issues/10#issuecomment-336637546
-augroup stay_no_lcd
-  autocmd!
-  if exists(':tcd') == 2
-    autocmd User BufStaySavePre  if haslocaldir() | let w:lcd = getcwd() | exe 'cd '.fnameescape(getcwd(-1, -1)) | endif
-  else
-    autocmd User BufStaySavePre  if haslocaldir() | let w:lcd = getcwd() | cd - | cd - | endif
-  endif
-  autocmd User BufStaySavePost if exists('w:lcd') | execute 'lcd' fnameescape(w:lcd) | unlet w:lcd | endif
-augroup END
 
 " Staggered backups.
 if isdirectory(expand('/mnt/store/backup/vim'))
@@ -88,7 +83,6 @@ if has("persistent_undo")
 endif
 
 " Colorscheme.
-set background=dark
 set termguicolors
 colo wal-gui
 
@@ -111,17 +105,25 @@ let g:fzf_colors = {
  \'info': ['fg', 'PreProc'],
  \'border': ['fg', 'Operator'],
  \'prompt': ['fg', 'Identifier'],
- \'pointer': ['fg', 'String'],
+ \'pointer': ['fg', 'Type'],
  \'marker': ['fg', 'Keyword'],
  \'spinner': ['fg', 'String'],
  \'header': ['fg', 'Type']
 \}
 let g:fzf_preview_window = ['right,47%']
-let g:fzf_layout = { 'window': { 'width': 0.65, 'height': 0.50 } }
+let g:fzf_layout = { 'window': { 'width': 0.70, 'height': 0.50 } }
+
+function! StatuslineMode() abort
+  if mode() == nr2char(22)
+    return mode()
+  else
+    return '-'.mode()
+  endif
+endfunction
 
 function! StatuslineGit()
   let l:branchname = gitbranch#name()
-  return strlen(l:branchname) > 0?'  '.l:branchname.' ':''
+  return strlen(l:branchname) > 0 ? '  '.l:branchname.' ' : ' '
 endfunction
 
 lua << EOF
@@ -142,10 +144,9 @@ endfunction
 " Custom statusline.
 function! Statusline() abort
   let focused = g:statusline_winid == win_getid(winnr())
-  let status = (focused ? '%#StatusLine#' : '%#StatusLineNC#')
+  let status = focused ? '%#StatusLine#' : '%#StatusLineNC#'
   let status .= '%{StatuslineGit()}'
   let status .= ' %f'
-  let status .= ' %m'
   let status .= '  vim@%{hostname()}'
   let status .= '%='
   let status .= ' %y'
@@ -174,6 +175,13 @@ if os.getenv('NIX_SHELL') ~= nil then
       '--pch-storage=memory',
       '--header-insertion=never',
       '--header-insertion-decorators=0'
+    },
+    capabilities = {
+      textDocument = {
+        semanticHighlightingCapabilities = {
+          semanticHighlighting = true
+        }
+      }
     }
   })
   lsp.ruff.setup({})
@@ -247,31 +255,43 @@ vim.keymap.set('n', '<C-k>', [[:wincmd k<CR>]], { silent = true })
 vim.keymap.set('n', '<C-l>', [[:wincmd l<CR>]], { silent = true })
 vim.keymap.set('n', '<C-o>', [[:vsplit<CR>]], { silent = true })
 -- Make ctrl + '.' and ',' map to previous buffer.
-vim.keymap.set('n', '<C-,>', '<c-^>', {})
-vim.keymap.set('n', '<C-.>', '<c-^>', {})
+vim.keymap.set('n', '<C-,>', '<C-^>', {})
+vim.keymap.set('n', '<C-.>', '<C-^>', {})
+-- Swap ctrl + f and b.
+vim.keymap.set('n', '<C-f>', '<C-b>', {})
+vim.keymap.set('n', '<C-b>', '<C-f>', {})
 -- Undotree
 vim.keymap.set('n', 'U', vim.cmd.UndotreeToggle)
 -- Toggle colorcolumn.
 vim.keymap.set('n', 'C', [[:execute 'set colorcolumn=' . (&colorcolumn == '' ? '101' : '')<CR>]], { silent = true })
+-- Personally intuitive pop-up menu binds.
+vim.keymap.set('i', '<CR>', [[pumvisible() ? '<C-y><CR>' : '<CR>']], { expr = true })
+vim.keymap.set('i', '<Up>', [[pumvisible() ? '<C-p>' : '<Up>']], { expr = true })
+vim.keymap.set('i', '<Down>', [[pumvisible() ? '<C-n>' : '<Down>']], { expr = true })
 -- Lsp Binds.
 vim.keymap.set('n', '<C-d>', '<C-]>', {})
 vim.keymap.set('n', '<C-n>', function()
   return ":IncRename " .. vim.fn.expand("<cword>")
 end, { expr = true })
 -- Fzf binds.
-vim.keymap.set('n', '<C-i>', [[:GGrep<CR>]], { silent = true })
 vim.keymap.set('n', '\\', [[:Buffers<CR>]], { silent = true })
--- Personally intuitive pop-up menu binds.
-vim.keymap.set('i', '<CR>', [[pumvisible() ? '<C-y><CR>' : '<CR>']], { expr = true })
-vim.keymap.set('i', '<Up>', [[pumvisible() ? '<C-p>' : '<Up>']], { expr = true })
-vim.keymap.set('i', '<Down>', [[pumvisible() ? '<C-n>' : '<Down>']], { expr = true })
--- Only Neogit bind, handle all further operations from this menu.
-vim.keymap.set('n', 'Y', [[:Neogit<CR>]], { silent = true })
+if os.getenv('NIX_SHELL') ~= nil then
+  vim.keymap.set('n', '<C-i>', [[:GGrep<CR>]], { silent = true })
+  vim.keymap.set('n', '<C-\\>', [[:GFiles<CR>]], { silent = true })
+  -- Only Neogit bind, handle all further operations from this menu.
+  vim.keymap.set('n', 'Y', [[:Neogit<CR>]], { silent = true })
+end
 EOF
 
 command Tabify set noexpandtab | %retab! | set expandtab
 command Untabify set expandtab | %retab!
 
+" https://stackoverflow.com/a/37040415
+function! SyntaxGroup()
+  let l:s = synID(line('.'), col('.'), 1)
+  echo synIDattr(l:s, 'name') . ' -> ' . synIDattr(synIDtrans(l:s), 'name')
+endfun
+
 " https://github.com/junegunn/fzf.vim?tab=readme-ov-file#example-git-grep-wrapper
 command! -bang -nargs=* GGrep
   \ call fzf#vim#grep(
diff --git a/flake.lock b/flake.lock
index 1d2cc26..630094c 100644
--- a/flake.lock
+++ b/flake.lock
@@ -10,11 +10,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732750551,
-        "narHash": "sha256-ynuL2w3pvy9mg6DiVRS6cnDYHWUQxP4s48xc5g6C+Z8=",
+        "lastModified": 1735767567,
+        "narHash": "sha256-CHY0LEB8K/+7j9xdGqd2KZ5+GXAgKIxrIVTvG+4+ZnE=",
         "ref": "refs/heads/master",
-        "rev": "01ab651a6c4a7894eef972f5236996754b0967bb",
-        "revCount": 54,
+        "rev": "298debac881c1e7ca5e3a28834f32ff3e74e45f6",
+        "revCount": 75,
         "type": "git",
         "url": "https://git.akon.city/camu"
       },
@@ -33,11 +33,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732715105,
-        "narHash": "sha256-WGf8bzwNEgbWjM9aTFv9ZCGrBQEfg0fYd4FSoVa2gDs=",
+        "lastModified": 1735566338,
+        "narHash": "sha256-9sYGJZCGeb11WBVsE2u0gwuTk8LpbOgnrJvyDbHpOoY=",
         "owner": "chaotic-cx",
         "repo": "nyx",
-        "rev": "8f153d013632e6036e8bec6377cc5ed7d2ad14df",
+        "rev": "446ad45313df3dbc93ad9e9d8dd6d094b16f6fb4",
         "type": "github"
       },
       "original": {
@@ -50,11 +50,11 @@
     "flake-compat": {
       "flake": false,
       "locked": {
-        "lastModified": 1696426674,
-        "narHash": "sha256-kvjfFW7WAETZlt09AgDn1MrtKzP7t90Vf7vypd3OL1U=",
+        "lastModified": 1733328505,
+        "narHash": "sha256-NeCCThCEP3eCl2l/+27kNNK7QrwZB1IJCrXfrbv5oqU=",
         "owner": "edolstra",
         "repo": "flake-compat",
-        "rev": "0f9255e01c2351cc7d116c072cb317785dd33b33",
+        "rev": "ff81ac966bb2cae68946d5ed5fc4994f96d0ffec",
         "type": "github"
       },
       "original": {
@@ -100,6 +100,27 @@
         "type": "github"
       }
     },
+    "flake-parts_2": {
+      "inputs": {
+        "nixpkgs-lib": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733312601,
+        "narHash": "sha256-4pDvzqnegAfRkPwO3wmwBhVi/Sye1mzps0zHWYnP88c=",
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "rev": "205b12d8b7cd4802fbcb8e8ef6a0f1408781a4f9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "hercules-ci",
+        "repo": "flake-parts",
+        "type": "github"
+      }
+    },
     "flake-schemas": {
       "locked": {
         "lastModified": 1721999734,
@@ -119,11 +140,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1726560853,
-        "narHash": "sha256-X6rJYSESBVr3hBoH0WbKE5KvhPU5bloyZ2L4K60/fPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "c1dfcf08411b08f6b8615f7d8971a2bfa81d5e8a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -175,11 +196,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "lastModified": 1735381016,
+        "narHash": "sha256-CyCZFhMUkuYbSD6bxB/r43EdmDE7hYeZZPTCv0GudO4=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "10e99c43cdf4a0713b4e81d90691d22c6a58bdf2",
         "type": "github"
       },
       "original": {
@@ -197,11 +218,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732482255,
-        "narHash": "sha256-GUffLwzawz5WRVfWaWCg78n/HrBJrOG7QadFY6rtV8A=",
+        "lastModified": 1734622215,
+        "narHash": "sha256-OOfI0XhSJGHblfdNDhfnn8QnZxng63rWk9eeJ2tCbiI=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "a9953635d7f34e7358d5189751110f87e3ac17da",
+        "rev": "1395379a7a36e40f2a76e7b9936cc52950baa1be",
         "type": "github"
       },
       "original": {
@@ -217,11 +238,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732884235,
-        "narHash": "sha256-r8j6R3nrvwbT1aUp4EPQ1KC7gm0pu9VcV1aNaB+XG6Q=",
+        "lastModified": 1735745492,
+        "narHash": "sha256-Vs2IkQx4uDv2YehZ1sCw9K+kuMrBa3opnkGJJhMPNPo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "819f682269f4e002884702b87e445c82840c68f2",
+        "rev": "9a9fef316ad191b3086edda465e850af282de4e0",
         "type": "github"
       },
       "original": {
@@ -239,11 +260,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732648910,
-        "narHash": "sha256-1F83DUfEHnCZpGY4UOlWaamWoDx8eZ9tHaUF51p2hng=",
+        "lastModified": 1735330405,
+        "narHash": "sha256-MhXgu1oymyjhhZGY9yewNonJknNAjilzMGPY1FfMR7s=",
         "owner": "Jovian-Experiments",
         "repo": "Jovian-NixOS",
-        "rev": "e86d2ad72094354326887bd6fe156f327d63d491",
+        "rev": "a86d9cf841eff8b33a05d2bf25788abd8e018dbd",
         "type": "github"
       },
       "original": {
@@ -258,11 +279,11 @@
         "nixpkgs-lib": "nixpkgs-lib"
       },
       "locked": {
-        "lastModified": 1732450403,
-        "narHash": "sha256-qYjJeHYUHDgfDsvMpIf9TRz0oAoMwvYP75XHObDjWIg=",
+        "lastModified": 1734869532,
+        "narHash": "sha256-tMWJ1gDqNkCaH6jmZRXAUUhfhIrLMWJBiM+CtAtQqoY=",
         "owner": "nix-community",
         "repo": "lib-aggregate",
-        "rev": "c817444fb8a3042c26be57d8640fb744bc1b516c",
+        "rev": "1451a8a6902c85c90dae3c253df5401b7eb3581f",
         "type": "github"
       },
       "original": {
@@ -279,11 +300,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732657292,
-        "narHash": "sha256-nFfGyWwMkIrHFLGA6TmhIKTG5G6uLGiygcDtXGDmU54=",
+        "lastModified": 1735091652,
+        "narHash": "sha256-Af3GqjV/w7ff6k7u9rNfGnattVkPB0Ejv9p/5S6kwEo=",
         "ref": "refs/heads/master",
-        "rev": "37a45ee3ae3a7b6b1754a5199ca1750529b09575",
-        "revCount": 60,
+        "rev": "f5ceeabf64a03c08b4de2d57dd20de3bbe855a77",
+        "revCount": 62,
         "type": "git",
         "url": "https://git.akon.city/mauri"
       },
@@ -300,11 +321,11 @@
         "treefmt-nix": "treefmt-nix"
       },
       "locked": {
-        "lastModified": 1732631228,
-        "narHash": "sha256-/7Wyhp00yecUMPNz79gGZpjos8OLHqOfdiWWIQfZA1M=",
+        "lastModified": 1733909753,
+        "narHash": "sha256-5GChR6LKh6EwGXLfR3HLW2Z0AWoyce4Hyp3VB5C4FCk=",
         "owner": "nix-community",
         "repo": "nix-eval-jobs",
-        "rev": "8f56354b794624689851b2d86c2ce0209cc8f0cf",
+        "rev": "b1f94fed4af8e7f30665a3bf8b369dc3b8a95884",
         "type": "github"
       },
       "original": {
@@ -380,11 +401,11 @@
     },
     "nixos-hardware": {
       "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1735388221,
+        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
         "type": "github"
       },
       "original": {
@@ -396,11 +417,11 @@
     },
     "nixos-hardware_2": {
       "locked": {
-        "lastModified": 1732483221,
-        "narHash": "sha256-kF6rDeCshoCgmQz+7uiuPdREVFuzhIorGOoPXMalL2U=",
+        "lastModified": 1735388221,
+        "narHash": "sha256-e5IOgjQf0SZcFCEV/gMGrsI0gCJyqOKShBQU0iiM3Kg=",
         "owner": "NixOS",
         "repo": "nixos-hardware",
-        "rev": "45348ad6fb8ac0e8415f6e5e96efe47dd7f39405",
+        "rev": "7c674c6734f61157e321db595dbfcd8523e04e19",
         "type": "github"
       },
       "original": {
@@ -417,11 +438,11 @@
         "nixpkgs": "nixpkgs"
       },
       "locked": {
-        "lastModified": 1731682434,
-        "narHash": "sha256-HnZFPB7akVIy0KuPq/tEkiB+Brt1qi0DUIDzR8z25qI=",
+        "lastModified": 1733854371,
+        "narHash": "sha256-K9qGHniYBbjqVcEiwXyiofj/IFf78L5F0/FCf+CKyr0=",
         "owner": "nix-community",
         "repo": "NixOS-WSL",
-        "rev": "a6b9cf0b7805e2c50829020a73e7bde683fd36dd",
+        "rev": "dee4425dcee3149475ead0cb6a616b8a028c5888",
         "type": "github"
       },
       "original": {
@@ -433,11 +454,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1729973466,
-        "narHash": "sha256-knnVBGfTCZlQgxY1SgH0vn2OyehH9ykfF8geZgS95bk=",
+        "lastModified": 1733384649,
+        "narHash": "sha256-K5DJ2LpPqht7K76bsxetI+YHhGGRyVteTPRQaIIKJpw=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "cd3e8833d70618c4eea8df06f95b364b016d4950",
+        "rev": "190c31a89e5eec80dd6604d7f9e5af3802a58a13",
         "type": "github"
       },
       "original": {
@@ -449,11 +470,11 @@
     },
     "nixpkgs-lib": {
       "locked": {
-        "lastModified": 1732410305,
-        "narHash": "sha256-/hxIKRTBsdrnudJWDGaBN8wIjHovqVAVxXdi8ByVtck=",
+        "lastModified": 1734829460,
+        "narHash": "sha256-dPhc+f2wkmhMqMIfq+hColJdysgVxKP9ilZ5bR0NRZI=",
         "owner": "nix-community",
         "repo": "nixpkgs.lib",
-        "rev": "87b6978992e2eb605732fba842cad0a7e14b2047",
+        "rev": "0a31e8d833173ae63e43fd9dbff1ccf09c4f778c",
         "type": "github"
       },
       "original": {
@@ -472,11 +493,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1732889990,
-        "narHash": "sha256-7mbQWCaIouZ5S7c7x7dSc0Ep6Rg49l+L9Ys6qaDlNlo=",
+        "lastModified": 1734896070,
+        "narHash": "sha256-HECsyS551+KtffczDgx7w/xvruXHKoUf4JX7xW+Ecbo=",
         "owner": "nix-community",
         "repo": "nixpkgs-wayland",
-        "rev": "384460ee819581612281f6ef7aeafbaab589c0c4",
+        "rev": "8988b0603fed7e3d303718328cf4cd8dd137575e",
         "type": "github"
       },
       "original": {
@@ -487,11 +508,11 @@
     },
     "nixpkgs_2": {
       "locked": {
-        "lastModified": 1732521221,
-        "narHash": "sha256-2ThgXBUXAE1oFsVATK1ZX9IjPcS4nKFOAjhPNKuiMn0=",
+        "lastModified": 1735471104,
+        "narHash": "sha256-0q9NGQySwDQc7RhAV2ukfnu7Gxa5/ybJ2ANT8DQrQrs=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "4633a7c72337ea8fd23a4f2ba3972865e3ec685d",
+        "rev": "88195a94f390381c6afcdaa933c2f6ff93959cb4",
         "type": "github"
       },
       "original": {
@@ -518,12 +539,19 @@
       }
     },
     "nur": {
+      "inputs": {
+        "flake-parts": "flake-parts_2",
+        "nixpkgs": [
+          "nixpkgs"
+        ],
+        "treefmt-nix": "treefmt-nix_2"
+      },
       "locked": {
-        "lastModified": 1732909490,
-        "narHash": "sha256-ov9YvDdaB+kdrvL1Qsh5esv646bldkHeADInqr8YVjk=",
+        "lastModified": 1735765720,
+        "narHash": "sha256-RbiMI6dFCsLzF6lo47Z+AtHDz3V0pP9enfoJZ7Qe+5s=",
         "owner": "nix-community",
         "repo": "NUR",
-        "rev": "2c2351efdee742e0a90da08d597c34b119287abe",
+        "rev": "8ca3ecacbdf3ee00fb6e068b8519a4c8491a814b",
         "type": "github"
       },
       "original": {
@@ -613,6 +641,27 @@
         "type": "github"
       }
     },
+    "treefmt-nix_2": {
+      "inputs": {
+        "nixpkgs": [
+          "nur",
+          "nixpkgs"
+        ]
+      },
+      "locked": {
+        "lastModified": 1733222881,
+        "narHash": "sha256-JIPcz1PrpXUCbaccEnrcUS8jjEb/1vJbZz5KkobyFdM=",
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "rev": "49717b5af6f80172275d47a418c9719a31a78b53",
+        "type": "github"
+      },
+      "original": {
+        "owner": "numtide",
+        "repo": "treefmt-nix",
+        "type": "github"
+      }
+    },
     "umu": {
       "inputs": {
         "nixpkgs": [
@@ -621,11 +670,11 @@
       },
       "locked": {
         "dir": "packaging/nix",
-        "lastModified": 1732905608,
-        "narHash": "sha256-5SJmg++Oi6IgbpzoUmqt1HFWggM1oejMYPkRc+z/woo=",
+        "lastModified": 1735507919,
+        "narHash": "sha256-4cR4mk1660p3y8wnX0XbHSQh4KX0mbMn6/2YnALNt8o=",
         "ref": "refs/heads/main",
-        "rev": "7f3f601ea4224ef0af3967e9997a9603f1f06d41",
-        "revCount": 860,
+        "rev": "59a82ea8cd284c7535bc06b8f6156abb7da96f6a",
+        "revCount": 874,
         "submodules": true,
         "type": "git",
         "url": "https://github.com/Open-Wine-Components/umu-launcher/?dir=packaging/nix"
diff --git a/flake.nix b/flake.nix
index 7dd2f41..1cd4ab0 100644
--- a/flake.nix
+++ b/flake.nix
@@ -12,6 +12,7 @@
     };
     nur = {
       url = "github:nix-community/NUR";
+      inputs.nixpkgs.follows = "nixpkgs";
     };
     nixpkgs-wayland = {
       url = "github:nix-community/nixpkgs-wayland";
@@ -67,25 +68,27 @@
         };
         themeSettings = types.submodule {
           options = {
+            lightness = mkOption { type = types.str; }; # light/dark
             background = mkOption { type = types.str; };
-            background-alt = mkOption { type = types.str; };
+            background-alt = mkOption { type = types.str; }; # solid color wallpaper
             foreground = mkOption { type = types.str; };
-            color0 = mkOption { type = types.str; };
-            color1 = mkOption { type = types.str; };
-            color2 = mkOption { type = types.str; };
-            color3 = mkOption { type = types.str; };
-            color4 = mkOption { type = types.str; };
-            color5 = mkOption { type = types.str; };
-            color6 = mkOption { type = types.str; };
-            color7 = mkOption { type = types.str; };
-            color8 = mkOption { type = types.str; };
-            color9 = mkOption { type = types.str; };
-            color10 = mkOption { type = types.str; };
-            color11 = mkOption { type = types.str; };
-            color12 = mkOption { type = types.str; };
-            color13 = mkOption { type = types.str; };
-            color14 = mkOption { type = types.str; };
-            color15 = mkOption { type = types.str; };
+            # bright black and white should be different from black and white.
+            color0 = mkOption { type = types.str; }; # black
+            color1 = mkOption { type = types.str; }; # red
+            color2 = mkOption { type = types.str; }; # green
+            color3 = mkOption { type = types.str; }; # yellow
+            color4 = mkOption { type = types.str; }; # blue
+            color5 = mkOption { type = types.str; }; # magenta
+            color6 = mkOption { type = types.str; }; # cyan
+            color7 = mkOption { type = types.str; }; # white
+            color8 = mkOption { type = types.str; }; # bright black
+            color9 = mkOption { type = types.str; }; # bright red
+            color10 = mkOption { type = types.str; }; # bright green
+            color11 = mkOption { type = types.str; }; # bright yellow
+            color12 = mkOption { type = types.str; }; # bright blue
+            color13 = mkOption { type = types.str; }; # bright magenta
+            color14 = mkOption { type = types.str; }; # bright cyan
+            color15 = mkOption { type = types.str; }; # bright white
             alpha = mkOption { type = types.float; };
           };
         };
@@ -131,8 +134,6 @@
         name = "nixpkgs-patched";
         src = nixpkgs;
         patches = [
-          ./files/nixpkgs-patches/hollywood_update_and_mpv.diff
-          ./files/nixpkgs-patches/amdvlk_new.diff
         ];
       };
       nixosSystem = import (nixpkgs-patched + "/nixos/lib/eval-config.nix");
@@ -141,7 +142,7 @@
       modules = [
         self.settingsModule
         ({ ... }: { nixpkgs.overlays = [
-          nur.overlay
+          nur.overlays.default
           nixpkgs-wayland.overlay
           (self: super: { local-fonts = super.stdenv.mkDerivation local-fonts; })
           (self: super: { camu = camu.packages.${system}.default; })
@@ -151,10 +152,10 @@
             mpv-unwrapped = super.mpv-unwrapped.override { cddaSupport = true; };
           })
           (self: super: {
-            kitty = (optimizeWithFlags super.kitty "-O2 -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto");
+            kitty = (optimizeWithFlags super.kitty "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition");
           })
           (self: super: {
-            neovim-unwrapped = (optimizeWithFlags super.neovim-unwrapped "-O2 -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto");
+            neovim-unwrapped = (optimizeWithFlags super.neovim-unwrapped "-O3 -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto");
           })
           (self: super: {
             sway-unwrapped = super.sway-unwrapped.overrideAttrs (old: {
@@ -182,13 +183,13 @@
               });
             });
           })
-          (self: super: {
-            hollywood = super.hollywood.overrideAttrs (old: {
-              patches = [
-                ./files/hollywood_uptodate.diff
-              ];
-            });
-          })
+          #(self: super: {
+          #  hollywood = super.hollywood.overrideAttrs (old: {
+          #    patches = [
+          #      ./files/hollywood_uptodate.diff
+          #    ];
+          #  });
+          #})
           (self: super: {
             dia = super.dia.overrideAttrs (old: {
               nativeBuildInputs = with super; [
@@ -210,7 +211,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
         }
-        nur.nixosModules.nur
+        nur.modules.nixos.default
         chaotic.nixosModules.default
         ./hosts/sofue/configuration.nix
       ];
@@ -231,7 +232,7 @@
       modules = [
         self.settingsModule
         ({ ... }: { nixpkgs.overlays = [
-          nur.overlay
+          nur.overlays.default
           nixpkgs-wayland.overlay
           (self: super: { local-fonts = super.stdenv.mkDerivation local-fonts; })
           (self: super: {
@@ -258,7 +259,7 @@
           home-manager.useGlobalPkgs = true;
           home-manager.useUserPackages = true;
         }
-        nur.nixosModules.nur
+        nur.modules.nixos.default
         nixos-hardware.nixosModules.common-pc-laptop
         nixos-hardware.nixosModules.common-pc-laptop-ssd
         nixos-hardware.nixosModules.common-cpu-intel
@@ -281,7 +282,7 @@
       system = system;
       modules = [
         ({ ... }: { nixpkgs.overlays = [
-          (self: super: { jdk23 = (optimizeWithFlags super.jdk23 "-O2 -march=znver2 -mtune=znver2 -fno-semantic-interposition -flto"); })
+          #(self: super: { jdk21 = (optimizeWithFlags super.jdk21 "-O2 -march=znver1 -mtune=znver1 -fno-semantic-interposition -flto"); })
         ]; })
         ./hosts/moyo/container.nix
       ];
diff --git a/hosts/denpa/cgit/custom.css b/hosts/denpa/cgit/custom.css
index d55d37f..29a2080 100644
--- a/hosts/denpa/cgit/custom.css
+++ b/hosts/denpa/cgit/custom.css
@@ -62,6 +62,7 @@ div#cgit span.deletions {
   --color1: rgba(var(--highlight1), 0.045);
   --color2: rgba(var(--highlight1), 0.09);
   --color3: #fef9fa;
+  --color4: rgba(var(--color3), 0.09);
   --black: #13090c;
   --gray0: #393232;
   --gray1: #777;
@@ -81,6 +82,10 @@ a:hover {
   color: rgb(var(--highlight1)) !important;
 }
 
+code {
+  background-color: var(--color1);
+}
+
 div#cgit {
   margin: auto;
   font-family: monospace;
diff --git a/hosts/moyo/container.nix b/hosts/moyo/container.nix
index d3483b5..f596d87 100644
--- a/hosts/moyo/container.nix
+++ b/hosts/moyo/container.nix
@@ -66,8 +66,8 @@
       name = "vi";
       vimrcConfig = { customRC = ""; };
     })
-    jdk23
-    #graalvm-oracle
+    #jdk23
+    graalvm-ce
   ];
 
   system.stateVersion = "25.05";
diff --git a/hosts/sofue/configuration.nix b/hosts/sofue/configuration.nix
index 2765eef..7c7ecc7 100644
--- a/hosts/sofue/configuration.nix
+++ b/hosts/sofue/configuration.nix
@@ -24,12 +24,13 @@ in rec {
     ../../nix/programs/obs.nix
     ../../nix/programs/waydroid.nix
     ../../nix/programs/kdeconnect.nix
+    ../../nix/programs/docker.nix
     ./programs.nix
   ];
 
   local = rec {
     font = {
-      name = "NanumGothicCoding";
+      name = "Iosevka Comfy";
       size = 15;
       baseline = 0;
     };
@@ -43,13 +44,13 @@ in rec {
       size = ui-font.size;
       baseline = 0;
     };
-    scheme = import ../../themes/dva_halloween/dva.nix;
+    scheme = import ../../themes/shipgirl_christmas/shipgirl_christmas.nix;
     starter = {
-      picture = ../../themes/dva_halloween/splash1.png;
+      picture = ../../themes/shipgirl_christmas/splash.png;
       width = 41;
       padding = {
-        top = -5;
-        left = -9;
+        top = -4;
+        left = -4;
         text = 0;
       };
       position = "left";
@@ -60,6 +61,9 @@ in rec {
       monitor1 = "DP-1";
       monitor2 = "HDMI-A-1";
       monitor3 = "HDMI-A-3";
+      #monitor1 = "DP-2";
+      #monitor2 = "DP-1";
+      #monitor3 = "";
     };
   };
 
@@ -119,7 +123,7 @@ in rec {
     (pkgs.writeShellScriptBin "run-sway" ''
       export TTY=/dev/tty3
       export XDG_VTNR=3
-      export WLR_RENDERER=vulkan
+      export WLR_RENDERER=gles2
       export WLR_DRM_DEVICES=/dev/dri/card0
       cd $HOME
       exec ${pkgs.kbd}/bin/openvt --switch --login --console 3 -f -- ${pkgs.sway}/bin/sway
@@ -213,12 +217,14 @@ in rec {
           "${mod4}+Shift+5" = "move container to workspace 9";
           "${mod4}+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 90";
           "${mod4}+Shift+r" = "exec swaymsg -- output ${s.monitors.monitor1} transform 0";
-          "${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection";
-          "${mod4}+F2" = "exec printf '__d_va_overwatch_d||' > $HOME/.config/taro/${s.monitors.monitor1}/selection";
+          "${mod4}+F1" = "exec swaymsg -- output ${s.monitors.monitor1} bg \\#${s.scheme.background-alt} solid_color";
+          "${mod4}+F2" = "exec swaymsg -- output ${s.monitors.monitor1} bg ${../../themes/shipgirl_christmas/wallpaper.png} fill";
+          #"${mod4}+F1" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection";
+          #"${mod4}+F2" = "exec printf '||' > $HOME/.config/taro/${s.monitors.monitor1}/selection";
           "Pause" = "exec $HOME/c/camu/scripts/cmv_add.sh PAUSE";
         };
         startup = [
-          { command = "${pkgs.mauri}/bin/tarod"; }
+          #{ command = "${pkgs.mauri}/bin/tarod"; }
         ];
       };
     };
diff --git a/hosts/sofue/programs.nix b/hosts/sofue/programs.nix
index 36c42f6..c66a289 100644
--- a/hosts/sofue/programs.nix
+++ b/hosts/sofue/programs.nix
@@ -1,6 +1,6 @@
 { pkgs, ... }: {
   environment.systemPackages = with pkgs; [
-    gftp
+    #gftp
     dia
     cdrtools
     #ardour
@@ -16,9 +16,11 @@
     cabextract
     qbittorrent
     ungoogled-chromium
-    (pkgs.discord.override { withOpenASAR = true; })
+    vesktop
+    #(pkgs.discord.override { withOpenASAR = true; })
     imv
     mpv
+    vlc
     camu
     mauri
   ];
diff --git a/hosts/yashinoki/programs.nix b/hosts/yashinoki/programs.nix
index 0b09229..2c17018 100644
--- a/hosts/yashinoki/programs.nix
+++ b/hosts/yashinoki/programs.nix
@@ -6,6 +6,6 @@
     winetricks
     cabextract
     (pkgs.discord.override { withOpenASAR = true; })
-    gftp
+    mpv
   ];
 }
diff --git a/nix/email.nix b/nix/email.nix
index 1785e4f..c5d9aa3 100644
--- a/nix/email.nix
+++ b/nix/email.nix
@@ -56,7 +56,7 @@
     programs.notmuch = {
       enable = true;
       hooks = {
-        preNew = "${pkgs.notmuch}/bin/notmuch search --output=files --format=text0 tag:deleted | xargs -0 rm -f;${pkgs.isync}/bin/mbsync --all -ndfNX";
+        preNew = "${pkgs.notmuch}/bin/notmuch search --output=files --format=text0 tag:deleted | xargs -0 rm -f; ${pkgs.isync}/bin/mbsync --all -ngfuX";
       };
     };
     programs.neomutt = {
diff --git a/nix/gaming.nix b/nix/gaming.nix
index 9d79999..b08c79c 100644
--- a/nix/gaming.nix
+++ b/nix/gaming.nix
@@ -7,12 +7,12 @@ in {
   };
   environment.systemPackages = with pkgs; [
     mangohud
-    umu
+    #umu
     protontricks
     lutris
     #legendary-gl
     prismlauncher
-    jdk23
+    jdk21
     retroarch
     dolphin-emu
     #pcsx2
@@ -46,13 +46,13 @@ in {
       exec env --unset=SDL_VIDEODRIVER MANGOHUD=1 gamemoderun "$@"
     '')
   ];
-  hardware.xone.enable = true;
-  hardware.opentabletdriver.enable = true;
-#  services.udev.packages = [ pkgs.dolphinEmu ];
-#  boot.extraModulePackages = [
-#    config.boot.kernelPackages.gcadapter-oc-kmod
-#  ];
-#  boot.kernelModules = [ "gcadapter_oc" ];
+  #hardware.xone.enable = true;
+  #hardware.opentabletdriver.enable = true;
+  #services.udev.packages = [ pkgs.dolphinEmu ];
+  #boot.extraModulePackages = [
+  #  config.boot.kernelPackages.gcadapter-oc-kmod
+  #];
+  #boot.kernelModules = [ "gcadapter_oc" ];
   programs.gamemode = {
     enable = true;
     settings = {
diff --git a/nix/programs/bash.nix b/nix/programs/bash.nix
index 28f4745..1329922 100644
--- a/nix/programs/bash.nix
+++ b/nix/programs/bash.nix
@@ -37,6 +37,12 @@
       historyFile = "${homeDir}/.bash_history";
       historyFileSize = 100000;
       initExtra = ''
+        bind 'set completion-query-items 0'
+        bind 'set show-all-if-ambiguous on'
+        bind 'set show-all-if-unmodified on'
+        bind 'set menu-complete-display-prefix on'
+        bind '"\t": menu-complete'
+        bind '"\e[Z": menu-complete-backward'
         RESET="\001\017\002"
         NORMAL="\001\033[0m\002"
         RED="\001\033[0;31m\002"
@@ -50,7 +56,7 @@
             printf "(″ロ゛) > $RED$?"
           fi
         }
-        export PS1="$RESET$YELLOW\u$RED@\H$CYAN:\w\$(exit_code_guy)$NORMAL "
+        export PS1="$RESET$CYAN\u@$YELLOW\H$CYAN:\w\$(exit_code_guy)$NORMAL "
       '';
     };
   };
diff --git a/nix/programs/docker.nix b/nix/programs/docker.nix
new file mode 100644
index 0000000..3491a80
--- /dev/null
+++ b/nix/programs/docker.nix
@@ -0,0 +1,4 @@
+{ ... }: {
+  virtualisation.docker.enable = true;
+  users.users.andrew.extraGroups = [ "docker" ];
+}
diff --git a/nix/programs/firefox.nix b/nix/programs/firefox.nix
index 9aa94f5..f0f6e22 100644
--- a/nix/programs/firefox.nix
+++ b/nix/programs/firefox.nix
@@ -19,8 +19,8 @@ in {
       source = (pkgs.fetchFromGitHub {
         owner = "rafaelmardojai";
         repo = "firefox-gnome-theme";
-        rev = "1ddcd160fd349130aa71473adc217de304d673ee";
-        hash = "sha256-2TzbuzEZ+pSBKZgtTcIDVnB1FXVKHX3bgOolgWsqerM=";
+        rev = "6cbc3b6eceb4195edab67daecc8daa7347c84c27";
+        hash = "sha256-8yoUFYBtD86J2ddq1yMU0oCILp9u35/dmYi9iwiysi8=";
       });
     };
     home.file."customChrome.css" = {
@@ -28,24 +28,24 @@ in {
       source = pkgs.writeText "customChrome.css" ''
         @namespace xul url("http://www.mozilla.org/keymaster/gatekeeper/there.is.only.xul");
 
-        @media (prefers-color-scheme: dark) {
+        @media (prefers-color-scheme: ${s.scheme.lightness}) {
           :root {
             /* Accent */
-            --gnome-accent-bg: var(--gnome-palette-blue-3);
-            --gnome-accent: #${s.scheme.color1};
+            --gnome-accent-bg: #${s.scheme.color3};
+            --gnome-accent: #${s.scheme.color2};
 
-            --gnome-toolbar-star-button: var(--gnome-palette-yellow-1);
+            --gnome-toolbar-star-button: #${s.scheme.color2};
 
             /* Window */
             --gnome-window-background: #${s.scheme.background};
             --gnome-window-color: #${s.scheme.foreground};
             --gnome-view-background: #${s.scheme.background};
             --gnome-sidebar-background: #${s.scheme.color1};
-            --gnome-secondary-sidebar-background: #${s.scheme.color3};
+            --gnome-secondary-sidebar-background: #${s.scheme.color2};
 
             /* Card */
             --gnome-card-background: #${s.scheme.background};
-            --gnome-card-shade-color: #${s.scheme.color5};
+            --gnome-card-shade-color: #${s.scheme.color2};
 
             /* Menu */
             --gnome-menu-background: #${s.scheme.background};
@@ -58,10 +58,10 @@ in {
             --gnome-toolbar-icon-fill: #${s.scheme.foreground};
 
             /* Tabs */
-            --gnome-tabbar-tab-hover-background: #${s.scheme.color3};
+            --gnome-tabbar-tab-hover-background: #${s.scheme.color6};
             --gnome-tabbar-tab-active-background: #${s.scheme.color2};
-            --gnome-tabbar-tab-active-background-contrast: #${s.scheme.background};
-            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color3};
+            --gnome-tabbar-tab-active-background-contrast: #${s.scheme.color2};
+            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color1};
 
             --gnome-tabbar-identity-color-green: var(--gnome-palette-green-1);
             --gnome-tabbar-identity-color-yellow: var(--gnome-palette-yellow-2);
@@ -85,21 +85,21 @@ in {
 
           /* Private colors */
           :root[privatebrowsingmode="temporary"] {
-            --gnome-accent-fg: #${s.scheme.color3};
+            --gnome-accent-fg: #${s.scheme.color2};
             /* Headerbar */
-            --gnome-headerbar-background: #${s.scheme.color4} !important;
+            --gnome-headerbar-background: #${s.scheme.color1} !important;
             /* Tabs */
-            --gnome-tabbar-tab-hover-background: #${s.scheme.color4};
-            --gnome-tabbar-tab-active-background: #${s.scheme.color6};
+            --gnome-tabbar-tab-hover-background: #${s.scheme.color6};
+            --gnome-tabbar-tab-active-background: #${s.scheme.background};
             --gnome-tabbar-tab-active-background-contrast: #${s.scheme.background};
-            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color6};
+            --gnome-tabbar-tab-active-hover-background: #${s.scheme.color1};
           }
 
           /* Private and backdrop colors */
           :root[privatebrowsingmode="temporary"]:-moz-window-inactive {
-            --gnome-headerbar-background: #${s.scheme.color4} !important;
-            --gnome-tabbar-tab-hover-background: #${s.scheme.color4};
-            --gnome-tabbar-tab-active-background: #${s.scheme.color4};
+            --gnome-headerbar-background: #${s.scheme.color1} !important;
+            --gnome-tabbar-tab-hover-background: #${s.scheme.color1};
+            --gnome-tabbar-tab-active-background: #${s.scheme.color1};
           }
         }
       '';
diff --git a/nix/programs/kitty.nix b/nix/programs/kitty.nix
index 5868b7d..149d751 100644
--- a/nix/programs/kitty.nix
+++ b/nix/programs/kitty.nix
@@ -34,7 +34,9 @@ in {
         cursor_shape block
         cursor_blink_interval -1 linear ease-out
         cursor_stop_blinking_after 20.0
-        cursor_trail 16
+        cursor_trail 25
+        cursor_trail_decay 0.1 0.5
+        cursor_trail_start_threshold 2
         foreground #${s.scheme.foreground}
         background #${s.scheme.background}
         color0 #${s.scheme.color0}
diff --git a/nix/programs/nvim.nix b/nix/programs/nvim.nix
index cdc30d9..78b1b6b 100644
--- a/nix/programs/nvim.nix
+++ b/nix/programs/nvim.nix
@@ -1,92 +1,159 @@
 { config, pkgs, ... }:
 let
   s = config.local;
+  colo = s.scheme;
   local = pkgs.vimUtils.buildVimPlugin {
     pname = "local";
     version = "0.2";
     src = ../../files/nvim/local;
   };
-  # https://github.com/neovim/neovim/blob/879d17ea8d62c199ea0c91c5f37a4f25495be7ce/src/nvim/highlight_group.c#L414
   wal = pkgs.vimUtils.buildVimPlugin {
+    # https://github.com/neovim/neovim/blob/909b18d05a8d472b12c156e1663282bf6f5ce307/src/nvim/highlight_group.c#L425
+    # s/NvimLightGrey2/#${colo.foreground}/g
+    # s/NvimDarkGrey2/#${colo.background}/g
+    # s/NvimLightGreen/#${colo.color4}/g
+    # s/NvimLightCyan/#${colo.color2}/g
+    # s/NvimDarkGrey4/#${colo.color6}/g
+    # s/NvimDarkGrey1/#${colo.color0}/g
+    # s/NvimLightYellow/#${colo.color4}/g
+    # s/NvimDarkGrey3/#${colo.color6}/g
+    # s/NvimLightGrey1/#${colo.color4}/g
+    # s/NvimDarkGreen/#${colo.background}/g
+    # s/NvimLightRed/#${colo.color3}/g
+    # s/NvimDarkCyan/#${colo.background}/g
+    # s/NvimDarkYellow/#${colo.color2}/g
+    # s/NvimDarkRed/#${colo.color3}/g
+    # s/NvimLightGrey3/#${colo.background}/g
+    # s/NvimLightBlue/#${colo.foreground}/g
+    # s/NvimLightGrey4/#${colo.color5}/g
+    # Then edited as needed.
     pname = "wal";
-    version = "3.1";
+    version = "3.2";
     src = pkgs.writeTextDir "colors/wal-gui.vim" ''
       let g:colors_name = "wal-gui"
-      hi Normal guifg=#${s.scheme.foreground} guibg=#${s.scheme.background}
-      hi Added guifg=#${s.scheme.color4}
-      hi Changed guifg=#${s.scheme.color2}
-      hi ColorColumn guibg=#${s.scheme.color6}
-      hi Conceal guifg=#${s.scheme.color6}
-      hi CurSearch guifg=#${s.scheme.color0} guibg=#${s.scheme.color4}
-      hi CursorColumn guibg=#${s.scheme.color6}
-      hi CursorLine guibg=#${s.scheme.color2}
-      hi DiffAdd guifg=#${s.scheme.color4} guibg=#${s.scheme.background}
-      hi DiffChange guifg=#${s.scheme.color4} guibg=#${s.scheme.background}
-      hi DiffDelete guifg=#${s.scheme.color3} guibg=#${s.scheme.background} gui=bold
-      hi DiffText guifg=#${s.scheme.color6} guibg=#${s.scheme.background}
-      hi Directory guifg=#${s.scheme.color2}
-      hi ErrorMsg guifg=#${s.scheme.color4}
-      hi FloatShadow guibg=#${s.scheme.color6} blend=80
-      hi FloatShadowThrough guibg=#${s.scheme.color6} blend=100
-      hi Folded guifg=#${s.scheme.color5} guibg=#${s.scheme.color6}
-      hi LineNr guifg=#${s.scheme.color6}
-      hi MatchParen guifg=#${s.scheme.color3} guibg=#${s.scheme.background} gui=bold
-      hi ModeMsg guifg=#${s.scheme.color4}
-      hi MoreMsg guifg=#${s.scheme.color2}
-      hi NonText guifg=#${s.scheme.color6}
-      hi NormalFloat guibg=#${s.scheme.color6}
-      hi Pmenu guibg=#${s.scheme.color6}
-      hi PmenuSel guifg=#${s.scheme.color6} guibg=#${s.scheme.foreground} blend=0
-      hi PmenuThumb guibg=#${s.scheme.color6}
-      hi Question guifg=#${s.scheme.color2}
-      hi QuickFixLine guifg=#${s.scheme.color2}
-      hi RedrawDebugClear guibg=#${s.scheme.color2}
-      hi RedrawDebugComposed guibg=#${s.scheme.color4}
-      hi RedrawDebugRecompose guibg=#${s.scheme.color3}
-      hi Removed guifg=#${s.scheme.color4}
-      hi Search guifg=#${s.scheme.color0} guibg=#${s.scheme.color6}
-      hi SignColumn guifg=#${s.scheme.color6} guibg=NONE gui=NONE
-      hi SpecialKey guifg=#${s.scheme.color6}
-      hi SpellBad guisp=#${s.scheme.color4} gui=undercurl
-      hi SpellCap guisp=#${s.scheme.color3} gui=undercurl
-      hi SpellLocal guisp=#${s.scheme.color4} gui=undercurl
-      hi SpellRare guisp=#${s.scheme.color2} gui=undercurl
-      hi StatusLine guifg=#${s.scheme.background} guibg=#${s.scheme.color6}
-      hi StatusLineNC guifg=#${s.scheme.background} guibg=#${s.scheme.color2}
-      hi Title guifg=#${s.scheme.color2} gui=bold
-      hi Visual guibg=#${s.scheme.color6}
-      hi WarningMsg guifg=#${s.scheme.color4}
-      hi WinBar guifg=#${s.scheme.color5} guibg=#${s.scheme.color0} gui=bold
-      hi WinBarNC guifg=#${s.scheme.color5} guibg=#${s.scheme.color0}
-      hi Constant guifg=#${s.scheme.color6}
-      hi Operator guifg=#${s.scheme.foreground}
-      hi PreProc guifg=#${s.scheme.foreground}
-      hi Type guifg=#${s.scheme.color3}
-      hi Delimiter guifg=#${s.scheme.color2}
-      hi Comment guifg=#${s.scheme.color5} gui=italic
-      hi String guifg=#${s.scheme.color4}
-      hi Identifier guifg=#${s.scheme.foreground}
-      hi Function guifg=#${s.scheme.color2}
-      hi Statement guifg=#${s.scheme.color6} gui=bold
-      hi Special guifg=#${s.scheme.color2}
-      hi Error guifg=#${s.scheme.color5} guibg=#${s.scheme.color3}
-      hi Todo guifg=#${s.scheme.foreground} gui=bold
-      hi DiagnosticError guifg=#${s.scheme.color5}
-      hi DiagnosticWarn guifg=#${s.scheme.color4}
-      hi DiagnosticInfo guifg=#${s.scheme.color2}
-      hi DiagnosticHint guifg=#${s.scheme.color1}
-      hi DiagnosticOk guifg=#${s.scheme.color4}
-      hi DiagnosticUnderlineError guisp=#${s.scheme.color4} gui=underline
-      hi DiagnosticUnderlineWarn guisp=#${s.scheme.color3} gui=underline
-      hi DiagnosticUnderlineInfo guisp=#${s.scheme.color2} gui=underline
-      hi DiagnosticUnderlineHint guisp=#${s.scheme.color1} gui=underline
-      hi DiagnosticUnderlineOk guisp=#${s.scheme.color4} gui=underline
-      hi DiagnosticDeprecated guisp=#${s.scheme.color4} gui=strikethrough
-      hi @variable guifg=#${s.scheme.foreground}
-      hi ExtraWhitespace guibg=#${s.scheme.color4}
-      hi MiniStarterInactive guifg=#${s.scheme.foreground}
-      hi MiniStarterQuery guifg=#${s.scheme.color3}
-      hi MiniStarterItemPrefix guifg=#${s.scheme.color4}
+
+      set background=${colo.lightness}
+      set pumblend=10
+
+      hi Normal guifg=#${colo.foreground} guibg=#${colo.background}
+
+      " UI
+      hi Added                guifg=#${colo.color2}
+      hi Changed              guifg=#${colo.color4}
+      hi ColorColumn                                    guibg=#${colo.color6}
+      hi Conceal              guifg=#${colo.color6}
+      hi CurSearch            guifg=#${colo.color0}     guibg=#${colo.color4}
+      hi CursorColumn                                   guibg=#${colo.color6}
+      hi CursorLine                                     guibg=#${colo.color6}
+      hi DiffAdd              guifg=#${colo.color2}     guibg=#${colo.background}
+      hi DiffChange           guifg=#${colo.color4}     guibg=#${colo.background}
+      hi DiffDelete           guifg=#${colo.color3}     guibg=#${colo.background} gui=bold
+      hi DiffText             guifg=#${colo.color6}     guibg=#${colo.background}
+      hi Directory            guifg=#${colo.color2}
+      hi ErrorMsg             guifg=#${colo.color3}
+      hi FloatShadow                                    guibg=#${colo.color6}
+      hi FloatShadowThrough                             guibg=#${colo.color6}
+      hi Folded               guifg=#${colo.color5}     guibg=#${colo.color6}
+      hi LineNr               guifg=#${colo.color6}
+      hi MatchParen                                     guibg=#${colo.color6}     gui=bold
+      hi ModeMsg              guifg=#${colo.color4}
+      hi MoreMsg              guifg=#${colo.color2}
+      hi NonText              guifg=#${colo.color6}
+      hi NormalFloat                                    guibg=#${colo.color1}
+      hi Pmenu                                          guibg=#${colo.color1}
+      hi PmenuSel                                       guibg=#${colo.color2}
+      hi PmenuSbar                                      guibg=#${colo.color1}
+      hi PmenuThumb                                     guibg=#${colo.color1}
+      hi Question             guifg=#${colo.color2}
+      hi QuickFixLine         guifg=#${colo.color2}
+      hi RedrawDebugClear                               guibg=#${colo.color2}
+      hi RedrawDebugComposed                            guibg=#${colo.background}
+      hi RedrawDebugRecompose                           guibg=#${colo.color3}
+      hi Removed              guifg=#${colo.color3}
+      hi Search               guifg=#${colo.foreground} guibg=#${colo.color2}
+      hi SignColumn           guifg=#${colo.color6}
+      hi SpecialKey           guifg=#${colo.color6}
+      hi SpellBad             guisp=#${colo.color3}                               gui=undercurl
+      hi SpellCap             guisp=#${colo.color4}                               gui=undercurl
+      hi SpellLocal           guisp=#${colo.color4}                               gui=undercurl
+      hi SpellRare            guisp=#${colo.color2}                               gui=undercurl
+      hi StatusLine           guifg=#${colo.color4}     guibg=#${colo.background}
+      hi StatusLineNC         guifg=#${colo.color6}     guibg=#${colo.background}
+      hi Title                guifg=#${colo.foreground}                           gui=bold
+      hi Visual                                         guibg=#${colo.color6}
+      hi WarningMsg           guifg=#${colo.color4}
+      hi WinBar               guifg=#${colo.color5}     guibg=#${colo.color0}     gui=bold
+      hi WinBarNC             guifg=#${colo.color5}     guibg=#${colo.color0}
+
+      " // Syntax
+      " "default link Character      Constant",
+      " "default link Number         Constant",
+      " "default link Boolean        Constant",
+      " "default link Float          Number",
+      " "default link Conditional    Statement",
+      " "default link Repeat         Statement",
+      " "default link Label          Statement",
+      " "default link Keyword        Statement",
+      " "default link Exception      Statement",
+      " "default link Include        PreProc",
+      " "default link Define         PreProc",
+      " "default link Macro          PreProc",
+      " "default link PreCondit      PreProc",
+      " "default link StorageClass   Type",
+      " "default link Structure      Type",
+      " "default link Typedef        Type",
+      " "default link Tag            Special",
+      " "default link SpecialChar    Special",
+      " "default link SpecialComment Special",
+      " "default link Debug          Special",
+      " "default link Ignore         Normal",
+
+      " Syntax
+      hi Constant   guifg=#${colo.foreground}  " Use only `Normal` foreground to be usable on different background
+      hi Operator   guifg=#${colo.foreground}
+      hi PreProc    guifg=#${colo.foreground}
+      hi Type       guifg=#${colo.foreground}
+      hi Delimiter  guifg=#${colo.foreground}
+
+      hi Comment    guifg=#${colo.color5}                           gui=italic
+      hi String     guifg=#${colo.color2}
+      hi Identifier guifg=#${colo.foreground}
+      hi Function   guifg=#${colo.color4}
+      hi Statement  guifg=#${colo.foreground}                       gui=bold
+      hi Special    guifg=#${colo.color4}
+      hi Error      guifg=#${colo.foreground} guibg=#${colo.color4}
+      hi Todo       guifg=#${colo.foreground}                       gui=bold
+
+      " Diagnostic
+      hi DiagnosticError          guifg=#${colo.color3}
+      hi DiagnosticWarn           guifg=#${colo.color4}
+      hi DiagnosticInfo           guifg=#${colo.color2}
+      hi DiagnosticHint           guifg=#${colo.foreground}
+      hi DiagnosticOk             guifg=#${colo.color4}
+      hi DiagnosticUnderlineError guisp=#${colo.color3}     gui=underline
+      hi DiagnosticUnderlineWarn  guisp=#${colo.color4}     gui=underline
+      hi DiagnosticUnderlineInfo  guisp=#${colo.color2}     gui=underline
+      hi DiagnosticUnderlineHint  guisp=#${colo.foreground} gui=underline
+      hi DiagnosticUnderlineOk    guisp=#${colo.color4}     gui=underline
+      hi DiagnosticDeprecated     guisp=#${colo.color3}     gui=strikethrough
+
+      hi @variable guifg=#${colo.foreground}
+
+      " Plugins
+      hi MiniStarterInactive   guifg=#${colo.foreground}
+      hi MiniStarterQuery      guifg=#${colo.color3}
+      hi MiniStarterItemPrefix guifg=#${colo.color4}
+
+      " https://github.com/NeogitOrg/neogit/blob/nightly/lua/neogit/lib/hl.lua
+      hi link NeogitDiffContext Normal
+      hi link NeogitDiffContextHighlight Normal
+      hi link NeogitDiffContextCursor Normal
+      hi link NeogitHunkHeader NeogitHunkHeaderHighlight
+
+      " Custom
+      hi ExtraWhitespace guibg=#${colo.color4}
+
+      " Lag Fix
       hi! link CurSearch Search
     '';
   };
@@ -142,6 +209,17 @@ in {
         ripgrep
         xxd
       ];
+      #(pkgs.vimUtils.buildVimPlugin {
+      #  pname = "";
+      #  version = "";
+      #  src = pkgs.fetchFromGitHub {
+      #    owner = "";
+      #    repo = "";
+      #    rev = "";
+      #    hash = "";
+      #  };
+      #  meta.homepage = "";
+      #})
       plugins = with pkgs.vimPlugins; [
         local
         wal
@@ -152,24 +230,13 @@ in {
         nvim-lspconfig
         lsp-status-nvim
         inc-rename-nvim
-        (nvim-treesitter.withPlugins (plugins: with plugins; [ c cpp lua bash python nix ]))
+        (nvim-treesitter.withPlugins (plugins: with plugins; [ c cpp bash python lua nix ]))
         fzfWrapper
         fzf-vim
         mini-nvim
         neogit
         plenary-nvim
         diffview-nvim
-        (pkgs.vimUtils.buildVimPlugin {
-          pname = "vim-stay";
-          version = "v1.4.3";
-          src = pkgs.fetchFromGitHub {
-            owner = "zhimsel";
-            repo = "vim-stay";
-            rev = "af6141815b88de1d84f92709f42cb98b0af5f3b1";
-            hash = "sha256-Vg6gV3UefIqkIC24jZdDgeXIEdSDWIhF3DpW4D6nAHU=";
-          };
-          meta.homepage = "https://github.com/zhimsel/vim-stay/";
-        })
       ];
     };
   };
diff --git a/nix/programs/sway.nix b/nix/programs/sway.nix
index 31bc9d0..58db6d3 100644
--- a/nix/programs/sway.nix
+++ b/nix/programs/sway.nix
@@ -73,22 +73,27 @@ in {
       "*color15" = "#${s.scheme.color15}";
     };
     gtk = let
+      # *_shade_color is adjusted from black by default.
       extraCss3 = ''
         @define-color window_bg_color #${s.scheme.background};
         @define-color window_fg_color #${s.scheme.foreground};
         @define-color view_bg_color #${s.scheme.background};
         @define-color view_fg_color #${s.scheme.foreground};
-        @define-color accent_bg_color #${s.scheme.color1};
+        @define-color accent_bg_color #${s.scheme.color2};
         @define-color accent_fg_color #${s.scheme.background};
-        @define-color accent_color #${s.scheme.color1};
+        @define-color accent_color #${s.scheme.color2};
         @define-color headerbar_bg_color #${s.scheme.background};
         @define-color headerbar_fg_color #${s.scheme.foreground};
         @define-color headerbar_backdrop_color #${s.scheme.background};
         @define-color headerbar_border_color #${s.scheme.color6};
-        @define-color headerbar_shade_color #${s.scheme.color6};
+        @define-color secondary_headerbar_bg_color #${s.scheme.background};
+        @define-color secondary_headerbar_fg_color #${s.scheme.foreground};
+        @define-color secondary_headerbar_backdrop_color #${s.scheme.background};
+        @define-color secondary_headerbar_border_color #${s.scheme.color5};
+        @define-color thumbnail_bg_color #${s.scheme.background};
+        @define-color thumbnail_fg_color #${s.scheme.foreground};
         @define-color card_bg_color #${s.scheme.background};
         @define-color card_fg_color #${s.scheme.foreground};
-        @define-color card_shade_color #${s.scheme.color6};
         @define-color popover_bg_color #${s.scheme.background};
         @define-color popover_fg_color #${s.scheme.foreground};
         @define-color dialog_bg_color #${s.scheme.background};
@@ -98,17 +103,15 @@ in {
         @define-color sidebar_bg_color #${s.scheme.background};
         @define-color sidebar_fg_color #${s.scheme.foreground};
         @define-color sidebar_backdrop_color #${s.scheme.background};
-        @define-color sidebar_shade_color #${s.scheme.color6};
-        @define-color incognito_bg_color #${s.scheme.color5};
-        @define-color warning_bg_color #${s.scheme.color3};
+        @define-color warning_bg_color #${s.scheme.color4};
         @define-color warning_fg_color #${s.scheme.foreground};
-        @define-color warning_color #${s.scheme.color3};
-        @define-color error_bg_color #${s.scheme.color4};
+        @define-color warning_color #${s.scheme.color4};
+        @define-color error_bg_color #${s.scheme.color3};
         @define-color error_fg_color #${s.scheme.foreground};
-        @define-color error_color #${s.scheme.color4};
-        @define-color success_bg_color #${s.scheme.color1};
+        @define-color error_color #${s.scheme.color3};
+        @define-color success_bg_color #${s.scheme.color2};
         @define-color success_fg_color #${s.scheme.background};
-        @define-color success_color #${s.scheme.color1};
+        @define-color success_color #${s.scheme.color2};
         @define-color destructive_bg_color #${s.scheme.color5};
         @define-color destructive_fg_color #${s.scheme.background};
         @define-color destructive_color #${s.scheme.color5};
@@ -118,16 +121,16 @@ in {
     in {
       enable = true;
       theme = {
-        name = "adw-gtk3-dark";
+        name = "adw-gtk3" + (if s.scheme.lightness == "light" then "" else "-dark");
         package = pkgs.adw-gtk3;
       };
       cursorTheme = {
         name = "WhiteSur-cursors";
       };
-#      iconTheme = {
-#        name = "suru";
-#        package = pkgs.ubuntu-themes;
-#      };
+      #iconTheme = {
+      #  name = "suru";
+      #  package = pkgs.ubuntu-themes;
+      #};
       gtk3.extraCss = extraCss3;
       gtk4.extraCss = extraCss3;
     };
@@ -150,7 +153,7 @@ in {
             border = "${s.scheme.background}";
             text = "${s.scheme.foreground}";
             button-text = "${s.scheme.foreground}";
-            button-background = "${s.scheme.color2}";
+            button-background = "${s.scheme.color6}";
             message-padding = 5;
             border-bottom-size = 1;
             details-border-size = 1;
@@ -259,7 +262,7 @@ in {
           commands = [
             { command = "move to scratchpad"; criteria.app_id = "kitty-server"; }
             { command = "max_render_time 1"; criteria.app_id = "kitty"; }
-            { command = "floating enable; max_render_time 1"; criteria.app_id = "cmv"; }
+            { command = "inhibit_idle fullscreen; floating enable; max_render_time 1"; criteria.app_id = "cmv"; }
             { command = "floating enable"; criteria.class = "cmv.exe"; }
             { command = "floating enable"; criteria.app_id = "mauri"; }
             { command = "inhibit_idle fullscreen"; criteria.title = "Parsec"; }
@@ -280,8 +283,8 @@ in {
         colors = let
           bg = "#${s.scheme.background}";
           fg = "#${s.scheme.foreground}";
-          c2 = "#${s.scheme.color1}";
-          urgent = "#${s.scheme.color3}";
+          c2 = "#${s.scheme.color6}";
+          urgent = "#${s.scheme.color2}";
         in {
           background = bg;
           focused = { background = bg; border = c2; childBorder = c2; indicator = c2; text = fg; };
@@ -293,7 +296,7 @@ in {
         startup = let
           gnome-schema = "org.gnome.desktop.interface";
         in [
-          { command = "dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-dark'\""; always = true; }
+          { command = "dconf write /org/gnome/desktop/interface/color-scheme \"'prefer-${s.scheme.lightness}'\""; always = true; }
           { command = "dbus-sway-environment"; }
           { command = "swaymsg 'seat * hide_cursor 4000'"; always = true; }
           { command = "kitty -1 --class=\"kitty-server\""; }
@@ -317,7 +320,7 @@ in {
       font = "${s.font.name} ${toString s.ui-font.size}";
       backgroundColor = "#${s.scheme.background}";
       textColor = "#${s.scheme.foreground}";
-      borderColor = "#${s.scheme.color2}";
+      borderColor = "#${s.scheme.color6}";
     };
   };
 }
diff --git a/nix/scripts.nix b/nix/scripts.nix
index bada1ff..7b41137 100644
--- a/nix/scripts.nix
+++ b/nix/scripts.nix
@@ -32,6 +32,7 @@ in {
     (pkgs.writeShellScriptBin "bemenu-colored" ''
       bemenu -C --single-instance -B 0 -M 0 --hp 6 \
       --fn "${s.font.name} ${toString (s.font.size - 1)}" -H ${toString ((s.font.size - 1) * 2)} \
+      --cf "#${s.scheme.foreground}" --cb "#${s.scheme.background}" \
       --hf "#${s.scheme.background}" --hb "#${s.scheme.color2}" \
       --nf "#${s.scheme.foreground}" --nb "#${s.scheme.background}" \
       --ff "#${s.scheme.foreground}" --fb "#${s.scheme.background}" \
diff --git a/nix/user.nix b/nix/user.nix
index 4c9a980..74e46c3 100644
--- a/nix/user.nix
+++ b/nix/user.nix
@@ -18,6 +18,7 @@ in {
     fontDir.enable = true;
     packages = with pkgs; [
       local-fonts
+      vistafonts
       noto-fonts
       noto-fonts-extra
       noto-fonts-cjk-sans
@@ -26,6 +27,8 @@ in {
       mplus-outline-fonts.osdnRelease
       intel-one-mono
       nanum-gothic-coding
+      iosevka-comfy.comfy
+      dina-font
     ];
     fontconfig = {
       enable = true;
@@ -61,7 +64,7 @@ in {
     htop
     neofetch
     cmatrix
-    hollywood
+    #hollywood
     hdparm
     usbutils
     cryptsetup
@@ -75,10 +78,14 @@ in {
     libfaketime
     cpulimit
     dos2unix
-    curl
     socat
+    curl
+    httrack
+    gdown
+    megatools
     libuchardet
     (unzip.override { enableNLS = true; })
+    rar
     unrar
     p7zip
     rclone
diff --git a/themes/christmas_rwby/christmas_rwby.nix b/themes/christmas_rwby/christmas_rwby.nix
index efc9fdc..1ba019b 100644
--- a/themes/christmas_rwby/christmas_rwby.nix
+++ b/themes/christmas_rwby/christmas_rwby.nix
@@ -1,5 +1,7 @@
 rec {
+  lightness = "dark";
   background = "1e0003"; #1e0003
+  background-alt = "1e0003"; #1e0003
   foreground = "f9dfc5"; #f9dfc5
   color0 = "${background}";
   color1 = "6d282e"; #6d282e
@@ -17,4 +19,5 @@ rec {
   color13 = "${color5}";
   color14 = "${color6}";
   color15 = "${color7}";
+  alpha = 0.9;
 }
diff --git a/themes/dva_halloween/dva.nix b/themes/dva_halloween/dva.nix
index 5d68084..d5f63cd 100644
--- a/themes/dva_halloween/dva.nix
+++ b/themes/dva_halloween/dva.nix
@@ -1,4 +1,5 @@
 rec {
+  lightness = "dark";
   background = "191111"; #191111
   background-alt = "37181c"; #37181c
   foreground = "fff2ce"; #fff2ce
diff --git a/themes/godzillacolle/godzillacolle.nix b/themes/godzillacolle/godzillacolle.nix
index 8f288a4..3a0f286 100644
--- a/themes/godzillacolle/godzillacolle.nix
+++ b/themes/godzillacolle/godzillacolle.nix
@@ -1,4 +1,5 @@
 rec {
+  lightness = "dark";
   background = "2f2c40"; #2f2c40
   background-alt = "3352a2"; #3352a2
   foreground = "fefbf6"; #fefbf6
diff --git a/themes/halloween_warlock/halloween_warlock.nix b/themes/halloween_warlock/halloween_warlock.nix
index d43a544..fa21cfc 100644
--- a/themes/halloween_warlock/halloween_warlock.nix
+++ b/themes/halloween_warlock/halloween_warlock.nix
@@ -1,5 +1,7 @@
 rec {
+  lightness = "dark";
   background = "1d0600"; #1d0600
+  background-alt = "1d0600"; #1d0600
   foreground = "e7ceb9"; #e7ceb9
   color0 = "${background}";
   color1 = "813230"; #813230
@@ -17,4 +19,5 @@ rec {
   color13 = "${color5}";
   color14 = "${color6}";
   color15 = "${color7}";
+  alpha = 1.0;
 }
diff --git a/themes/shipgirl_christmas/shipgirl_christmas.nix b/themes/shipgirl_christmas/shipgirl_christmas.nix
new file mode 100644
index 0000000..48cf428
--- /dev/null
+++ b/themes/shipgirl_christmas/shipgirl_christmas.nix
@@ -0,0 +1,23 @@
+rec {
+  lightness = "light";
+  background = "e9d5c2"; #e9d5c2
+  background-alt = "f6f6f6"; #f6f6f6
+  foreground = "3d3737"; #3d3737
+  color0 = "${background}";
+  color1 = "9f8d8d"; #9f8d8d
+  color2 = "c32929"; #c32929
+  color3 = "691817"; #691817
+  color4 = "a82a2b"; #a82a2b
+  color5 = "951d1e"; #951d1e
+  color6 = "8b887f"; #8b887f
+  color7 = "${foreground}";
+  color8 = "${color6}";
+  color9 = "${color1}";
+  color10 = "${color2}";
+  color11 = "${color3}";
+  color12 = "${color4}";
+  color13 = "${color5}";
+  color14 = "${color6}";
+  color15 = "${color7}";
+  alpha = 0.875;
+}
diff --git a/themes/shipgirl_christmas/splash.kra b/themes/shipgirl_christmas/splash.kra
new file mode 100644
index 0000000..2e2a450
--- /dev/null
+++ b/themes/shipgirl_christmas/splash.kra
diff --git a/themes/shipgirl_christmas/splash.png b/themes/shipgirl_christmas/splash.png
new file mode 100644
index 0000000..e88f65b
--- /dev/null
+++ b/themes/shipgirl_christmas/splash.png
diff --git a/themes/shipgirl_christmas/wallpaper.kra b/themes/shipgirl_christmas/wallpaper.kra
new file mode 100644
index 0000000..e2061a5
--- /dev/null
+++ b/themes/shipgirl_christmas/wallpaper.kra
diff --git a/themes/shipgirl_christmas/wallpaper.png b/themes/shipgirl_christmas/wallpaper.png
new file mode 100644
index 0000000..563c396
--- /dev/null
+++ b/themes/shipgirl_christmas/wallpaper.png
diff --git a/themes/spring_2024/spring_2024.nix b/themes/spring_2024/spring_2024.nix
index e92da4b..41ab0d0 100644
--- a/themes/spring_2024/spring_2024.nix
+++ b/themes/spring_2024/spring_2024.nix
@@ -1,5 +1,7 @@
 rec {
+  lightness = "dark";
   background = "110002"; #110002
+  background-alt = "110002"; #110002
   foreground = "fbf5db"; #fbf5db
   color0 = "${background}";
   color1 = "88534f"; #88534f
@@ -17,4 +19,5 @@ rec {
   color13 = "${color5}";
   color14 = "${color6}";
   color15 = "${color7}";
+  alpha = 0.9;
 }
diff --git a/themes/yoruichi/yoruichi.nix b/themes/yoruichi/yoruichi.nix
index 8a88ee1..f32f190 100644
--- a/themes/yoruichi/yoruichi.nix
+++ b/themes/yoruichi/yoruichi.nix
@@ -1,5 +1,7 @@
 rec {
+  lightness = "dark";
   background = "403434"; #403434
+  background-alt = "403434"; #403434
   foreground = "fbfbfb"; #fbfbfb
   color0 = "${background}";
   color1 = "a57463"; #a57463
diff --git a/themes/zelda_summer/zelda_summer.nix b/themes/zelda_summer/zelda_summer.nix
index be99281..71c39e0 100644
--- a/themes/zelda_summer/zelda_summer.nix
+++ b/themes/zelda_summer/zelda_summer.nix
@@ -1,14 +1,15 @@
 rec {
+  lightness = "dark";
   background = "091f0d"; #091f0d
   background-alt = "091f0d"; #091f0d
   foreground = "fdf7f4"; #fdf7f4
   color0 = "${background}";
-  color1 = "ffeabb"; #ffeabb
-  color2 = "e2c29b"; #e2c29b
-  color3 = "d7862d"; #d7862d
-  color4 = "288033"; #288033
+  color1 = "d7862d"; #d7862d
+  color2 = "fedcae"; #fedcae
+  color3 = "288033"; #288033
+  color4 = "e2c29b"; #e2c29b
   color5 = "7ee6ed"; #7ee6ed
-  color6 = "fedcae"; #fedcae
+  color6 = "ffeabb"; #ffeabb
   color7 = "${foreground}";
   color8 = "${color6}";
   color9 = "${color1}";