Theme stuff

10 files changed, 47 insertions, 1142 deletions

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(