Update NixOS module to v2.0.0

2026-02-27 12:00:44 +01:00 · 2026-01-21 18:11:02 +00:00
80 changed files with 803 additions and 745 deletions
--- a/.gitattributes
+++ b/.gitattributes
@@ -1,2 +0,0 @@
-*.gif filter=lfs diff=lfs merge=lfs -text
-*.png filter=lfs diff=lfs merge=lfs -text
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -65,6 +65,40 @@ jobs:
          artifactErrorsFailBuild: true
          body: Release notes not generated yet.

+  aur-update:
+    name: Update AUR pkgs
+    runs-on: ubuntu-24.04
+    container: archlinux:latest
+    permissions: write-all
+    needs: [ release-checks, release ]
+    steps:
+      - run: pacman -Sy --noconfirm git github-cli base-devel pacman-contrib
+      - uses: actions/checkout@v4
+
+      - run: |
+          chage -E -1 nobody
+          passwd -u nobody
+
+          cd "assets/pkg/aur"
+          chown nobody:nobody . -R
+          su - -s /bin/bash nobody -c "$PWD/update-pkgs.sh ${{ needs.release-checks.outputs.VERSION }}"
+          su - -s /bin/bash nobody -c "$PWD/test-makepkg.sh" # This will also update -git pkgver
+          chown $UID:$(id -g) . -R
+
+      - run: |
+          BRANCH=actions/update-aur-${{ needs.release-checks.outputs.VERSION }}
+          git config --global --add safe.directory $GITHUB_WORKSPACE
+          git config user.name "GitHub Actions"
+          git config user.email "actions@github.com"
+          git checkout -b $BRANCH
+          git commit -am "Update AUR pkgs to v${{ needs.release-checks.outputs.VERSION }}"
+          git push -u origin $BRANCH
+          gh pr create --head $BRANCH \
+            --title "[AUR update]: Bump to ${{ needs.release-checks.outputs.VERSION }}" \
+            --body "*This PR was created automatically*"
+        env:
+          GH_TOKEN: ${{ github.token }}
+
  nix-update:
    name: Update NixOS module
    runs-on: ubuntu-24.04
--- a/CHANGELOG.md
+++ b/CHANGELOG.md
@@ -4,15 +4,6 @@
 <!-- By "very relevant" I mean big features or something manual packagers should know, like leftover files -->
 <!-- Once a release would be opened, group the last bunch of dangling changes, add release version as header and its date -->

-# 2.0.1
-
- source and header files can be nested in `src/` and `include/`
- lidm now calls bash for logging in and sourcing profile files, other shells can be configured
- a good PATH default is fetched from `confstr`
- debug logs are now unbuffered
-
-# 2.0.0
-
 - Most stuff (most of `/etc` being a notable exception) now installs to `/usr/local` by default, check [`docs/PACKAGERS.md`](./docs/PACKAGERS.md).
 - Added a changelog.
 - Finally add proper (experimental) xorg support.
--- a/14
+++ b/14
@@ -1,4 +1,4 @@
-VERSION := 2.0.1
+VERSION = 2.0.0
 .DEFAULT_GOAL := lidm

 CDIR = src
@@ -9,9 +9,7 @@ ODIR = dist
 PREFIX = /usr/local

 INFO_GIT_REV ?= $(shell git describe --long --tags --always || echo '?')
-INFO_GIT_REV := $(INFO_GIT_REV)
 INFO_BUILD_TS ?= $(shell date +%s)
-INFO_BUILD_TS := $(INFO_BUILD_TS)

 CFLAGS ?= -O3 -Wall -Wextra -fdata-sections -ffunction-sections
 # C PreProcessor flags, not C Plus Plus
@@ -26,19 +24,19 @@ LDFLAGS ?= -Wl,--gc-sections
 LIBS = -lpam

 # includes all headers in `$(IDIR)` and compiles everything in `$(CDIR)`
-DEPS = $(wildcard $(IDIR)/*.h $(IDIR)/**/*.h)
-_SOURCES = $(wildcard $(CDIR)/*.c) $(wildcard $(CDIR)/**/*.c)
-OBJ = $(patsubst $(CDIR)/%.c,$(ODIR)/%.o,$(_SOURCES))
+DEPS = $(wildcard $(IDIR)/*.h)
+_SOURCES = $(notdir $(wildcard $(CDIR)/*.c))
+OBJ = $(patsubst %.c,$(ODIR)/%.o,$(_SOURCES))

 $(ODIR)/%.o: $(CDIR)/%.c $(DEPS)
-	@mkdir -p $(dir $@)
+	@mkdir -p $(ODIR)
 	$(CC) -c -o $@ $< $(ALLFLAGS)

 lidm: $(OBJ)
 	$(CC) -o $@ $^ $(ALLFLAGS) $(LIBS) $(LDFLAGS)

 clean:
-	rm -rf $(ODIR) lidm
+	rm -f $(ODIR)/*.o lidm

 install: lidm
 	mkdir -p ${DESTDIR}${PREFIX}/bin ${DESTDIR}${PREFIX}/share/man/man{1,5}
--- a/assets/man/lidm-config.5
+++ b/assets/man/lidm-config.5
@@ -104,9 +104,6 @@ Specify the time format string to be displayed. Check \fBstrftime (3)\fP to know
 .TP
 \fBrefresh_rate\fP
 Rate (in milliseconds) at which the UI should refresh, affects clock and resize behavior.
-.TP
-\fBbypass_shell_login\fP
-Type \fBBOOL\fP, lidm logins through a login shell (e.g. `bash`) in login mode (e.g. `arg0` being `-bash`) to load `/etc/profile/, `/etc/profile.d/` and more. If this option is enabled that's bypassed entirely.


 .SH "SEE ALSO"
--- a/assets/media/lidm.gif
+++ b/assets/media/lidm.gif
--- a/assets/pkg/aur/.gitignore
+++ b/assets/pkg/aur/.gitignore
@@ -0,0 +1,4 @@
+*/*
+!*/.gitignore
+!*/PKGBUILD
+!*/.SRCINFO
--- a/assets/pkg/aur/README.md
+++ b/assets/pkg/aur/README.md
@@ -0,0 +1,12 @@
+# AUR Packages
+
+These files are just for reference, I'll manually edit and publish them, at least until I automate it with github actions (like updating version automatically on a release).
+
+There are three packages that follow standard conventions:
+
+- [`lidm`](https://aur.archlinux.org/packages/lidm): Builds latest release (manually updated per release basis)
+- [`lidm-bin`](https://aur.archlinux.org/packages/lidm-bin): Fetches latest release binary (compiled by GitHub Actions, also updated per release)
+- [`lidm-git`](https://aur.archlinux.org/packages/lidm-git): Fetches latest commit and builds it (should be updated automatically)
+
+> \[!IMPORTANT]
+> None of those packages include the service files. [You have to do this yourself](../../services/README.md).
--- a/assets/pkg/aur/lidm-bin/.SRCINFO
+++ b/assets/pkg/aur/lidm-bin/.SRCINFO
@@ -0,0 +1,33 @@
+pkgbase = lidm-bin
+	pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary)
+	pkgver = 1.2.3
+	pkgrel = 4
+	url = https://github.com/javalsai/lidm
+	arch = x86_64
+	arch = i686
+	arch = aarch64
+	arch = armv7h
+	arch = riscv64
+	license = GPL-3.0-only
+	depends = libpam.so
+	depends = lidm-service
+	provides = lidm
+	conflicts = lidm
+	source = lidm-default-theme-1.2.3.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/themes/default.ini
+	source = lidm-1.2.3.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm.1
+	source = lidm-config-1.2.3.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/man/lidm-config.5
+	sha256sums = ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca
+	sha256sums = 7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8
+	sha256sums = 0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9
+	source_x86_64 = lidm-1.2.3-x86_64::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-amd64
+	sha256sums_x86_64 = a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b
+	source_i686 = lidm-1.2.3-i686::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-i386
+	sha256sums_i686 = 75018578e68bffda9807de8a65e16eaed8a16c6cf2417a0b58c5d5bcfa603e45
+	source_aarch64 = lidm-1.2.3-aarch64::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-aarch64
+	sha256sums_aarch64 = 1b81a1537a1e31ca1902cbc3b60add4ac712aa64fd4d266685f53372cc365882
+	source_armv7h = lidm-1.2.3-armv7h::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-armv7
+	sha256sums_armv7h = e86f59509fe2366d6312b9bc9e8d89c14e9c049fd713a04c41dab49a848b1ada
+	source_riscv64 = lidm-1.2.3-riscv64::https://github.com/javalsai/lidm/releases/download/v1.2.3/lidm-riscv64
+	sha256sums_riscv64 = 3f0eb0315c523d367bac332641e5cd3c86cfd9aa4e7c14b2efc036937b97a598
+
+pkgname = lidm-bin
--- a/assets/pkg/aur/lidm-bin/.gitignore
+++ b/assets/pkg/aur/lidm-bin/.gitignore
@@ -0,0 +1,3 @@
+*
+!PKGBUILD
+!.SRCINFO
--- a/assets/pkg/aur/lidm-bin/PKGBUILD
+++ b/assets/pkg/aur/lidm-bin/PKGBUILD
@@ -0,0 +1,39 @@
+# shellcheck disable=SC2034,SC2154,SC2164
+# Maintainer: javalsai <javalsai@proton.me>
+pkgname=lidm-bin
+pkgver=1.2.3
+pkgrel=4
+depends=('libpam.so' 'lidm-service')
+pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)"
+arch=('x86_64' 'i686' 'aarch64' 'armv7h' 'riscv64')
+url="https://github.com/javalsai/lidm"
+license=('GPL-3.0-only')
+provides=('lidm')
+conflicts=('lidm')
+source=(
+    "lidm-default-theme-${pkgver}.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini"
+    "lidm-${pkgver}.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1"
+    "lidm-config-${pkgver}.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5"
+)
+source_x86_64=("lidm-${pkgver}-x86_64::$url/releases/download/v$pkgver/lidm-amd64")
+source_i686=("lidm-${pkgver}-i686::$url/releases/download/v$pkgver/lidm-i386")
+source_aarch64=("lidm-${pkgver}-aarch64::$url/releases/download/v$pkgver/lidm-aarch64")
+source_armv7h=("lidm-${pkgver}-armv7h::$url/releases/download/v$pkgver/lidm-armv7")
+source_riscv64=("lidm-${pkgver}-riscv64::$url/releases/download/v$pkgver/lidm-riscv64")
+sha256sums=('ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca'
+            '7f2fb91f55088be1a9b1c93ecf5d6c1e437f369b56df2eacc9d10b00c93c39f8'
+            '0aa5755bdcc60ea80cd9ee0f89233ffaf22c6cee9db9da277274a62c6ed477d9')
+sha256sums_x86_64=('a533b5aee3ffe04268f8d3ff8d7eb87f09d31fbe25e1b8b1ed29c42ef465bd4b')
+sha256sums_i686=('75018578e68bffda9807de8a65e16eaed8a16c6cf2417a0b58c5d5bcfa603e45')
+sha256sums_aarch64=('1b81a1537a1e31ca1902cbc3b60add4ac712aa64fd4d266685f53372cc365882')
+sha256sums_armv7h=('e86f59509fe2366d6312b9bc9e8d89c14e9c049fd713a04c41dab49a848b1ada')
+sha256sums_riscv64=('3f0eb0315c523d367bac332641e5cd3c86cfd9aa4e7c14b2efc036937b97a598')
+
+package() {
+    cd "$srcdir"
+
+    install -Dm755 "lidm-${pkgver}-$CARCH" "${pkgdir}/usr/bin/lidm"
+    install -Dm644 "lidm-default-theme-${pkgver}.ini" "${pkgdir}/etc/lidm.ini"
+    install -Dm644 "lidm-${pkgver}.1" "${pkgdir}/usr/share/man/man1/lidm.1"
+    install -Dm644 "lidm-config-${pkgver}.5" "${pkgdir}/usr/share/man/man5/lidm-config.5"
+}
--- a/assets/pkg/aur/lidm-dinit/.SRCINFO
+++ b/assets/pkg/aur/lidm-dinit/.SRCINFO
@@ -0,0 +1,12 @@
+pkgbase = lidm-dinit
+	pkgdesc = A fully colorful customizable TUI display manager made in C. (dinit service files)
+	pkgver = 1.2.3
+	pkgrel = 1
+	url = https://github.com/javalsai/lidm
+	arch = any
+	license = GPL-3.0-only
+	provides = lidm-service
+	source = lidm-dinit-1.2.3-dinit::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/dinit
+	sha256sums = 185cd76c1d29ddc73cf96be999f13278a427bb80aa9169f25f30673ad2de3770
+
+pkgname = lidm-dinit
--- a/assets/pkg/aur/lidm-dinit/.gitignore
+++ b/assets/pkg/aur/lidm-dinit/.gitignore
@@ -0,0 +1,3 @@
+*
+!PKGBUILD
+!.SRCINFO
--- a/assets/pkg/aur/lidm-dinit/PKGBUILD
+++ b/assets/pkg/aur/lidm-dinit/PKGBUILD
@@ -0,0 +1,17 @@
+# shellcheck disable=SC2034,SC2154,SC2164
+# Maintainer: javalsai <javalsai@proton.me>
+pkgname=lidm-dinit
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="A fully colorful customizable TUI display manager made in C. (dinit service files)"
+provides=('lidm-service')
+arch=('any')
+url="https://github.com/javalsai/lidm"
+license=('GPL-3.0-only')
+source=("${pkgname}-${pkgver}-dinit::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/dinit")
+sha256sums=('185cd76c1d29ddc73cf96be999f13278a427bb80aa9169f25f30673ad2de3770')
+
+package() {
+    cd "$srcdir"
+    install -Dm0644 "${pkgname}-${pkgver}-dinit" "$pkgdir/etc/dinit.d/lidm"
+}
--- a/assets/pkg/aur/lidm-git/.SRCINFO
+++ b/assets/pkg/aur/lidm-git/.SRCINFO
@@ -0,0 +1,16 @@
+pkgbase = lidm-git
+	pkgdesc = A fully colorful customizable TUI display manager made in C. (last git commit)
+	pkgver = 1.2.3.r12.g7e7a297
+	pkgrel = 1
+	url = https://github.com/javalsai/lidm
+	arch = any
+	license = GPL-3.0-only
+	makedepends = git
+	depends = pam
+	depends = lidm-service
+	provides = lidm
+	conflicts = lidm
+	source = lidm::git+https://github.com/javalsai/lidm
+	sha256sums = SKIP
+
+pkgname = lidm-git
--- a/assets/pkg/aur/lidm-git/.gitignore
+++ b/assets/pkg/aur/lidm-git/.gitignore
@@ -0,0 +1,3 @@
+*
+!PKGBUILD
+!.SRCINFO
--- a/assets/pkg/aur/lidm-git/PKGBUILD
+++ b/assets/pkg/aur/lidm-git/PKGBUILD
@@ -0,0 +1,31 @@
+# shellcheck disable=SC2034,SC2154,SC2164
+# Maintainer: javalsai <javalsai@proton.me>
+pkgname=lidm-git
+pkgver=1.2.3.r13.g9cf5297
+pkgrel=1
+depends=('pam' 'lidm-service')
+makedepends=('git')
+pkgdesc="A fully colorful customizable TUI display manager made in C. (last git commit)"
+arch=('any')
+url="https://github.com/javalsai/lidm"
+license=('GPL-3.0-only')
+provides=('lidm')
+conflicts=('lidm')
+source=("lidm::git+https://github.com/javalsai/lidm")
+sha256sums=('SKIP')
+
+pkgver() {
+    cd "$srcdir/lidm"
+    git describe --long --abbrev=7 --tags | \
+        sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
+}
+
+build() {
+    cd "$srcdir/lidm"
+    make
+}
+
+package() {
+    cd "$srcdir/lidm"
+    make DESTDIR="${pkgdir}" install
+}
--- a/assets/pkg/aur/lidm-systemd/.SRCINFO
+++ b/assets/pkg/aur/lidm-systemd/.SRCINFO
@@ -0,0 +1,12 @@
+pkgbase = lidm-systemd
+	pkgdesc = A fully colorful customizable TUI display manager made in C. (systemd service files)
+	pkgver = 1.2.3
+	pkgrel = 1
+	url = https://github.com/javalsai/lidm
+	arch = any
+	license = GPL-3.0-only
+	provides = lidm-service
+	source = lidm-systemd-1.2.3-systemd::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/systemd.service
+	sha256sums = e63464441a97102194994adc82159871ccd3f23d5e97224f21a460e4296364cc
+
+pkgname = lidm-systemd
--- a/assets/pkg/aur/lidm-systemd/.gitignore
+++ b/assets/pkg/aur/lidm-systemd/.gitignore
@@ -0,0 +1,3 @@
+*
+!PKGBUILD
+!.SRCINFO
--- a/assets/pkg/aur/lidm-systemd/PKGBUILD
+++ b/assets/pkg/aur/lidm-systemd/PKGBUILD
@@ -0,0 +1,17 @@
+# shellcheck disable=SC2034,SC2154,SC2164
+# Maintainer: javalsai <javalsai@proton.me>
+pkgname=lidm-systemd
+pkgver=1.2.3
+pkgrel=1
+pkgdesc="A fully colorful customizable TUI display manager made in C. (systemd service files)"
+provides=('lidm-service')
+arch=('any')
+url="https://github.com/javalsai/lidm"
+license=('GPL-3.0-only')
+source=("${pkgname}-${pkgver}-systemd::https://raw.githubusercontent.com/javalsai/lidm/v1.2.3/assets/services/systemd.service")
+sha256sums=('e63464441a97102194994adc82159871ccd3f23d5e97224f21a460e4296364cc')
+
+package() {
+    cd "$srcdir"
+    install -Dm0644 "${pkgname}-${pkgver}-systemd" "$pkgdir/usr/lib/systemd/system/lidm.service"
+}
--- a/assets/pkg/aur/lidm/.SRCINFO
+++ b/assets/pkg/aur/lidm/.SRCINFO
@@ -0,0 +1,13 @@
+pkgbase = lidm
+	pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag)
+	pkgver = 1.2.3
+	pkgrel = 5
+	url = https://github.com/javalsai/lidm
+	arch = any
+	license = GPL-3.0-only
+	depends = pam
+	depends = lidm-service
+	source = lidm-1.2.3.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.3.tar.gz
+	sha256sums = 1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93
+
+pkgname = lidm
--- a/assets/pkg/aur/lidm/.gitignore
+++ b/assets/pkg/aur/lidm/.gitignore
@@ -0,0 +1,3 @@
+*
+!PKGBUILD
+!.SRCINFO
--- a/assets/pkg/aur/lidm/PKGBUILD
+++ b/assets/pkg/aur/lidm/PKGBUILD
@@ -0,0 +1,21 @@
+# shellcheck disable=SC2034,SC2154,SC2164
+# Maintainer: javalsai <javalsai@proton.me>
+pkgname=lidm
+pkgver=1.2.3
+pkgrel=5
+depends=('pam' 'lidm-service')
+makedepends=()
+pkgdesc="A fully colorful customizable TUI display manager made in C. (build latest tag)"
+arch=('any')
+url="https://github.com/javalsai/lidm"
+license=('GPL-3.0-only')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93')
+
+build() {
+    make -C "$srcdir/lidm-$pkgver"
+}
+
+package() {
+    make -C "$srcdir/lidm-$pkgver" DESTDIR="$pkgdir" install
+}
--- a/assets/pkg/aur/make-srcinfo.sh
+++ b/assets/pkg/aur/make-srcinfo.sh
@@ -0,0 +1,12 @@
+#!/usr/bin/env bash
+set -e
+
+MYSELF=$(realpath "$0")
+MYDIR=$(dirname "$MYSELF")
+
+for pkg in "$MYDIR"/*/; do
+    cd "$pkg"
+    printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg"
+    makepkg --printsrcinfo | tee .SRCINFO
+    echo
+done
--- a/assets/pkg/aur/makepkg-clean.sh
+++ b/assets/pkg/aur/makepkg-clean.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -e
+
+MYSELF=$(realpath "$0")
+MYDIR=$(dirname "$MYSELF")
+
+cd "$MYDIR"
+typeset -a pkgs=(lidm{,-git,-bin,-systemd,-dinit})
+
+for pkg in "${pkgs[@]}"; do
+    printf "\x1b[mEntering '%s'\x1b[0m\n" "$pkg"
+    cd "$pkg"
+    # shellcheck disable=SC1091
+    source PKGBUILD
+    # shellcheck disable=SC2154
+    for f in "${source[@]}"; do
+        echo "$f"
+        awk -F:: '{print $1}' <<<"$f" | xargs rm -rf
+    done
+    cd ..
+    echo
+done
--- a/assets/pkg/aur/test-makepkg.sh
+++ b/assets/pkg/aur/test-makepkg.sh
@@ -0,0 +1,22 @@
+#!/usr/bin/env bash
+set -e
+
+MYSELF=$(realpath "$0")
+MYDIR=$(dirname "$MYSELF")
+
+cd "$MYDIR"
+typeset -a pkgs=(lidm{,-git,-bin,-systemd,-dinit})
+
+for pkg in "${pkgs[@]}"; do
+    printf "\x1b[mEntering '%s'\x1b[0m\n" "$pkg"
+    cd "$pkg"
+    makepkg -Cf
+    cd ..
+    echo
+done
+
+if [[ -n "${PRINT_TREE:-}" ]]; then
+    for pkg in "${pkgs[@]}"; do
+        eza --tree "$pkg/pkg/"*
+    done
+fi
--- a/assets/pkg/aur/update-pkgs.sh
+++ b/assets/pkg/aur/update-pkgs.sh
@@ -0,0 +1,23 @@
+#!/usr/bin/env bash
+set -e
+
+MYSELF=$(realpath "$0")
+MYDIR=$(dirname "$MYSELF")
+
+if [ -z "$1" ]; then
+    printf "\x1b[1;31mERR: No version to update provided\x1b[0m\n" >&2
+    exit 1;
+fi
+version="$1"
+printf "\x1b[34mINF: Using '%s' version\x1b[0m\n" "$version"
+
+for pkg in "$MYDIR"/lidm{,-bin,-systemd,-dinit}/; do
+    cd "$pkg"
+    printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg"
+    sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD
+    sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD
+
+    updpkgsums
+    makepkg --printsrcinfo | tee .SRCINFO
+    echo
+done
--- a/debug/lidm-debug
+++ b/debug/lidm-debug
@@ -1,9 +0,0 @@
-type            = process
-command         = /bin/sh -c "LIDM_LOG=/tmp/lidm.debug /sbin/agetty tty8 linux-c -n -l /usr/local/bin/lidm -o 8"
-restart         = true
-depends-on      = login.target
-termsignal      = HUP
-smooth-recovery = true
-inittab-id      = 8
-inittab-line    = tty8
-log-type        = buffer
--- a/docs/INSTALL.md
+++ b/docs/INSTALL.md
@@ -50,6 +50,7 @@ It is recommended to disable any other display managers that are still enabled:
 touch /etc/sv/lightdm/down # replace lightdm with your previous display manager (e.g., sddm, gdm)
 ```

+
 ## Fedora

 Thanks to @KernelFreeze there's a COPR repo available at <https://copr.fedorainfracloud.org/coprs/celestelove/lidm/> to install lidm. (<https://github.com/javalsai/lidm/discussions/92>)
@@ -58,9 +59,9 @@ Thanks to @KernelFreeze there's a COPR repo available at <https://copr.fedorainf

 There are several [AUR packages](https://aur.archlinux.org/packages?K=lidm&SeB=n) for most things. You only need to install one of the following:

- `lidm`
- `lidm-bin`
- `lidm-git`
+* `lidm`
+* `lidm-bin`
+* `lidm-git`

 Each of those depend on `lidm-service` which is provided by `lidm-systemd` and `lidm-dinit` (you'll have to pick one). I maintain both but I'm open to anyone that actually uses systemd to take the first one.

@@ -80,6 +81,9 @@ or try it out without installing by:
 nix run github:javalsai/lidm
 ```

+> [!CAUTION]
+> This doesn't include [service files](../assets/pkg/aur#services)
+
 ## Nix Module

 <details>
@@ -130,6 +134,9 @@ with config.lidm.keysEnum; {

 > _it's not necessary to cover all keys and anything can be put there, even if it's not valid config_

+> [!NOTE]
+> [service files](../assets/pkg/aur#services) **are** included and enabled
+
 # Installing from Source

 Firstly, you'll need to build the package, this also includes man pages, default config, themes and other files you might need.
--- a/docs/PACKAGERS.md
+++ b/docs/PACKAGERS.md
@@ -29,7 +29,6 @@ The list of possible `#define`s is:
 | `SESSIONS_WAYLAND`         | `"/usr/share/wayland-sessions"`       |                                                                            | No                       |
 | `SESSIONS_WAYLAND_LOCAL`   | `"/usr/local/share/wayland-sessions"` |                                                                            | No                       |
 | `LIDM_CONF_PATH`           | `"/etc/lidm.ini"`                     | Path of the default configuration.                                         | Yes (`LIDM_CONF`)        |
-| `LOGIN_SHELL`              | `"bash"`                              | Login shell name.                                                          | No                       |

 # Other Build Settings

--- a/include/config.h
+++ b/include/config.h
@@ -6,7 +6,7 @@

 #include "keys.h"
 #include "macros.h"
-#include "util/vec.h"
+#include "util.h"

 enum IntrospectionType {
  STRING,
@@ -122,8 +122,7 @@ BUILD(strings, STRINGS, TABLE_STRINGS);
  F(struct Vector, source, STRING_ARRAY, NULL_VEC, name)      \
  F(struct Vector, user_source, STRING_ARRAY, NULL_VEC, name) \
  F(char* NNULLABLE, timefmt, STRING, "%X %x", name)          \
-  F(long long, refresh_rate, NUMBER, 100, name)               \
-  F(bool, bypass_shell_login, BOOL, false, name)
+  F(long long, refresh_rate, NUMBER, 100, name)

 BUILD(behavior, BEHAVIOR, TABLE_BEHAVIOR);

--- a/include/desktop_exec.h
+++ b/include/desktop_exec.h
@@ -6,7 +6,8 @@

  #include "macros.h"

-char* NULLABLE desktop_as_cmdline(char** args);
+char* NULLABLE search_path(const char* NNULLABLE for_binary);
+int execvpe_desktop(char** args, char* NNULLABLE* NNULLABLE envlist);
 int parse_exec_string(const char* exec_s, int* arg_count, char*** args);
 void free_parsed_args(int arg_count, char** args);

--- a/include/efield.h
+++ b/include/efield.h
@@ -2,17 +2,16 @@
 #define EFIELDH_

 #include <stdbool.h>
-#include <stdint.h>
 #include <sys/types.h>

 // holds also the max string buffer in itself, not dynamic
 struct editable_field {
-  uint8_t pos;
+  u_char pos;
  char content[255];
 };

 struct editable_field efield_new(char* content);
-void efield_trim(struct editable_field* self, uint8_t pos);
+void efield_trim(struct editable_field* self, u_char pos);
 void efield_update(struct editable_field* self, char* update);
 bool efield_seek(struct editable_field* self, char seek);

--- a/include/keys.h
+++ b/include/keys.h
@@ -1,10 +1,7 @@
 #ifndef KEYSH_
 #define KEYSH_

-#include <stdbool.h>
-#include <stdint.h>
 #include <stdlib.h>
-#include <sys/time.h>

 enum Keys {
  ESC,
@@ -106,15 +103,4 @@ static const struct key_mapping KEY_MAPPINGS[] = {
    {PAGE_DOWN, {"\x1b[6~", NULL}},
 };

-struct option_keys {
-  bool is_some;
-  enum Keys key;
-};
-
-int find_keyname(enum Keys* at, const char* name);
-struct option_keys find_ansi(const char* seq);
-void read_press(uint8_t* length, char* out);
-// non blocking, waits up to tv or interrupt, returns true if actually read
-bool read_press_nb(uint8_t* length, char* out, struct timeval* tv);
-
 #endif
--- a/include/ofield.h
+++ b/include/ofield.h
@@ -18,6 +18,6 @@ void ofield_kbd_type(struct opts_field* self, char* typed, char* empty_default);
 bool ofield_opts_seek(struct opts_field* self, char seek);
 bool ofield_seek(struct opts_field* self, char seek);

-uint8_t ofield_display_cursor_col(struct opts_field* self, uint8_t maxlen);
+u_char ofield_display_cursor_col(struct opts_field* self, u_char maxlen);

 #endif
--- a/include/sessions.h
+++ b/include/sessions.h
@@ -4,8 +4,9 @@
 #include <sys/types.h>
 #include <unistd.h>

+#include "desktop_exec.h"
 #include "macros.h"
-#include "util/vec.h"
+#include "util.h"

 enum SessionType {
  XORG,
@@ -50,6 +51,18 @@ static inline struct session_exec session_exec_desktop(
  };
 }

+static inline int session_exec_exec(struct session_exec* NNULLABLE exec,
+                                    char* NULLABLE* NNULLABLE envlist) {
+  switch (exec->typ) {
+    case EXEC_SHELL:
+      return execle(exec->shell, exec->shell, NULL, envlist);
+    case EXEC_DESKTOP:
+      return execvpe_desktop(exec->desktop.args, envlist);
+    default:
+      __builtin_unreachable();
+  }
+}
+
 struct session {
  char* NNULLABLE name;
  struct session_exec exec;
@@ -57,9 +70,5 @@ struct session {
 };

 struct Vector get_avaliable_sessions();
-int session_exec_exec(struct session_exec* NNULLABLE exec,
-                      char* NULLABLE* NNULLABLE envp);
-int session_exec_login_through_shell(struct session_exec* NNULLABLE exec,
-                                     char* NULLABLE* NNULLABLE envp);

 #endif
--- a/include/ui.h
+++ b/include/ui.h
@@ -3,7 +3,7 @@

 #include "config.h"
 #include "ofield.h"
-#include "util/vec.h"
+#include "util.h"

 //    [box_start]
 //    ↓
@@ -40,7 +40,7 @@
 #define VALUE_MAXLEN (BOX_WIDTH - VALUES_COL + 1 - BOX_HMARGIN - 2)

 enum Input { SESSION, USER, PASSWD };
-extern const uint8_t INPUTS_N;
+extern const u_char INPUTS_N;

 void setup(struct config* config);
 int load(struct Vector* users, struct Vector* sessions);
--- a/include/users.h
+++ b/include/users.h
@@ -3,7 +3,7 @@

 #include <sys/types.h>

-#include "util/vec.h"
+#include "util.h"

 struct user {
  char* shell;
--- a/include/util.h
+++ b/include/util.h
@@ -0,0 +1,54 @@
+#ifndef UTILH_
+#define UTILH_
+
+#include <stdbool.h>
+#include <stddef.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <sys/time.h>
+#include <sys/types.h>
+
+#include "keys.h"
+
+int find_keyname(enum Keys* at, const char* name);
+struct option_keys {
+  bool is_some;
+  enum Keys key;
+};
+struct option_keys find_ansi(const char* seq);
+void read_press(u_char* length, char* out);
+// non blocking, waits up to tv or interrupt, returns true if actually read
+bool read_press_nb(u_char* length, char* out, struct timeval* tv);
+
+// UTF8
+//
+bool utf8_iscont(char byte);
+size_t utf8len(const char* str);
+size_t utf8len_until(const char* str, const char* until);
+size_t utf8trunc(char* str, size_t n);
+const char* utf8back(const char* str);
+const char* utf8seek(const char* str);
+const char* utf8seekn(const char* str, size_t n);
+
+// Vector
+//
+struct Vector {
+  uint32_t length;
+  uint32_t capacity;
+  void** pages;
+};
+
+struct Vector vec_from_raw(void** raw);
+void** vec_as_raw(struct Vector self);
+extern const struct Vector VEC_NEW;
+int vec_resize(struct Vector* self, size_t size);
+int vec_reserve(struct Vector* self, size_t size);
+int vec_reserve_exact(struct Vector* self, size_t size);
+int vec_push(struct Vector* self, void* item);
+void vec_free(struct Vector* self);
+void vec_clear(struct Vector* self);
+void vec_reset(struct Vector* self);
+void* vec_pop(struct Vector* self); // won't free it, nor shrink vec list space
+void* vec_get(struct Vector* self, size_t index);
+
+#endif
--- a/include/util/path.h
+++ b/include/util/path.h
@@ -1,10 +0,0 @@
-#ifndef UTIL_PATH_H
-#define UTIL_PATH_H
-
-#include "macros.h"
-
-char* NULLABLE search_path(const char* NNULLABLE for_binary);
-int execvpe(const char* NNULLABLE file, char* NULLABLE const argv[NNULLABLE],
-            char* NULLABLE const envp[NNULLABLE]);
-
-#endif /* UTIL_PATH_H */
--- a/include/util/utf8.h
+++ b/include/util/utf8.h
@@ -1,15 +0,0 @@
-#ifndef UTIL_UTF8_H
-#define UTIL_UTF8_H
-
-#include <stdbool.h>
-#include <stddef.h>
-
-bool utf8_iscont(char byte);
-size_t utf8len(const char* str);
-size_t utf8len_until(const char* str, const char* until);
-size_t utf8trunc(char* str, size_t n);
-const char* utf8back(const char* str);
-const char* utf8seek(const char* str);
-const char* utf8seekn(const char* str, size_t n);
-
-#endif /* UTIL_UTF8_H */
--- a/include/util/vec.h
+++ b/include/util/vec.h
@@ -1,26 +0,0 @@
-#ifndef UTIL_VEC_H
-#define UTIL_VEC_H
-
-#include <stddef.h>
-#include <stdint.h>
-
-struct Vector {
-  uint32_t length;
-  uint32_t capacity;
-  void** pages;
-};
-
-struct Vector vec_from_raw(void** raw);
-void** vec_as_raw(struct Vector self);
-extern const struct Vector VEC_NEW;
-int vec_resize(struct Vector* self, size_t size);
-int vec_reserve(struct Vector* self, size_t size);
-int vec_reserve_exact(struct Vector* self, size_t size);
-int vec_push(struct Vector* self, void* item);
-void vec_free(struct Vector* self);
-void vec_clear(struct Vector* self);
-void vec_reset(struct Vector* self);
-void* vec_pop(struct Vector* self); // won't free it, nor shrink vec list space
-void* vec_get(struct Vector* self, size_t index);
-
-#endif /* UTIL_VEC_H */
--- a/services.mk
+++ b/services.mk
@@ -26,8 +26,7 @@ install-service:
 	fi

 install-service-systemd:
-	@sed -e 's|ExecStart=/usr/bin/lidm|ExecStart=${DESTDIR}${PREFIX}/bin/lidm|' ./assets/services/systemd.service > ./dist/lidm.service
-	install -Dm644 ./dist/lidm.service ${DESTDIR}${PREFIX}/lib/systemd/system/lidm.service
+	install -Dm644 ./assets/services/systemd.service ${DESTDIR}${PREFIX}/lib/systemd/system/lidm.service
 	@printf '\033[1m%s\033[0m\n\n' " don't forget to run 'systemctl enable lidm'"
 install-service-dinit:
 	install -m644 ./assets/services/dinit ${DESTDIR}/etc/dinit.d/lidm
--- a/src/auth.c
+++ b/src/auth.c
@@ -1,11 +1,10 @@
-// TODO: handle `fork() == -1`
+// TODO: handle `fork() == -1`// TODO: handle `fork() == -1`s

 #include <errno.h>
 #include <grp.h>
 #include <pwd.h>
 #include <security/pam_misc.h>
 #include <signal.h>
-#include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
 #include <stdlib.h>
@@ -22,8 +21,7 @@
 #include "pam.h"
 #include "sessions.h"
 #include "ui.h"
-#include "util/path.h"
-#include "util/vec.h"
+#include "util.h"

 #define XORG_MESSAGE_LENGTH 16

@@ -82,6 +80,16 @@ static void source_paths(struct Vector* NNULLABLE vec_envlist,
  }
 }

+/*char *buf;*/
+/*size_t bsize = snprintf(NULL, 0, "/run/user/%d", pw->pw_uid) + 1;*/
+/*buf = malloc(bsize);*/
+/*snprintf(buf, bsize, "/run/user/%d", pw->pw_uid);*/
+/*setenv("XDG_RUNTIME_DIR", buf, true);*/
+/*setenv("XDG_SESSION_CLASS", "user", true);*/
+/*setenv("XDG_SESSION_ID", "1", true);*/
+/*setenv("XDG_SESSION_DESKTOP", , true);*/
+/*setenv("XDG_SEAT", "seat0", true);*/
+
 struct child_msg {
  char* msg;
  int _errno;
@@ -168,8 +176,7 @@ static void start_xorg_server(struct passwd* pw, char** NNULLABLE envlist,

 // TODO: add error msgs
 /// returns on completion
-static void launch_with_xorg_server(struct config* config,
-                                    struct session_exec* NNULLABLE exec,
+static void launch_with_xorg_server(struct session_exec* NNULLABLE exec,
                                    struct passwd* pw,
                                    char** NNULLABLE envlist) {
  int xorg_pipefd[2];
@@ -205,14 +212,10 @@ static void launch_with_xorg_server(struct config* config,
  (void)fflush(NULL);
  pid_t xorg_session_pid = fork();
  if (xorg_session_pid == 0) {
-    if (config->behavior.bypass_shell_login)
-      session_exec_exec(exec, envlist);
-    else
-      session_exec_login_through_shell(exec, envlist);
-
-    perror("session exec error");
+    int exit = session_exec_exec(exec, envlist);
+    perror("exec error");
    (void)fputs("failure calling session\n", stderr);
-    _exit(EXIT_FAILURE);
+    _exit(exit);
  }

  // looks weird, waiting on -1 should wait on any child and then just check if
@@ -251,8 +254,8 @@ static void launch_with_xorg_server(struct config* config,
    char _dummy;                              \
    read(pipefd[0], &_dummy, sizeof(_dummy)); \
  }
-inline static void forked(struct config* config, int pipefd[2],
-                          struct passwd* pw, char* NNULLABLE user,
+inline static void forked(int pipefd[2], struct passwd* pw,
+                          char* NNULLABLE user,
                          struct session* NNULLABLE session,
                          char** NNULLABLE envlist) {
  if (chdir(pw->pw_dir) == -1) SEND_ERR("chdir");
@@ -264,26 +267,14 @@ inline static void forked(struct config* config, int pipefd[2],
  DUMMY_READ();
  close(pipefd[0]);

-  if (!getenv("PATH")) {
-    size_t path_size = confstr(_CS_PATH, NULL, 0);
-    char* path_env = malloc(path_size);
-    confstr(_CS_PATH, path_env, path_size);
-    setenv("PATH", path_env, 1);
-    free(path_env);
-  }
-
-  log_printf(" [I] using shell login?: %s",
-             config->behavior.bypass_shell_login ? "true" : "false");
  if (session->type == XORG) {
-    launch_with_xorg_server(config, &session->exec, pw, envlist);
+    launch_with_xorg_server(&session->exec, pw, envlist);
    _exit(EXIT_SUCCESS);
  } else {
-    if (config->behavior.bypass_shell_login)
-      session_exec_exec(&session->exec, envlist);
-    else
-      session_exec_login_through_shell(&session->exec, envlist);
-    perror("session exec error");
-    _exit(EXIT_FAILURE);
+    int exit = session_exec_exec(&session->exec, envlist);
+    perror("exec error");
+    (void)fputs("failure calling session\n", stderr);
+    _exit(exit);
  }
 }
 #undef SEND_MSG
@@ -334,7 +325,7 @@ bool launch(char* user, char* passwd, struct session session, void (*cb)(void),

  uint pid = fork();
  if (pid == 0)
-    forked(config, pipefd, pw, user, &session, envlist);
+    forked(pipefd, pw, user, &session, envlist);
  else {
    struct child_msg msg;
    read(pipefd[0], &msg, sizeof(struct child_msg));
--- a/src/config.c
+++ b/src/config.c
@@ -11,15 +11,14 @@

 #include "config.h"
 #include "desktop.h"
-#include "keys.h"
 #include "log.h"
 #include "macros.h"
-#include "util/vec.h"
+#include "util.h"

 #define UPPER_HALF_BYTE 4
 int parse_hex(char* _at, char x1, char x2) {
  // make linter happy
-  uint8_t* at = (uint8_t*)_at;
+  u_char* at = (u_char*)_at;

  *at = 0;

--- a/src/desktop_exec.c
+++ b/src/desktop_exec.c
@@ -9,39 +9,61 @@

 #include "desktop_exec.h"
 #include "macros.h"
-#include "util/path.h"

 // constants for exec string parsing
 #define MAX_ARGS 100
 // ARG_LENGTH is the initial length of a parsed argument
 #define ARG_LENGTH 64

-char* NULLABLE desktop_as_cmdline(char** args) {
-  if (args[0] == NULL) return NULL;
-  size_t fmtd_len = 0;
-
-  char** ptr = args;
-  while (*ptr) {
-    fmtd_len += strlen(*ptr) + 1;
-    ptr++;
+// returns NULL on any error
+// otherwise it returns the absolute path of the program that MUST BE FREED
+char* NULLABLE search_path(const char* NNULLABLE for_binary) {
+  if (strchr(for_binary, '/') != NULL) {
+    // skip absolute paths
+    return strdup(for_binary);
  }
-  fmtd_len -= 1;
+  char* path_env = getenv("PATH");
+  if (!path_env) return NULL;
+  char* path = strdup(path_env);
+  if (!path) return NULL;

-  char* fmt_cmdline = malloc(fmtd_len + 1);
-  if (!fmt_cmdline) return NULL;
-
-  size_t fmting_len = 0;
-  ptr = args;
-  while (*ptr) {
-    char* nbyte = stpcpy(&fmt_cmdline[fmting_len], *ptr);
-    *nbyte = ' ';
-
-    fmting_len += nbyte - &fmt_cmdline[fmting_len] + 1;
-    ptr++;
+  char* tok = strtok(path, ":");
+  while (tok) {
+    char* bin_path;
+    asprintf(&bin_path, "%s/%s", tok, for_binary);
+    if (!bin_path) {
+      free(path);
+      return NULL;
    }
-  fmt_cmdline[fmting_len - 1] = '\0';

-  return fmt_cmdline;
+    struct stat stat_buf;
+    if (stat(bin_path, &stat_buf) == 0) {
+      // TODO: check exec bit ig
+      // if(stat_buf.) {}
+      free(path);
+      return bin_path;
+    }
+
+    free(bin_path);
+    tok = strtok(NULL, ":");
+  }
+
+  free(path);
+  return NULL;
+}
+
+// returns -1 on exec failure and -2 on search failure
+int execvpe_desktop(char** args, char* NNULLABLE* NNULLABLE envlist) {
+  char* new_arg = search_path(args[0]);
+  if (!new_arg) return -2;
+
+  free(args[0]);
+  args[0] = new_arg;
+
+  int status = execve(args[0], args, envlist);
+  free(new_arg);
+
+  return status;
 }

 // parse Exec=/bin/prog arg1 arg2\ with\ spaces
--- a/src/efield.c
+++ b/src/efield.c
@@ -2,7 +2,7 @@

 #include "efield.h"
 #include "ui.h"
-#include "util/utf8.h"
+#include "util.h"

 struct editable_field efield_new(char* content) {
  struct editable_field efield;
@@ -16,14 +16,14 @@ struct editable_field efield_new(char* content) {
  return efield;
 }

-void efield_trim(struct editable_field* self, uint8_t pos) {
+void efield_trim(struct editable_field* self, u_char pos) {
  self->pos = pos;
  self->content[pos + 1] = '\0';
 }

 #define BACKSPACE_CODE 127
 void efield_update(struct editable_field* self, char* update) {
-  uint8_t insert_len = strlen(update);
+  u_char insert_len = strlen(update);
  if (insert_len == 0) return;

  if (self->pos > strlen(self->content))
@@ -61,7 +61,7 @@ bool efield_seek(struct editable_field* self, char seek) {
  if (*self->content == '\0') return false;
  if (seek == 0) return false;

-  uint8_t count = seek < 0 ? -seek : seek;
+  u_char count = seek < 0 ? -seek : seek;
  char* ptr = &self->content[self->pos];
  char* start = ptr;

@@ -75,6 +75,6 @@ bool efield_seek(struct editable_field* self, char seek) {
    }
  }

-  self->pos = (uint8_t)(ptr - self->content);
+  self->pos = (u_char)(ptr - self->content);
  return ptr != start;
 }
--- a/src/keys.c
+++ b/src/keys.c
@@ -1,77 +0,0 @@
-#include <errno.h>
-#include <string.h>
-#include <unistd.h>
-
-#include "keys.h"
-#include "macros.h"
-#include "ui.h"
-
-static int selret_magic();
-
-int find_keyname(enum Keys* at, const char* name) {
-  for (size_t i = 0; i < LEN(KEY_MAPPINGS); i++) {
-    if (strcmp(KEY_NAMES[i], name) == 0) {
-      *at = (enum Keys)i;
-      return 0;
-    }
-  }
-
-  return -1;
-}
-
-struct option_keys find_ansi(const char* seq) {
-  for (size_t i = 0; i < LEN(KEY_MAPPINGS); i++) {
-    struct key_mapping mapping = KEY_MAPPINGS[i];
-    for (size_t j = 0; mapping.sequences[j] != NULL; j++) {
-      if (strcmp(mapping.sequences[j], seq) == 0) {
-        return (struct option_keys){
-            .is_some = true,
-            .key = (enum Keys)i,
-        };
-      }
-    }
-  }
-  return (struct option_keys){.is_some = false};
-}
-
-void read_press(uint8_t* length, char* out) {
-  *length = 0;
-
-  while (true) {
-    if (read(STDIN_FILENO, &out[(*length)++], 1) != 1) {
-      print_errno("read error");
-      sleep(3);
-      exit(1);
-    }
-    int selret = selret_magic();
-    if (selret == -1) {
-      print_errno("selret error");
-    } else if (selret != 1) {
-      out[*length] = '\0';
-      return;
-    }
-  }
-}
-
-bool read_press_nb(uint8_t* length, char* out, struct timeval* tv) {
-  fd_set fds;
-  FD_ZERO(&fds);
-  FD_SET(STDIN_FILENO, &fds);
-  errno = 0;
-  int ret = select(STDIN_FILENO + 1, &fds, NULL, NULL, tv);
-  if (errno || ret <= 0) return false;
-
-  read_press(length, out);
-  return true;
-}
-
-// https://stackoverflow.com/a/48040042
-static int selret_magic() {
-  fd_set set;
-  struct timeval timeout;
-  FD_ZERO(&set);
-  FD_SET(STDIN_FILENO, &set);
-  timeout.tv_sec = 0;
-  timeout.tv_usec = 0;
-  return select(1, &set, NULL, NULL, &timeout);
-}
--- a/src/log.c
+++ b/src/log.c
@@ -8,7 +8,6 @@ static FILE* logger_out = NULL;

 void log_init(FILE* fd) {
  if (logger_out) (void)fclose(logger_out);
-  (void)setvbuf(fd, NULL, _IONBF, 0);
  logger_out = fd;
 }

--- a/src/main.c
+++ b/src/main.c
@@ -15,7 +15,7 @@
 #include "signal_handler.h"
 #include "ui.h"
 #include "users.h"
-#include "util/vec.h"
+#include "util.h"

 #define DATESTR_MAXBUFSIZE 0x20

@@ -31,7 +31,6 @@ int main(int argc, char* argv[]) {
    }

    log_init(log_fd);
-    log_puts("Starting log:");
  }

  if (argc == 2) {
--- a/src/ofield.c
+++ b/src/ofield.c
@@ -1,9 +1,10 @@
 #include <stddef.h>

+#include "config.h"
 #include "efield.h"
 #include "ofield.h"
 #include "ui.h"
-#include "util/utf8.h"
+#include "util.h"

 struct opts_field ofield_new(size_t opts) {
  if (opts == 0) {
@@ -54,10 +55,10 @@ bool ofield_seek(struct opts_field* self, char seek) {
  return true;
 }

-uint8_t ofield_display_cursor_col(struct opts_field* self, uint8_t maxlen) {
+u_char ofield_display_cursor_col(struct opts_field* self, u_char maxlen) {
  if (self->current_opt == 0) {
-    uint8_t display_len = utf8len(self->efield.content);
-    uint8_t pos = utf8len_until(self->efield.content,
+    u_char display_len = utf8len(self->efield.content);
+    u_char pos = utf8len_until(self->efield.content,
                               &self->efield.content[self->efield.pos]);

    if (display_len > maxlen) {
--- a/src/pam.c
+++ b/src/pam.c
@@ -6,7 +6,6 @@
 #include <stdlib.h>
 #include <string.h>

-#include "log.h"
 #include "macros.h"
 #include "pam.h"
 #include "sessions.h"
@@ -93,10 +92,6 @@ struct pamh_getenv_status pamh_get_complete_env(pam_handle_t* handle,
  char** raw_envlist = pam_getenvlist(handle);
  if (!raw_envlist) FAIL(PAMH_ERR_ERRNO, "pam_getenvlist");

-  char** ptr = raw_envlist;
-  while (*ptr)
-    log_printf("[I] got pam env %s\n", *(ptr++));
-
  struct envpair extra_env[] = {
      {"TERM", getenv("TERM")},
      {"PATH", getenv("PATH")},
--- a/src/sessions.c
+++ b/src/sessions.c
@@ -1,4 +1,3 @@
-#include <errno.h>
 #include <ftw.h>
 #include <limits.h>
 #include <stdbool.h>
@@ -7,16 +6,13 @@
 #include <string.h>
 #include <sys/stat.h>
 #include <sys/types.h>
-#include <unistd.h>

-#include "config.h"
 #include "desktop.h"
 #include "desktop_exec.h"
 #include "log.h"
 #include "macros.h"
 #include "sessions.h"
-#include "util/path.h"
-#include "util/vec.h"
+#include "util.h"

 struct source_dir {
  enum SessionType type;
@@ -167,54 +163,3 @@ struct Vector get_avaliable_sessions() {

  return sessions;
 }
-
-int session_exec_exec(struct session_exec* NNULLABLE exec,
-                      char* NULLABLE* NNULLABLE envp) {
-  switch (exec->typ) {
-    case EXEC_SHELL: {
-      char* argv[] = {exec->shell, NULL};
-      return execvpe(exec->shell, argv, envp);
-    }
-    case EXEC_DESKTOP:
-      return execvpe(exec->desktop.args[0], exec->desktop.args, envp);
-    default:
-      __builtin_unreachable();
-  }
-}
-
-/// So the reason this doesn't use the user shell is because that can really be
-/// anything, also assuming it were fish for example, it can't execute posix
-/// shell files and that leaves it out of most `/etc/profile.d/` scripts.
-///
-/// I'll just default to bash for now as it's able to source almost everything
-/// and takes most flags. Maybe will try to make this more sophisticated in the
-/// future.
-///
-/// This respects errno. Even also works as any exec family function.
-#ifndef LOGIN_SHELL
-  #define LOGIN_SHELL "bash"
-#endif
-// This triggers login behavior
-#define LOGIN_SHELL_ARG0 "-" LOGIN_SHELL
-int session_exec_login_through_shell(struct session_exec* NNULLABLE exec,
-                                     char* NULLABLE* NNULLABLE envp) {
-  switch (exec->typ) {
-    case EXEC_SHELL: {
-      char* argv[] = {LOGIN_SHELL_ARG0, "-c", exec->shell, NULL};
-      return execvpe(LOGIN_SHELL, argv, envp);
-    }
-    case EXEC_DESKTOP: {
-      char* name = desktop_as_cmdline(exec->desktop.args);
-      if (!name) {
-        errno = EINVAL;
-        return -1;
-      }
-      char* argv[] = {LOGIN_SHELL_ARG0, "-c", name, NULL};
-      int ret = execvpe(LOGIN_SHELL, argv, envp);
-      free(name);
-      return ret;
-    }
-    default:
-      __builtin_unreachable();
-  }
-}
--- a/src/ui.c
+++ b/src/ui.c
@@ -32,9 +32,9 @@
 #include "ui.h"
 #include "ui_state.h"
 #include "users.h"
-#include "util/utf8.h"
+#include "util.h"

-const uint8_t INPUTS_N = 3;
+const u_char INPUTS_N = 3;

 struct uint_point {
  uint x;
@@ -135,11 +135,11 @@ char* trunc_gethostname(size_t maxlen, const char* const ELLIPSIS) {
 }

 void ui_update_cursor_focus() {
-  uint8_t line = box_start.y;
-  uint8_t col = box_start.x + VALUES_COL;
+  u_char line = box_start.y;
+  u_char col = box_start.x + VALUES_COL;

  struct opts_field* ofield = get_opts_ffield();
-  uint8_t maxlen = VALUE_MAXLEN;
+  u_char maxlen = VALUE_MAXLEN;
  if (ofield->opts > 1) {
    maxlen -= utf8len(g_config->strings.opts_pre) +
              utf8len(g_config->strings.opts_post);
@@ -269,7 +269,7 @@ int load(struct Vector* users, struct Vector* sessions) {
  scratch_print_ui();

  /// INTERACTIVE
-  uint8_t len;
+  u_char len;
  char seq[0xff];
  uint esc = 0;
  while (true) {
@@ -362,10 +362,10 @@ void clean_line(struct uint_point origin, uint line) {
  printf("\x1b[%d;%dH%s", origin.y + line, origin.x + 1, line_cleaner);
 }

-uint8_t get_render_pos_offset(struct opts_field* self, uint8_t maxlen) {
+u_char get_render_pos_offset(struct opts_field* self, u_char maxlen) {
  if (self->current_opt != 0) return 0;

-  uint8_t pos = utf8len_until(self->efield.content,
+  u_char pos = utf8len_until(self->efield.content,
                             &self->efield.content[self->efield.pos]);
  return pos - ofield_display_cursor_col(self, maxlen);
 }
@@ -439,7 +439,7 @@ void print_session(struct session session, bool multiple) {

  char* toprint = session.name;
  if (multiple) {
-    uint8_t maxlen = VALUE_MAXLEN - utf8len(g_config->strings.opts_pre) -
+    u_char maxlen = VALUE_MAXLEN - utf8len(g_config->strings.opts_pre) -
                    utf8len(g_config->strings.opts_post);
    toprint += get_render_pos_offset(&of_session, maxlen);
    size_t printlen = utf8seekn(toprint, maxlen) - toprint;
@@ -467,14 +467,13 @@ void print_user(struct user user, bool multiple) {

  char* toprint = user.display_name;
  if (multiple) {
-    uint8_t maxlen = VALUE_MAXLEN - utf8len(g_config->strings.opts_pre) -
+    u_char maxlen = VALUE_MAXLEN - utf8len(g_config->strings.opts_pre) -
                    utf8len(g_config->strings.opts_post);
    toprint += get_render_pos_offset(&of_session, maxlen);
    size_t printlen = utf8seekn(toprint, maxlen) - toprint;

-    printf("\r\x1b[%dC%s\x1b[%sm%.*s\x1b[%sm%s", box_start.x + VALUES_COL - 1,
-           g_config->strings.opts_pre, user_color, (int)printlen, toprint,
-           g_config->colors.fg, g_config->strings.opts_post);
+    printf("\r\x1b[%dC< \x1b[%sm%.*s\x1b[%sm >", box_start.x + VALUES_COL - 1,
+           user_color, (int)printlen, toprint, g_config->colors.fg);
  } else {
    toprint += get_render_pos_offset(&of_user, VALUE_MAXLEN);
    size_t printlen = utf8seekn(toprint, VALUE_MAXLEN) - toprint;
--- a/src/users.c
+++ b/src/users.c
@@ -7,7 +7,7 @@
 #include "log.h"
 #include "macros.h"
 #include "users.h"
-#include "util/vec.h"
+#include "util.h"

 // NOLINTNEXTLINE(readability-identifier-length)
 int build_user(struct user* NNULLABLE user, struct passwd* p) {
--- a/src/util.c
+++ b/src/util.c
@@ -0,0 +1,238 @@
+#include <asm-generic/errno-base.h>
+#include <errno.h>
+#include <stdint.h>
+#include <stdio.h>
+#include <stdlib.h>
+#include <string.h>
+#include <sys/types.h>
+#include <unistd.h>
+
+#include "keys.h"
+#include "ui.h"
+#include "util.h"
+
+static int selret_magic();
+
+int find_keyname(enum Keys* at, const char* name) {
+  for (size_t i = 0; i < LEN(KEY_MAPPINGS); i++) {
+    if (strcmp(KEY_NAMES[i], name) == 0) {
+      *at = (enum Keys)i;
+      return 0;
+    }
+  }
+
+  return -1;
+}
+
+struct option_keys find_ansi(const char* seq) {
+  for (size_t i = 0; i < LEN(KEY_MAPPINGS); i++) {
+    struct key_mapping mapping = KEY_MAPPINGS[i];
+    for (size_t j = 0; mapping.sequences[j] != NULL; j++) {
+      if (strcmp(mapping.sequences[j], seq) == 0) {
+        return (struct option_keys){
+            .is_some = true,
+            .key = (enum Keys)i,
+        };
+      }
+    }
+  }
+  return (struct option_keys){.is_some = false};
+}
+
+void read_press(u_char* length, char* out) {
+  *length = 0;
+
+  while (true) {
+    if (read(STDIN_FILENO, &out[(*length)++], 1) != 1) {
+      print_errno("read error");
+      sleep(3);
+      exit(1);
+    }
+    int selret = selret_magic();
+    if (selret == -1) {
+      print_errno("selret error");
+    } else if (selret != 1) {
+      out[*length] = '\0';
+      return;
+    }
+  }
+}
+
+bool read_press_nb(u_char* length, char* out, struct timeval* tv) {
+  fd_set fds;
+  FD_ZERO(&fds);
+  FD_SET(STDIN_FILENO, &fds);
+  errno = 0;
+  int ret = select(STDIN_FILENO + 1, &fds, NULL, NULL, tv);
+  if (errno || ret <= 0) return false;
+
+  read_press(length, out);
+  return true;
+}
+
+// https://stackoverflow.com/a/48040042
+static int selret_magic() {
+  fd_set set;
+  struct timeval timeout;
+  FD_ZERO(&set);
+  FD_SET(STDIN_FILENO, &set);
+  timeout.tv_sec = 0;
+  timeout.tv_usec = 0;
+  return select(1, &set, NULL, NULL, &timeout);
+}
+
+// UTF-8 shii
+#define UTF8_CONT_MSK 0b11000000
+#define UTF8_CONT_VAL 0b10000000
+bool utf8_iscont(char byte) {
+  return (byte & UTF8_CONT_MSK) == UTF8_CONT_VAL;
+}
+
+size_t utf8len(const char* str) {
+  size_t len = 0;
+  while (*str != '\0') {
+    if (!utf8_iscont(*(str++))) len++;
+  }
+
+  return len;
+}
+
+size_t utf8len_until(const char* str, const char* until) {
+  size_t len = 0;
+  while (str < until) {
+    if (!utf8_iscont(*(str++))) len++;
+  }
+
+  return len;
+}
+
+size_t utf8trunc(char* str, size_t n) {
+  size_t bytes = 0;
+  while (true) {
+    if (str[bytes] == '\0') break;
+    if (utf8_iscont(str[bytes])) {
+      bytes++;
+      continue;
+    }
+    if (n == 0) {
+      str[bytes] = '\0';
+      break;
+    }
+    bytes++;
+    n--;
+  }
+  return bytes;
+}
+
+const char* utf8back(const char* str) {
+  while (utf8_iscont(*(--str))) {
+  }
+  return str;
+}
+const char* utf8seek(const char* str) {
+  while (utf8_iscont(*(++str))) {
+  }
+  return str;
+}
+
+const char* utf8seekn(const char* str, size_t n) {
+  while (n > 0 && *str != '\0') {
+    str = utf8seek(str);
+    n--;
+  }
+  return str;
+}
+
+// Vector shii
+const struct Vector VEC_NEW = {
+    .length = 0,
+    .capacity = 0,
+    .pages = NULL,
+};
+
+struct Vector vec_from_raw(void** raw) {
+  size_t len = 0;
+  while (raw[len])
+    len++;
+
+  return (struct Vector){
+      .length = len,
+      .capacity = len,
+      .pages = raw,
+  };
+}
+
+void** vec_as_raw(struct Vector self) {
+  if (vec_push(&self, NULL) != 0) return NULL;
+  return self.pages;
+}
+
+int vec_resize(struct Vector* self, size_t size) {
+  void** new_location =
+      (void**)realloc((void*)self->pages, size * sizeof(void*));
+  if (new_location != NULL) {
+    if (self->length > size) self->length = size;
+    self->capacity = size;
+    self->pages = new_location;
+  } else {
+    return -1;
+  }
+  return 0;
+}
+
+int vec_reserve(struct Vector* self, size_t size) {
+  uint32_t new_capacity = self->capacity;
+  while (self->length + size > new_capacity) {
+    new_capacity = new_capacity + (new_capacity >> 1) +
+                   1; // cap * 1.5 + 1; 0 1 2 4 7 11...
+  }
+  return vec_resize(self, new_capacity);
+}
+
+int vec_reserve_exact(struct Vector* self, size_t size) {
+  uint32_t needed_capacity = self->length + size;
+  if (self->capacity < needed_capacity) {
+    return vec_resize(self, needed_capacity);
+  }
+  return 0;
+}
+
+int vec_push(struct Vector* self, void* item) {
+  int res_ret = vec_reserve(self, 1);
+  if (res_ret != 0) return res_ret;
+
+  self->pages[self->length++] = item;
+  return 0;
+}
+
+void vec_free(struct Vector* self) {
+  while (self->length > 0)
+    free(self->pages[--self->length]);
+
+  vec_clear(self);
+}
+
+void vec_clear(struct Vector* self) {
+  free((void*)self->pages);
+  vec_reset(self);
+}
+
+void vec_reset(struct Vector* self) {
+  *self = (struct Vector){
+      .length = 0,
+      .capacity = 0,
+      .pages = NULL,
+  };
+}
+
+void* vec_pop(struct Vector* self) {
+  if (self->length == 0) return NULL;
+
+  return self->pages[--self->length];
+}
+
+void* vec_get(struct Vector* self, size_t index) {
+  if (index >= self->length) return NULL;
+
+  return self->pages[index];
+}
--- a/src/util/path.c
+++ b/src/util/path.c
@@ -1,64 +0,0 @@
-#include <errno.h>
-#include <stdint.h>
-#include <stdio.h>
-#include <stdlib.h>
-#include <string.h>
-#include <sys/stat.h>
-#include <sys/types.h>
-#include <unistd.h>
-
-#include "util/path.h"
-
-// returns NULL on any error
-// otherwise it returns the absolute path of the program that MUST BE FREED
-//
-// Should be almost completely posix compliant, except it won't resolve empty
-// PATH entries relative to the cwd
-char* NULLABLE search_path(const char* NNULLABLE for_binary) {
-  if (strchr(for_binary, '/') != NULL) {
-    // skip absolute paths
-    return strdup(for_binary);
-  }
-  char* path_env = getenv("PATH");
-  if (!path_env) return NULL;
-  char* path = strdup(path_env);
-  if (!path) return NULL;
-
-  char* tok = strtok(path, ":");
-  while (tok) {
-    char* bin_path;
-    asprintf(&bin_path, "%s/%s", tok, for_binary);
-    if (!bin_path) {
-      free(path);
-      return NULL;
-    }
-
-    struct stat stat_buf;
-    if (stat(bin_path, &stat_buf) == 0 && access(bin_path, X_OK) == 0) {
-      free(path);
-      return bin_path;
-    }
-
-    free(bin_path);
-    tok = strtok(NULL, ":");
-  }
-
-  free(path);
-  return NULL;
-}
-
-// This is present in glibc ONLY with GNU extensions, this aims to provide a
-// musl compatible variant.
-//
-// Respects errno of exec functions family.
-int execvpe(const char* NNULLABLE file, char* NULLABLE const argv[NNULLABLE],
-            char* NULLABLE const envp[NNULLABLE]) {
-  char* path = search_path(file);
-  if (!path) {
-    errno = ENOENT;
-    return -1;
-  }
-  int ret = execve(path, argv, envp);
-  free(path);
-  return ret;
-}
--- a/src/util/utf8.c
+++ b/src/util/utf8.c
@@ -1,62 +0,0 @@
-#include "util/utf8.h"
-
-#define UTF8_CONT_MSK 0b11000000
-#define UTF8_CONT_VAL 0b10000000
-bool utf8_iscont(char byte) {
-  return (byte & UTF8_CONT_MSK) == UTF8_CONT_VAL;
-}
-
-size_t utf8len(const char* str) {
-  size_t len = 0;
-  while (*str != '\0') {
-    if (!utf8_iscont(*(str++))) len++;
-  }
-
-  return len;
-}
-
-size_t utf8len_until(const char* str, const char* until) {
-  size_t len = 0;
-  while (str < until) {
-    if (!utf8_iscont(*(str++))) len++;
-  }
-
-  return len;
-}
-
-size_t utf8trunc(char* str, size_t n) {
-  size_t bytes = 0;
-  while (true) {
-    if (str[bytes] == '\0') break;
-    if (utf8_iscont(str[bytes])) {
-      bytes++;
-      continue;
-    }
-    if (n == 0) {
-      str[bytes] = '\0';
-      break;
-    }
-    bytes++;
-    n--;
-  }
-  return bytes;
-}
-
-const char* utf8back(const char* str) {
-  while (utf8_iscont(*(--str))) {
-  }
-  return str;
-}
-const char* utf8seek(const char* str) {
-  while (utf8_iscont(*(++str))) {
-  }
-  return str;
-}
-
-const char* utf8seekn(const char* str, size_t n) {
-  while (n > 0 && *str != '\0') {
-    str = utf8seek(str);
-    n--;
-  }
-  return str;
-}
--- a/src/util/vec.c
+++ b/src/util/vec.c
@@ -1,96 +0,0 @@
-#include <stdlib.h>
-
-#include "util/vec.h"
-
-const struct Vector VEC_NEW = {
-    .length = 0,
-    .capacity = 0,
-    .pages = NULL,
-};
-
-struct Vector vec_from_raw(void** raw) {
-  size_t len = 0;
-  while (raw[len])
-    len++;
-
-  return (struct Vector){
-      .length = len,
-      .capacity = len,
-      .pages = raw,
-  };
-}
-
-void** vec_as_raw(struct Vector self) {
-  if (vec_push(&self, NULL) != 0) return NULL;
-  return self.pages;
-}
-
-int vec_resize(struct Vector* self, size_t size) {
-  void** new_location =
-      (void**)realloc((void*)self->pages, size * sizeof(void*));
-  if (new_location != NULL) {
-    if (self->length > size) self->length = size;
-    self->capacity = size;
-    self->pages = new_location;
-  } else {
-    return -1;
-  }
-  return 0;
-}
-
-int vec_reserve(struct Vector* self, size_t size) {
-  uint32_t new_capacity = self->capacity;
-  while (self->length + size > new_capacity) {
-    new_capacity = new_capacity + (new_capacity >> 1) +
-                   1; // cap * 1.5 + 1; 0 1 2 4 7 11...
-  }
-  return vec_resize(self, new_capacity);
-}
-
-int vec_reserve_exact(struct Vector* self, size_t size) {
-  uint32_t needed_capacity = self->length + size;
-  if (self->capacity < needed_capacity) {
-    return vec_resize(self, needed_capacity);
-  }
-  return 0;
-}
-
-int vec_push(struct Vector* self, void* item) {
-  int res_ret = vec_reserve(self, 1);
-  if (res_ret != 0) return res_ret;
-
-  self->pages[self->length++] = item;
-  return 0;
-}
-
-void vec_free(struct Vector* self) {
-  while (self->length > 0)
-    free(self->pages[--self->length]);
-
-  vec_clear(self);
-}
-
-void vec_clear(struct Vector* self) {
-  free((void*)self->pages);
-  vec_reset(self);
-}
-
-void vec_reset(struct Vector* self) {
-  *self = (struct Vector){
-      .length = 0,
-      .capacity = 0,
-      .pages = NULL,
-  };
-}
-
-void* vec_pop(struct Vector* self) {
-  if (self->length == 0) return NULL;
-
-  return self->pages[--self->length];
-}
-
-void* vec_get(struct Vector* self, size_t index) {
-  if (index >= self->length) return NULL;
-
-  return self->pages[index];
-}
--- a/themes/README.md
+++ b/themes/README.md
@@ -1,21 +1,5 @@
 # Themes

-## catppuccin-frappe.ini
-
-![catppuccin-frappe.ini theme](./screenshots/catppuccin-frappe.png)
-
-## catppuccin-latte.ini
-
-![catppuccin-latte.ini theme](./screenshots/catppuccin-latte.png)
-
-## catppuccin-macchiato.ini
-
-![catppuccin-macchiato.ini theme](./screenshots/catppuccin-macchiato.png)
-
-## catppuccin-mocha.ini
-
-![catppuccin-mocha.ini theme](./screenshots/catppuccin-mocha.png)
-
 ## cherry.ini

 ![cherry.ini theme](./screenshots/cherry.png)
--- a/themes/catppuccin-frappe.ini
+++ b/themes/catppuccin-frappe.ini
@@ -1,24 +0,0 @@
-##############################################
-#                                            #
-#              Catppuccin Theme              #
-#                                            #
-##############################################
-
-# Catppuccin Frappé
-# This theme was created by: Catppuccin Org! <3
-
-[colors]
-bg          = "23;24;25;48;2;48;52;70"
-fg          = "22;23;24;25;29;38;2;198;208;245"
-err         = "1;4;23;24;25;38;2;231;130;132"
-s_wayland   = "3;22;24;25;38;2;202;158;230"
-s_xorg      = "3;22;24;25;38;2;202;158;230"
-s_shell     = "3;22;24;25;38;2;244;184;228"
-e_hostname  = "1;3;24;25;29;38;2;242;213;207"
-e_date      = "3;22;24;25;29;38;2;165;173;206"
-e_box       = "1;23;24;25;29;38;2;115;121;148"
-e_header    = "1;3;24;25;29;38;2;239;159;118"
-e_user      = "3;22;24;25;29;38;2;140;170;238"
-e_passwd    = "1;23;24;25;29;38;2;166;209;137"
-e_badpasswd = "1;9;23;24;25;38;2;231;130;132"
-e_key       = "22;23;24;25;38;2;129;200;190"
--- a/themes/catppuccin-latte.ini
+++ b/themes/catppuccin-latte.ini
@@ -1,24 +0,0 @@
-##############################################
-#                                            #
-#              Catppuccin Theme              #
-#                                            #
-##############################################
-
-# Catppuccin Latte
-# This theme was created by: Catppuccin Org! <3
-
-[colors]
-bg          = "23;24;25;48;2;239;241;245"
-fg          = "22;23;24;25;29;38;2;76;79;105"
-err         = "1;4;23;24;25;38;2;210;15;57"
-s_wayland   = "3;22;24;25;38;2;136;57;239"
-s_xorg      = "3;22;24;25;38;2;136;57;239"
-s_shell     = "3;22;24;25;38;2;234;118;203"
-e_hostname  = "1;3;24;25;29;38;2;220;138;120"
-e_date      = "3;22;24;25;29;38;2;108;111;133"
-e_box       = "1;23;24;25;29;38;2;156;160;176"
-e_header    = "1;3;24;25;29;38;2;254;100;11"
-e_user      = "3;22;24;25;29;38;2;30;102;245"
-e_passwd    = "1;23;24;25;29;38;2;64;160;43"
-e_badpasswd = "1;9;23;24;25;38;2;210;15;57"
-e_key       = "22;23;24;25;38;2;23;146;153"
--- a/themes/catppuccin-macchiato.ini
+++ b/themes/catppuccin-macchiato.ini
@@ -1,24 +0,0 @@
-##############################################
-#                                            #
-#              Catppuccin Theme              #
-#                                            #
-##############################################
-
-# Catppuccin Macchiato
-# This theme was created by: Catppuccin Org! <3
-
-[colors]
-bg          = "23;24;25;48;2;36;39;58"
-fg          = "22;23;24;25;29;38;2;202;211;245"
-err         = "1;4;23;24;25;38;2;237;135;150"
-s_wayland   = "3;22;24;25;38;2;198;160;246"
-s_xorg      = "3;22;24;25;38;2;198;160;246"
-s_shell     = "3;22;24;25;38;2;245;189;230"
-e_hostname  = "1;3;24;25;29;38;2;244;219;214"
-e_date      = "3;22;24;25;29;38;2;165;173;203"
-e_box       = "1;23;24;25;29;38;2;110;115;141"
-e_header    = "1;3;24;25;29;38;2;245;169;127"
-e_user      = "3;22;24;25;29;38;2;138;173;244"
-e_passwd    = "1;23;24;25;29;38;2;166;218;149"
-e_badpasswd = "1;9;23;24;25;38;2;237;135;150"
-e_key       = "22;23;24;25;38;2;139;213;202"
--- a/themes/catppuccin-mocha.ini
+++ b/themes/catppuccin-mocha.ini
@@ -1,24 +0,0 @@
-##############################################
-#                                            #
-#              Catppuccin Theme              #
-#                                            #
-##############################################
-
-# Catppuccin Mocha
-# This theme was created by: Catppuccin Org! <3
-
-[colors]
-bg          = "23;24;25;48;2;30;30;46"
-fg          = "22;23;24;25;29;38;2;205;214;244"
-err         = "1;4;23;24;25;38;2;243;139;168"
-s_wayland   = "3;22;24;25;38;2;203;166;247"
-s_xorg      = "3;22;24;25;38;2;203;166;247"
-s_shell     = "3;22;24;25;38;2;245;194;231"
-e_hostname  = "1;3;24;25;29;38;2;245;224;220"
-e_date      = "3;22;24;25;29;38;2;166;173;200"
-e_box       = "1;23;24;25;29;38;2;108;112;134"
-e_header    = "1;3;24;25;29;38;2;250;179;135"
-e_user      = "3;22;24;25;29;38;2;137;180;250"
-e_passwd    = "1;23;24;25;29;38;2;166;227;161"
-e_badpasswd = "1;9;23;24;25;38;2;243;139;168"
-e_key       = "22;23;24;25;38;2;148;226;213"
--- a/themes/catppuccin.tera
+++ b/themes/catppuccin.tera
@@ -1,35 +0,0 @@
---
-whiskers:
-  version: ^2.5.1
-  matrix:
-    - flavor
-  filename: catppuccin-{{ flavor.identifier }}.ini
---
-{%- macro rgb(col) -%}
-2;{{ col.rgb.r }};{{ col.rgb.g }};{{ col.rgb.b }}
-{%- endmacro rgb -%}
-
-##############################################
-#                                            #
-#              Catppuccin Theme              #
-#                                            #
-##############################################
-
-# Catppuccin {{flavor.name}}
-# This theme was created by: Catppuccin Org! <3
-
-[colors]
-bg          = "23;24;25;48;{{ self::rgb(col=base) }}"
-fg          = "22;23;24;25;29;38;{{ self::rgb(col=text) }}"
-err         = "1;4;23;24;25;38;{{ self::rgb(col=red) }}"
-s_wayland   = "3;22;24;25;38;{{ self::rgb(col=mauve) }}"
-s_xorg      = "3;22;24;25;38;{{ self::rgb(col=mauve) }}"
-s_shell     = "3;22;24;25;38;{{ self::rgb(col=pink) }}"
-e_hostname  = "1;3;24;25;29;38;{{ self::rgb(col=rosewater) }}"
-e_date      = "3;22;24;25;29;38;{{ self::rgb(col=subtext0) }}"
-e_box       = "1;23;24;25;29;38;{{ self::rgb(col=overlay0) }}"
-e_header    = "1;3;24;25;29;38;{{ self::rgb(col=peach) }}"
-e_user      = "3;22;24;25;29;38;{{ self::rgb(col=blue) }}"
-e_passwd    = "1;23;24;25;29;38;{{ self::rgb(col=green) }}"
-e_badpasswd = "1;9;23;24;25;38;{{ self::rgb(col=red) }}"
-e_key       = "22;23;24;25;38;{{ self::rgb(col=teal) }}"
--- a/themes/screenshots/catppuccin-frappe.png
+++ b/themes/screenshots/catppuccin-frappe.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0704a1aadffee71bc0753c861d8ac8b8588aae76ad8cdcb4f2c2700b98ec095c
-size 23814
--- a/themes/screenshots/catppuccin-latte.png
+++ b/themes/screenshots/catppuccin-latte.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:58d56d6e16e14f0eddaa8a11e8bf238f2056e784b9c7c46d88aa8ff2d948355e
-size 23110
--- a/themes/screenshots/catppuccin-macchiato.png
+++ b/themes/screenshots/catppuccin-macchiato.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:225dba8cf87de1ae7118bfd98a1966fdb92cc826418dd9ef7dda5ee77ae8d0f3
-size 23886
--- a/themes/screenshots/catppuccin-mocha.png
+++ b/themes/screenshots/catppuccin-mocha.png
@@ -1,3 +0,0 @@
-version https://git-lfs.github.com/spec/v1
-oid sha256:0c8269cc55fdc26bfff240b3dccd94ffab6400b33c049af23912b74a62247943
-size 23826
--- a/themes/screenshots/cherry.png
+++ b/themes/screenshots/cherry.png
--- a/themes/screenshots/default.png
+++ b/themes/screenshots/default.png
--- a/themes/screenshots/kanagawa-dragon.png
+++ b/themes/screenshots/kanagawa-dragon.png
--- a/themes/screenshots/kanagawa-wave.png
+++ b/themes/screenshots/kanagawa-wave.png
--- a/themes/screenshots/minimal.png
+++ b/themes/screenshots/minimal.png
--- a/themes/screenshots/nature.png
+++ b/themes/screenshots/nature.png
--- a/themes/screenshots/nord.png
+++ b/themes/screenshots/nord.png
--- a/themes/screenshots/nothing.png
+++ b/themes/screenshots/nothing.png
--- a/themes/screenshots/old-blue.png
+++ b/themes/screenshots/old-blue.png
--- a/themes/screenshots/tasteless.png
+++ b/themes/screenshots/tasteless.png
--- a/themes/take-screenshots.sh
+++ b/themes/take-screenshots.sh
@@ -1,5 +1,4 @@
 #!/usr/bin/env bash
-
 set -e

 MYSELF=$(realpath "$0")
@@ -17,7 +16,7 @@ if [[ -z "$IM_FLOATING" ]]; then
    # 12 pts ≈ 16 px
    exec hyprctl dispatch exec \
        "[float; size $((COLS*16)) $((ROWS*16))]" \
-        "kitty --override font_size=12.0 --override background_opacity=1 --override cursor_trail=0 --override cursor_shape=beam --override cursor_blink_interval=0 bash -c 'cd \"$PWD\" && IM_FLOATING=1 LIDM_PATH=\"$LIDM_PATH\" LIDM_SCR_TTY=\"$(tty)\" LIDM_SESSIONS_N=\"$LIDM_SESSIONS_N\" bash -i \"$MYSELF\"'"
+        "kitty --override font_size=12.0 --override background_opacity=1 --override cursor_trail=0 --override cursor_shape=beam --override cursor_blink_interval=0 bash -c 'cd \"$PWD\" && IM_FLOATING=1 LIDM_PATH=\"$LIDM_PATH\" LIDM_SCR_TTY=\"$(tty)\" LIDM_SESSIONS_N=\"$LIDM_SESSIONS_N\" \"$MYSELF\"'"
 fi

 LIDM_PATH=${LIDM_PATH:-$(command which lidm)}
@@ -45,11 +44,11 @@ printf '\033]4;0;rgb:%s\007' "${BG:0:2}/${BG:2:2}/${BG:4:2}"
 PRAD=$(hyprctl getoption decoration:rounding | rg int | cut -d' ' -f2)
 hyprctl keyword decoration:rounding 0

+tty=$(tty)
 for theme in "$MYDIR"/*.ini; do
-    LIDM_CONF="$theme" "$LIDM_PATH" &
+    LIDM_CONF="$theme" "$LIDM_PATH" <"$tty" &
    LIDM_PID=$!

-    (
    sleep .2
    for n in $(seq "$LIDM_SESSIONS_N"); do
        GEOMETRY=$(
@@ -62,9 +61,6 @@ for theme in "$MYDIR"/*.ini; do
        sleep .5
    done
    kill -15 $LIDM_PID
-    ) &
-
-    fg %-
    sleep .5
 done

@@ -72,9 +68,9 @@ gifski \
    -Q 95 --fps 4 \
    -W $((COLS*32)) \
    -o "$MYDIR/../assets/media/lidm.gif" \
-    "$MYDIR"/screenshots/*-?.png &> "$LIDM_SCR_TTY"
+    "$MYDIR"/screenshots/*.png &> "$LIDM_SCR_TTY"

-for screenshot in "$MYDIR"/screenshots/*"-2.png"; do
+for screenshot in "$MYDIR"/screenshots/*"-1.png"; do
    # shellcheck disable=SC2001
    mv "$screenshot" "$(sed 's/-[0-9]\.png/.png/' <<<"$screenshot")"