redo of #69 (#75)

* fix(pkg,aur): sources now are version unique

* build: allow to override git-rev and timestamp build info

* chore: organize and parallelize some checks

* chore: make standard PKGBUIDLs

* pkg(aur): `-bin` only has to depend on the `.so` file

* pkg(feat,aur): multiarch `-bin` pkg

* ci(void): update xbps first, add warning

* pkg(aur): bump pkgrels

* pkg(aur): pkgrel again AND `.SRCINFO` finally

---------

Co-authored-by: grialion <48643945+grialion@users.noreply.github.com>

.codespellrc

@@ -1,2 +1,2 @@
 [codespell]
-skip = ./assets/pkg/aur/*/src,./assets/pkg/aur/*/*/objects
+skip = ./assets/pkg/aur/*/src,./assets/pkg/aur/*/*/objects,./assets/pkg/aur/*/*.tar.*

.github/workflows/build.yml

@@ -67,7 +67,8 @@ jobs:
             apt-get update && \
             apt-get install -y make gcc libpam0g-dev
           run: ARCH=aarch64 GITHUB_STEP_SUMMARY=gss.out GITHUB_OUTPUT=go.out assets/github_scripts/build.sh
-      - run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
+      - if: always()
+        run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@v4
         with:
@@ -94,7 +95,8 @@ jobs:
             apt-get update && \
             apt-get install -y make gcc libpam0g-dev
           run: ARCH=armv7 GITHUB_STEP_SUMMARY=gss.out GITHUB_OUTPUT=go.out assets/github_scripts/build.sh
-      - run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
+      - if: always()
+        run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@v4
         with:
@@ -121,10 +123,40 @@ jobs:
             apt-get update && \
             apt-get install -y make gcc libpam0g-dev
           run: ARCH=riscv64 GITHUB_STEP_SUMMARY=gss.out GITHUB_OUTPUT=go.out assets/github_scripts/build.sh
-      - run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
+      - if: always()
+        run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
 
       - uses: actions/upload-artifact@v4
         with:
           name: build-riscv64
           path: lidm-riscv64
           retention-days: 1
+
+  # This build job is only symbolic, the behavior of the packaged Void Linux version may differ.
+  build-linux-amd64-musl:
+    name: amd64-musl
+    runs-on: ubuntu-24.04
+    permissions: write-all
+    steps:
+      - uses: actions/checkout@v4
+
+      - name: Run in Musl Container
+        uses: addnab/docker-run-action@v3
+        with:
+          image: ghcr.io/void-linux/void-musl-full
+          options: -v ${{ github.workspace }}:/workspace
+          run: |
+            cd /workspace
+
+            xbps-install -Syu xbps && xbps-install -yu
+            xbps-install -y git pam-devel make gcc bash git
+
+            ARCH=amd64-musl GITHUB_STEP_SUMMARY=gss.out GITHUB_OUTPUT=go.out assets/github_scripts/build.sh
+      - if: always()
+        run: set +e; cat gss.out >>"$GITHUB_STEP_SUMMARY"; cat go.out >>"$GITHUB_OUTPUT"
+
+      - uses: actions/upload-artifact@v4
+        with:
+          name: build-amd64-musl
+          path: lidm-amd64-musl
+          retention-days: 1

.github/workflows/check.yml

@@ -26,18 +26,26 @@ jobs:
         with:
           packages: "shellcheck"
           version: 1.0
-      - run: find . -type f -name '*.sh' -not -path './assets/pkg/aur/*/src/*' | xargs shellcheck
+      - run: git ls-files "*.sh" "*/PKGBUILD" | xargs shellcheck --shell=bash
 
   clangcheck:
     name: Clang
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-latest
+    container:
+      image: ubuntu:25.04
 
     steps:
       - uses: actions/checkout@v4
-      - uses: awalsh128/cache-apt-pkgs-action@latest
-        with:
-          packages: "clang-format clang-tidy bear libpam0g-dev"
-          version: 1.0
+      - run: apt -y update && apt install -y clang-format clang-tidy make gcc git bear libpam0g-dev
+
       - run: bear -- make
-      - run: clang-format -ni src/*.c include/*.h
-      - run: clang-tidy -p . src/*.c include/*.h
+      - run: clang-format -version && clang-format -dump-config
+      - run: |
+          set -euo pipefail
+          clang-format -ni src/*.c include/*.h -Werror 2>&1 | \
+            sed -E 's/^([^ ]+\.[ch]):([0-9]+):([0-9]+): ([a-z]+): (.*)$/::\4 file=\1,line=\2,col=\3::\5/'
+      - run: clang-tidy -version && clang-tidy -dump-config
+      - run: |
+          set -euo pipefail
+          clang-tidy -p . src/*.c include/*.h -warnings-as-errors=\* 2>&1 1>/dev/null |
+            sed -E 's/^([^ ]+\.[ch]):([0-9]+):([0-9]+): ([a-z]+): (.*)$/::\4 file=\1,line=\2,col=\3::\5/'

.github/workflows/make-release.yml

@@ -16,6 +16,8 @@ jobs:
           packages: "git"
           version: 1.0
       - uses: actions/checkout@v4
+        with:
+          fetch-tags: true
 
       - name: Check Version Changed
         id: check-ver-changed
@@ -27,6 +29,7 @@ jobs:
             echo "ERR: Git tag matches makefile, did you bump Makefile up?" >&2
             exit 1
           fi
+
           echo "VERSION=$MAKE_TAG" >> "$GITHUB_OUTPUT"
 
 
@@ -70,7 +73,6 @@ jobs:
     needs: [ release-checks, release ]
     steps:
       - run: pacman -Sy --noconfirm git github-cli base-devel pacman-contrib
-
       - uses: actions/checkout@v4
 
       - run: |
@@ -96,3 +98,37 @@ jobs:
             --body "*This PR was created automatically*"
         env:
           GH_TOKEN: ${{ github.token }}
+
+  nix-update:
+    name: Update NixOS module
+    runs-on: ubuntu-24.04
+    permissions: write-all
+    needs: [ release-checks, release ]
+    steps:
+      - uses: cachix/install-nix-action@v31
+      - uses: actions/checkout@v4
+        with:
+          fetch-tags: true
+
+      - run: |
+          tmpdir=$(mktemp -d)
+          git archive v${{ needs.release-checks.outputs.VERSION }} | tar -xC "$tmpdir"
+          sha256sum=$(nix hash path "$tmpdir")
+
+          sed -i -E 's/(.*version\s*=\s*")[0-9.]*(".*)/\1'${{ needs.release-checks.outputs.VERSION }}'\2/' assets/pkg/nix/module.nix
+          sed -i -E 's|(.*sha256\s*=\s*")[^"]*(".*)|\1'"$sha256sum"'\2|' assets/pkg/nix/module.nix
+        # would be cool to be able to check the new module.nix builds
+
+      - run: |
+          BRANCH=actions/update-nix-${{ 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 NixOS module to v${{ needs.release-checks.outputs.VERSION }}"
+          git push -u origin $BRANCH
+          gh pr create --head $BRANCH \
+            --title "[Nix update]: Bump to ${{ needs.release-checks.outputs.VERSION }}" \
+            --body "*This PR was created automatically*"
+        env:
+          GH_TOKEN: ${{ github.token }}

.github/workflows/push.yml

@@ -12,7 +12,24 @@ jobs:
     name: Check
     uses: ./.github/workflows/check.yml
     permissions: write-all
+  check_paths:
+    name: Paths Filter
+    runs-on: ubuntu-latest
+    outputs:
+      code_changed: ${{ steps.filter.outputs.code }}
+    steps:
+      - uses: actions/checkout@v4
+      - id: filter
+        uses: dorny/paths-filter@v3
+        with:
+          filters: |
+            code:
+              - Makefile
+              - 'src/**'
+              - 'include/**'
   build:
     name: Build
+    needs: check_paths
+    if: github.event_name != 'push' || needs.check_paths.outputs.code_changed == 'true'
     uses: ./.github/workflows/build.yml
     permissions: write-all

Makefile

@@ -1,4 +1,4 @@
-VERSION = 1.2.1
+VERSION = 1.2.3
 .DEFAULT_GOAL := lidm
 
 CDIR=src
@@ -10,7 +10,9 @@ PREFIX=/usr
 
 CC?=gcc
 CFLAGS?=-O3 -Wall
-ALLFLAGS=$(CFLAGS) -I$(IDIR)
+# C PreProcessor flags, not C Plus Plus
+CPPFLAGS?=
+ALLFLAGS=$(CFLAGS) $(CPPFLAGS) -I$(IDIR)
 
 LIBS=-lpam
 
@@ -20,14 +22,15 @@ DEPS = $(patsubst %,$(IDIR)/%,$(_DEPS))
 _OBJ = main.o log.o util.o ui.o ui_state.o config.o desktop.o auth.o ofield.o efield.o users.o sessions.o chvt.o launch_state.o
 OBJ = $(patsubst %,$(ODIR)/%,$(_OBJ))
 
-.git/HEAD:
+INFO_GIT_REV?=$$(git describe --long --tags --always || echo '?')
+INFO_BUILD_TS?=$$(date +%s)
 
-$(IDIR)/version.h: Makefile .git/HEAD
+$(IDIR)/version.h: Makefile
 	@tmp=$$(mktemp); \
 	printf '' > $$tmp; \
 	echo '#define LIDM_VERSION "'$(VERSION)'"' >> $$tmp; \
-	echo '#define LIDM_GIT_REV "'$$(git describe --long --tags --always || echo '?')'"' >> $$tmp; \
-	echo '#define LIDM_BUILD_TS '$$(date +%s) >> $$tmp; \
+	echo '#define LIDM_GIT_REV "'$(INFO_GIT_REV)'"' >> $$tmp; \
+	echo '#define LIDM_BUILD_TS '$(INFO_BUILD_TS) >> $$tmp; \
 	if ! cmp -s $$tmp $@; then \
 		mv $$tmp $@; \
 	fi; \
@@ -131,9 +134,12 @@ install-service-s6-etc:
 
 pre-commit:
 	codespell
-	find . -type f -name '*.sh' -not -path './assets/pkg/aur/*/src/*' | xargs shellcheck
+	prettier -c "**/*.md"
+	git ls-files "*.sh" "*/PKGBUILD" | xargs shellcheck --shell=bash
 	clang-format -i $$(git ls-files "*.c" "*.h")
-	clang-tidy -p . $$(git ls-files "*.c" "*.h")
+	git ls-files -z "*.h" | \
+		parallel -j$$(nproc) -q0 --no-notice --will-cite --tty clang-tidy --quiet |& \
+		grep -v "warnings generated." || true
 
 print-version:
 	@echo $(VERSION)

README.md

@@ -10,33 +10,41 @@ LiDM is like any [Display Manager](https://en.wikipedia.org/wiki/X_display_manag
 
 ![demo gif](assets/media/lidm.gif)
 
-> *shown as in a featured terminal emulator, actual linux console doesn't support as much color and decorations*
+<blockquote><details>
+<summary><i>
+shown as in a featured terminal emulator, actual linux console doesn't support as much color and decorations
+</i></summary>
 
-> *however, all colors and strings are fully customizable*
+If you want to add fancy color and font support to your TTYs you can wrap lidm in [`kmscon`](https://wiki.archlinux.org/title/KMSCON). (edit appropriate service files). e.g:
+
+```sh
+kmscon -l --vt /dev/tty7 --font-name "Cascadia Code" -- /usr/bin/lidm
+```
+
+</details></blockquote>
+
+> _however, all colors and strings are fully customizable_
 
 ## Features
 
-* Simple as C, you only need a C compiler and standard unix libraries to build this.
-* Fully customizable, from strings, including action keys, to colors (I hope you know ansi escape codes)
-* Automatically detects xorg and wayland sessions, plus allowing to launch the default user shell (if enabled in config)
-* Starts with many init systems (systemd, dinit, runit, openrc and s6).
+- Simple as C, you only need a C compiler and standard unix libraries to build this.
+- Fully customizable, from strings, including action keys, to colors (I hope you know ansi escape codes)
+- Automatically detects xorg and wayland sessions, plus allowing to launch the default user shell (if enabled in config)
+- Starts with many init systems (systemd, dinit, runit, openrc and s6).
 
-# Index
+# Table of Contents
 
-* [LiDM](#lidm)
-  * [Features](#features)
-  * [WIP](#wip)
-* [Index](#index)
-* [Ideology](#ideology)
-* [Usage](#usage)
-  * [Arguments](#arguments)
-  * [Program](#program)
-* [Requirements](#requirements)
-* [Installation](#installation)
-* [Configuring](#configuring)
-* [Contributing](#contributing)
-* [Inspiration](#inspiration)
-* [Contributors](#contributors)
+- [Ideology](#ideology)
+- [Usage](#usage)
+  - [Arguments](#arguments)
+  - [Program](#program)
+- [Requirements](#requirements)
+- [Installation](#installation)
+- [Configuring](#configuring)
+- [PAM](#pam)
+- [Contributing](#contributing)
+- [Inspiration](#inspiration)
+- [Contributors](#contributors)
 
 # Ideology
 
@@ -44,7 +52,7 @@ We all know that the most important thing in a project is the ideology of the au
 
 [ ![stopchatcontrol](https://stopchatcontrol.eu/wp-content/uploads/2023/09/1-1-1024x1024.png) ](https://stopchatcontrol.eu)
 
-> *there's also a [change.org post](https://www.change.org/p/stoppt-die-chatkontrolle-grundrechte-gelten-auch-im-netz).*
+> _there's also a [change.org post](https://www.change.org/p/stoppt-die-chatkontrolle-grundrechte-gelten-auch-im-netz)._
 
 # Usage
 
@@ -56,25 +64,33 @@ If a single argument is provided (don't even do `--` or standard unix parsing...
 
 Base (mostly intuitive):
 
-* Use arrow keys to navigate the inputs and type over any of them to override the default value.
-* Enter will just attempt to login.
-* If you are focused on an edited input, horizontal arrow keys will attempt to move across the text just as expected.
+- Use arrow keys to navigate the inputs and type over any of them to override the default value.
+- Enter will just attempt to login.
+- If you are focused on an edited input, horizontal arrow keys will attempt to move across the text just as expected.
 
 On top of that:
 
-* Using the horizontal arrow keys if the focused input is not in text mode or the movement would overflow the input. It will try to change in such direction the option of session or the user.
-* Pressing <kbd>ESC</kbd> and then horizontal arrows will force to change the option of the focused input even if it's in edit mode.
-* Editing an option on a user or a shell session will put you in edit mode appending after the original value.
+- Using the horizontal arrow keys if the focused input is not in text mode or the movement would overflow the input. It will try to change in such direction the option of session or the user.
+- Pressing <kbd>ESC</kbd> and then horizontal arrows will force to change the option of the focused input even if it's in edit mode.
+- Editing an option on a user or a shell session will put you in edit mode appending after the original value.
 
 # Requirements
 
-* Make (Also optional, but does things automatically, make sure `gcc` and `mkdir -p` work as expected).
-* A compiler like `cc`, `gcc` or `clang`. Make sure to use the desired `CC=<compiler>` on the `make` command.
-* PAM library, used for user authentication, just what `login` or `su` use internally. Don't worry, it's surely pre-installed.
+- Make (Also optional, but does things automatically, make sure `gcc` and `mkdir -p` work as expected).
+- A compiler like `cc`, `gcc` or `clang`. Make sure to use the desired `CC=<compiler>` on the `make` command.
+- PAM library, used for user authentication, just what `login` or `su` use internally. Don't worry, it's surely pre-installed.
 
 # Installation
 
-Check the [installation guide](INSTALL.md) to use your preferred installation source.
+Check the [installation guide](./docs/INSTALL.md) to use your preferred installation source.
+
+<details>
+
+<summary>Packagers read here!!</summary>
+
+If you are a package maintainer or are willing to become one, please read [the packagers guide](./docs/PACKAGERS.md).
+
+</details>
 
 # Configuring
 
@@ -90,6 +106,12 @@ Colors are gonna be put inside `\x1b[...m`, if you don't know what this is check
 > [!TIP]
 > If you don't like seeing an element, you can change the fg color of it to be the same as the bg, making it invisible.
 
+# PAM
+
+If your distribution does not use the standard PAM service name `login` (`/etc/pam.d/login`) for its PAM services or if you want to use another PAM file, simply set the `LIDM_PAM_SERVICE` env variable to your PAM service name.
+
+When the env variable is empty it defaults to the `login` PAM service or whatever fallback your distribution packager has defined during compilation.
+
 # Contributing
 
 If you want to contribute check the [contribution guide](docs/CONTRIBUTING.md).
@@ -102,21 +124,21 @@ For this reason the project's philosophy is to be simple and minimal, such that
 
 I forgot what exactly the name came from, but it surely was a mix of a few things so:
 
-* Obviously it's inspired by `ly`. `ly-dm` leads to "lydm".
-* Wow make "lydm" simple with a "y" → "i" transformation.
-* Associate it with the "i" in s**i**mple and other display managers like **Li**ghtDM.
-* And the **la**ptop this project started in has a **lid**.
+- Obviously it's inspired by `ly`. `ly-dm` leads to "lydm".
+- Wow make "lydm" simple with a "y" → "i" transformation.
+- Associate it with the "i" in s**i**mple and other display managers like **Li**ghtDM.
+- And the **la**ptop this project started in has a **lid**.
 
 # Contributors
 
-[![GitHub Contributors](https://contrib.rocks/image?repo=javalsai/lidm\&max=20)](https://github.com/javalsai/lidm/graphs/contributors)
+[![GitHub Contributors](https://contrib.rocks/image?repo=javalsai/lidm&max=20)](https://github.com/javalsai/lidm/graphs/contributors)
 
 [killertofus](https://github.com/killertofus), [deadvey](https://github.com/deadvey), [grialion](https://github.com/grialion/), cerealexperiments\_, [antiz96](https://github.com/Antiz96), [rmntgx](https://github.com/rmntgx) and [more...](https://github.com/javalsai/lidm/graphs/contributors)
 
 With their big or small contributions, every commit has helped in its own way and encouraged me to keep putting my soul into this.
 
-***
+---
 
 🌟 Finally, consider starring this repo [or...](https://www.reddit.com/r/github/comments/1l2mchg/is_this_allowed) 🔪
 
-![star-history](https://api.star-history.com/svg?repos=javalsai/lidm\&type=Date)
+![star-history](https://api.star-history.com/svg?repos=javalsai/lidm&type=Date)

aaaa/etc/sv/lidm/conf

@@ -1,5 +0,0 @@
-BAUD_RATE=38400
-TERM_NAME=linux
-
-TTY=tty7
-EXEC_PATH=/bin/lidm

aaaa/etc/sv/lidm/finish

@@ -1,5 +0,0 @@
-#!/bin/sh
-
-[ -r conf ] && . ./conf
-
-exec utmpset -w $TTY

aaaa/etc/sv/lidm/run

@@ -1,15 +0,0 @@
-#!/bin/sh
-
-[ -r conf ] && . ./conf
-
-if [ -x /sbin/getty -o -x /bin/getty ]; then
-	# busybox
-	GETTY=getty
-elif [ -x /sbin/agetty -o -x /bin/agetty ]; then
-	# util-linux
-	GETTY=agetty
-fi
-
-exec setsid ${GETTY} ${GETTY_ARGS} \
-	"${TTY}" "${TERM_NAME}" \
-	-n -l "${EXEC_PATH}" -o 7

assets/github_scripts/build.sh

@@ -13,8 +13,9 @@ make -j"$(nproc)" "$@" 2> /tmp/stderr || ERR=$?
 BSIZE=$(stat --printf="%s" lidm)
 HSIZE=$(numfmt --to=iec-i<<<"$BSIZE")B
 WARNS=$(
-  { grep -E '^[^ ]+\.[ch]:[0-9]+:[0-9]+: [a-z]+:' /tmp/stderr || :; } \
-  | sed -E 's/^([^ ]+\.[ch]):([0-9]+):([0-9]+): ([a-z]+): (.*)$/::\4 file=\1,line=\2,col=\3::\5/'
+  sed -nE \
+      's/^([^ ]+\.[ch]):([0-9]+):([0-9]+): ([a-z]+): (.*)$/::\4 file=\1,line=\2,col=\3::\5/p' \
+      /tmp/stderr
 )
 WARNS_NUM=$({ [[ "$WARNS" == "" ]] && echo 0; } || wc -l <<<"$WARNS")
 

assets/pkg/aur/README.md

@@ -4,9 +4,9 @@ These files are just for reference, I'll manually edit and publish them, at leas
 
 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)
+- [`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).

assets/pkg/aur/lidm-bin/.SRCINFO

@@ -1,20 +1,32 @@
 pkgbase = lidm-bin
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (release binary)
-	pkgver = 1.2.0
-	pkgrel = 1
+	pkgver = 1.2.3
+	pkgrel = 3
 	url = https://github.com/javalsai/lidm
 	arch = x86_64
+	arch = i686
+	arch = aarch64
+	arch = armv7h
+	arch = riscv64
 	license = GPL
-	depends = pam
+	depends = libpam.so
 	provides = lidm
 	conflicts = lidm
-	source = lidm::https://github.com/javalsai/lidm/releases/download/v1.2.0/lidm-amd64
-	source = default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/themes/default.ini
-	source = lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/assets/man/lidm.1
-	source = lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v1.2.0/assets/man/lidm-config.5
-	sha256sums = 6bf4403c21bd26607302d99d7bd1a129822e7d2506e949fb483ea445e022eb6d
+	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

assets/pkg/aur/lidm-bin/PKGBUILD

@@ -1,29 +1,39 @@
-# shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
+# shellcheck disable=SC2034,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-bin
-pkgver=1.2.0
-pkgrel=1
-depends=('pam')
+pkgver=1.2.3
+pkgrel=3
+depends=('libpam.so')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (release binary)"
-arch=('x86_64')
+arch=('x86_64' 'i686' 'aarch64' 'armv7h' 'riscv64')
 url="https://github.com/javalsai/lidm"
 license=('GPL')
 provides=('lidm')
 conflicts=('lidm')
 source=(
-    "lidm::$url/releases/download/v$pkgver/lidm-amd64"
-    "default-theme.ini::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/themes/default.ini"
-    "lidm.1::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm.1"
-    "lidm-config.5::https://raw.githubusercontent.com/javalsai/lidm/v$pkgver/assets/man/lidm-config.5"
+    "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"
 )
-sha256sums=('6bf4403c21bd26607302d99d7bd1a129822e7d2506e949fb483ea445e022eb6d'
-            'ffaa5fe2cf5011bf53c90f81bfec8585158d35f72c0666db0bd4d3866ae041ca'
+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() {
-    install -Dm755 lidm "${pkgdir}/usr/bin/lidm"
-    install -Dm644 default-theme.ini "${pkgdir}/etc/lidm.ini"
-    install -Dm644 lidm.1 "${pkgdir}/usr/share/man/man1/lidm.1"
-    install -Dm644 lidm-config.5 "${pkgdir}/usr/share/man/man5/lidm-config.5"
+    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"
 }

assets/pkg/aur/lidm-git/.SRCINFO

@@ -1,13 +1,11 @@
 pkgbase = lidm-git
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (last git commit)
-	pkgver = 0.1.0.r0.g8071694
-	pkgrel = 1
+	pkgver = 1.2.3.r3.g363deea
+	pkgrel = 3
 	url = https://github.com/javalsai/lidm
 	arch = any
 	license = GPL
 	makedepends = git
-	makedepends = make
-	makedepends = gcc
 	depends = pam
 	provides = lidm
 	conflicts = lidm

assets/pkg/aur/lidm-git/PKGBUILD

@@ -1,10 +1,10 @@
-# shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
+# shellcheck disable=SC2034,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm-git
-pkgver=1.2.0.r0.g7f75b8e
-pkgrel=1
+pkgver=1.2.3.r3.g363deea
+pkgrel=3
 depends=('pam')
-makedepends=('git' 'make' 'gcc')
+makedepends=('git')
 pkgdesc="A fully colorful customizable TUI display manager made in C. (last git commit)"
 arch=('any')
 url="https://github.com/javalsai/lidm"
@@ -15,17 +15,17 @@ source=("lidm::git+https://github.com/javalsai/lidm")
 sha256sums=('SKIP')
 
 pkgver() {
-    cd "lidm"
+    cd "$srcdir/lidm"
     git describe --long --abbrev=7 --tags | \
         sed 's/^v//;s/\([^-]*-g\)/r\1/;s/-/./g'
 }
 
 build() {
-    cd "lidm"
-    make CFLAGS="-O3"
+    cd "$srcdir/lidm"
+    make
 }
 
 package() {
-    cd "lidm"
-    make install DESTDIR="${pkgdir}"
+    cd "$srcdir/lidm"
+    make DESTDIR="${pkgdir}" install
 }

assets/pkg/aur/lidm/.SRCINFO

@@ -1,14 +1,12 @@
 pkgbase = lidm
 	pkgdesc = A fully colorful customizable TUI display manager made in C. (build latest tag)
-	pkgver = 1.2.0
-	pkgrel = 1
+	pkgver = 1.2.3
+	pkgrel = 3
 	url = https://github.com/javalsai/lidm
 	arch = any
 	license = GPL
-	makedepends = git
-	makedepends = gcc
 	depends = pam
-	source = tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.0.tar.gz
-	sha256sums = 0dffded5fcef45cb45fe88358b0cba8de04f614e323a9c6e4162f84b6e3a50b6
+	source = lidm-1.2.3.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v1.2.3.tar.gz
+	sha256sums = 1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93
 
 pkgname = lidm

assets/pkg/aur/lidm/PKGBUILD

@@ -1,25 +1,21 @@
-# shellcheck disable=SC2034,SC2148,SC2128,SC2154,SC2164
+# shellcheck disable=SC2034,SC2154,SC2164
 # Maintainer: javalsai <javalsai@proton.me>
 pkgname=lidm
-pkgver=1.2.0
-pkgrel=1
+pkgver=1.2.3
+pkgrel=3
 depends=('pam')
-makedepends=('git' 'gcc')
+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')
-source=("tarball.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
-sha256sums=('0dffded5fcef45cb45fe88358b0cba8de04f614e323a9c6e4162f84b6e3a50b6')
+source=("${pkgname}-${pkgver}.tar.gz::https://github.com/javalsai/lidm/archive/refs/tags/v$pkgver.tar.gz")
+sha256sums=('1ce414b510c5bbc3e32ea882f915b4d3958cb82eb1fbb5cf33e62f69c844bf93')
 
 build() {
-    tar -xzf "tarball.tar.gz"
-    cd "lidm-$pkgver"
-
-    make CFLAGS="-O3"
+    make -C "$srcdir/lidm-$pkgver"
 }
 
 package() {
-    cd "lidm-$pkgver"
-    make install DESTDIR="${pkgdir}"
+    make -C "$srcdir/lidm-$pkgver" DESTDIR="$pkgdir" install
 }

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})
+
+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

assets/pkg/aur/test-makepkg.sh

@@ -4,18 +4,19 @@ set -e
 MYSELF=$(realpath "$0")
 MYDIR=$(dirname "$MYSELF")
 
-for pkg in "$MYDIR"/*/; do
-    printf "\x1b[1mEntering '%s'\x1b[0m\n" "$pkg"
+cd "$MYDIR"
+typeset -a pkgs=(lidm{,-git,-bin})
+
+for pkg in "${pkgs[@]}"; do
+    printf "\x1b[mEntering '%s'\x1b[0m\n" "$pkg"
     cd "$pkg"
-
-    # shellcheck disable=SC1091
-    source "PKGBUILD"
-    for source in "${source[@]}"; do
-        awk -F'::' '{print $1}' <<<"$source" | xargs rm -rf
-    done
-
-    rm -rf ./*.{gz,zst} src pkg
-    makepkg -f .
-
+    makepkg -Cf
+    cd ..
     echo
 done
+
+if [[ -n "${PRINT_TREE:-}" ]]; then
+    for pkg in "${pkgs[@]}"; do
+        eza --tree "$pkg/pkg/"*
+    done
+fi

assets/pkg/aur/update-pkgs.sh

@@ -17,12 +17,6 @@ for pkg in "$MYDIR"/lidm{,-bin}/; do
     sed -i "s/pkgver=.*/pkgver=$1/" PKGBUILD
     sed -i "s/pkgrel=.*/pkgrel=1/" PKGBUILD
 
-    grep 'source = ' <.SRCINFO | awk -F'= |::' '{print $2}' | \
-    while read -r srcfile; do
-        printf "\x1b[31mDeleting '%s'\x1b[0m\n" "$srcfile"
-        rm -f "$srcfile"
-    done
-
     updpkgsums
     makepkg --printsrcinfo | tee .SRCINFO
     echo

assets/pkg/nix/get-cfg-file.nix

@@ -0,0 +1,23 @@
+{
+  cfg,
+  src,
+  lib,
+  ...
+}:
+let
+  maker = import ./make-cfg.nix {
+    inherit lib;
+    keys-h-file = builtins.readFile "${src}/include/keys.h";
+  };
+in
+{
+  inherit maker;
+  file = builtins.toFile "lidm.conf" (
+    if builtins.isString cfg then
+      builtins.readFile "${src}/themes/${cfg}.ini"
+    else if builtins.isAttrs cfg then
+      maker.make cfg
+    else
+      builtins.throw "invalid cfg type, expected str or attrs"
+  );
+}

assets/pkg/nix/lidm.nix

@@ -0,0 +1,50 @@
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
+let
+  get-cfg =
+    if config.cfg != null then
+      import ./get-cfg-file.nix {
+        inherit lib;
+        inherit (config) cfg src;
+      }
+    else
+      null;
+  cfg-file = get-cfg.file;
+  maker = get-cfg.maker;
+in
+pkgs.stdenv.mkDerivation rec {
+  pname = "lidm";
+  version = config.version;
+  src = config.src;
+
+  nativeBuildInputs = with pkgs; [
+    gcc
+    gnumake
+    linux-pam
+  ];
+
+  makeFlags =
+    [
+      "DESTDIR=$(out)"
+      "PREFIX="
+    ]
+    ++ lib.optional (
+      config.xsessions != null
+    ) "CPPFLAGS+=-DSESSIONS_XSESSIONS=\\\"${config.xsessions}\\\""
+    ++ lib.optional (
+      config.wayland-sessions != null
+    ) "CPPFLAGS+=-DSESSIONS_WAYLAND=\\\"${config.wayland-sessions}\\\""
+    ++ lib.optional (cfg-file != null) "CPPFLAGS+=-DLIDM_CONF_PATH=\\\"${cfg-file}\\\"";
+
+  fixupPhase = ''
+    rm -rf $out/etc
+  '';
+
+  passthru = {
+    keysEnum = maker.keys-enum;
+  };
+}

assets/pkg/nix/make-cfg.nix

@@ -0,0 +1,73 @@
+{ lib, keys-h-file }:
+
+let
+  double-match-to-nameval = dmatch: {
+    name = builtins.elemAt dmatch 0;
+    value = builtins.elemAt dmatch 1;
+  };
+
+  keys-enum =
+    let
+      key-names = builtins.replaceStrings [ "\n" " " ] [ "" "" ] (
+        builtins.elemAt (builtins.match ".*KEY_NAMES\\[][[:blank:]]*=[[:blank:]]*\\{([^}]*)}.*" keys-h-file) 0
+      );
+
+      keys-2d-list = builtins.map (builtins.match "\\[(.*)]=\"(.*)\"") (
+        builtins.filter (s: builtins.isString s && s != "") (builtins.split "," key-names)
+      );
+
+    in
+    builtins.listToAttrs (
+      builtins.map (
+        k:
+        k
+        // {
+          value = {
+            __enum_key = k.value;
+          };
+        }
+      ) (builtins.map double-match-to-nameval keys-2d-list)
+    );
+in
+{
+  inherit keys-enum;
+  make =
+    let
+      name-val-to-attrs = (name: value: { inherit name value; });
+      map-attrs = attrset: fn: lib.map fn (lib.attrsets.mapAttrsToList name-val-to-attrs attrset);
+
+      try-foldl' =
+        op: nul: list:
+        if (builtins.length list) == 0 then "" else builtins.foldl' op nul list;
+      concat-with = sepr: list: try-foldl' (x: y: if x == null then y else x + sepr + y) null list;
+
+      ser-bool = bool: if bool then "true" else "false";
+      ser-str = str: "\"${builtins.replaceStrings [ "\n" "\"" ] [ "\\n" "\\\"" ] str}\"";
+      ser-kvs =
+        { name, value }:
+        if builtins.isList value then
+          concat-with "\n" (builtins.map (value: ser-kvs { inherit name value; }) value)
+        else
+          "${name} = ${
+            if builtins.isString value then
+              ser-str value
+            else if builtins.isInt value then
+              builtins.toString value
+            else if builtins.isBool value then
+              ser-bool value
+            else if builtins.isAttrs value then
+              value.__enum_key
+            else
+              builtins.throw "type not supported"
+          }";
+
+      ser-table =
+        table':
+        let
+          tname = table'.name;
+          table = table'.value;
+        in
+        "[${tname}]\n" + (concat-with "\n" (map-attrs table ser-kvs));
+    in
+    cfg: concat-with "\n\n" (map-attrs cfg ser-table);
+}

assets/pkg/nix/module.nix

@@ -0,0 +1,73 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+
+let
+  cfg = config.services.lidm;
+
+  dmcfg = config.services.displayManager;
+  desktops = dmcfg.sessionData.desktops;
+
+  version = "1.2.3";
+  lidmPkg = pkgs.callPackage ./lidm.nix {
+    inherit pkgs;
+    config = {
+      inherit version lib;
+      cfg = cfg.config;
+      src = pkgs.fetchFromGitHub {
+        owner = "javalsai";
+        repo = "lidm";
+        rev = "v${version}";
+        sha256 = "sha256-eKgBoh+bRcl2Y7oOxW77Kjtb9Ws2Xln1SenknIsGxD4=";
+      };
+
+      xsessions = "${desktops}/share/xsessions";
+      wayland-sessions = "${desktops}/share/wayland-sessions";
+    };
+  };
+in
+{
+  options = {
+    lidm.keysEnum = lib.mkOption {
+      type = with lib.types; attrs;
+      default = lidm.passthru.keysEnum;
+      readOnly = true;
+      description = "Keys enum constants";
+    };
+    services.lidm.config = lib.mkOption {
+      type =
+        with lib.types;
+        oneOf [
+          str
+          attrs
+        ];
+      default = { };
+      description = "Config options for lidm | Either attr tree or name of bundled themes";
+    };
+  };
+  config = {
+    services.displayManager.defaultSession = "lidm";
+
+    systemd.services.lidm = {
+      description = "TUI display manager";
+      aliases = [ "display-manager.service" ];
+      after = [
+        "systemd-user-sessions.service"
+        "plymouth-quit-wait.service"
+      ];
+      serviceConfig = {
+        Type = "idle";
+        ExecStart = "${lidmPkg}/bin/lidm 7";
+        StandardInput = "tty";
+        StandardOutput = "tty";
+        StandardError = "tty";
+        TTYPath = "/dev/tty7";
+        TTYReset = "yes";
+        TTYVHangup = "yes";
+      };
+    };
+  };
+}

assets/services/README.md

@@ -13,30 +13,30 @@ The manual steps for installation are:
 
 ## Systemd
 
-* Copy `systemd.service` to `/etc/systemd/system/lidm.service`
-* To enable it you can run `systemctl enable lidm`
+- Copy `systemd.service` to `/etc/systemd/system/lidm.service`
+- To enable it you can run `systemctl enable lidm`
 
 ## Dinit
 
-* Copy `dinit` to `/etc/dinit.d/lidm`
-* To enable it, run `dinitctl enable lidm`
+- Copy `dinit` to `/etc/dinit.d/lidm`
+- To enable it, run `dinitctl enable lidm`
 
 ## Runit
 
-* Copy `runit/` to `/etc/runit/sv/lidm/`
-* Add the service with `ln -s /etc/runit/sv/lidm /run/runit/service`
-* And to enable it `sv enable lidm`
+- Copy `runit/` to `/etc/runit/sv/lidm/`
+- Add the service with `ln -s /etc/runit/sv/lidm /run/runit/service`
+- And to enable it `sv enable lidm`
 
 ## OpenRC
 
-* Copy `openrc` to `/etc/init.d/lidm`
-* Enable the service with `rc-update add lidm`
+- Copy `openrc` to `/etc/init.d/lidm`
+- Enable the service with `rc-update add lidm`
 
 ## S6
 
-* Copy `s6/` to `/etc/s6/sv/lidm/`
-* Add the service with `s6-service add default lidm`
-* Reload the database with `s6-db-reload` (you might have to run this every time the service file changes)
+- Copy `s6/` to `/etc/s6/sv/lidm/`
+- Add the service with `s6-service add default lidm`
+- Reload the database with `s6-db-reload` (you might have to run this every time the service file changes)
 
 > [!WARNING]
 > Make sure to disable any other service that might run on tty7, such us lightdm or most display managers out there.

assets/services/systemd.service

@@ -5,9 +5,9 @@ After=systemd-user-sessions.service plymouth-quit-wait.service
 [Service]
 Type=idle
 ExecStart=/usr/bin/lidm 7
-StandardError=journal
 StandardInput=tty
 StandardOutput=tty
+StandardError=tty
 TTYPath=/dev/tty7
 TTYReset=yes
 TTYVHangup=yes

docs/CONTRIBUTING.md

@@ -2,9 +2,10 @@
 
 Contributions are welcome! Here's how you can help:
 
-* [Contributing code](#code)
-* [Reporting issues](#issues)
-* [Other](#other)
+- [Contributing](#contributing)
+  - [Code](#code)
+  - [Issues](#issues)
+  - [Other](#other)
 
 ## Code
 
@@ -12,33 +13,33 @@ For small fixes or incremental improvements simply fork the repo and follow the
 
 1. [Fork](https://help.github.com/articles/fork-a-repo/) the repository and [clone](https://help.github.com/articles/cloning-a-repository/) your fork.
 
-2. Start coding! (it might be helpful to read a [quide on the project structure and conventions](structure.md) before this)
-   * Configure clangd LSP by generating `compile_commands.json` (e.g. `bear -- make` or `compiledb make`)
-   * Implement your feature.
-   * Check your code works as expected.
-   * Run the code formatter: `clang-format -i $(git ls-files "*.c" "*.h")`
-   * Run the code linter: `clang-tidy -p . $(git ls-files "*.c" "*.h")`. Some checks are pretty pedantic, feel free to ignore or debate some of the rules.
-   * If you prefer, you can run `make pre-commit` to run several code style checks like the avobe along a few extra stuff.
+2. Start coding! (it might be helpful to read a [quide on the project structure and conventions](./structure.md) before this)
+   - Configure clangd LSP by generating `compile_commands.json` (e.g. `bear -- make` or `compiledb make`)
+   - Implement your feature.
+   - Check your code works as expected.
+   - Run the code formatter: `clang-format -i $(git ls-files "*.c" "*.h")`.
+   - Run the code linter: `clang-tidy -p . $(git ls-files "*.c" "*.h")`. Some checks are pretty pedantic, feel free to ignore or debate some of the rules.
+   - If you prefer, you can run `make pre-commit` to run several code style checks like the above along a few extra stuff (shellcheck, spellcheck, prettier, etc).
 
 3. Commit your changes to a new branch (not `master`, one change per branch) and push it:
-   * Commit messages should:
-     * Header line: explain the commit in one line (use the imperative) ("feat" for features, "fix", "style", "chore", "docs", etc)
-     * Be descriptive.
-     * Don't make the title too long and add commit descriptions if you think the changes need it.
-     * e.g. "feat: add support for X", "fix(config): config parser segfaulting", "docs(typo): fix a typo in README.md"
+   - Commit messages should:
+     - Header line: explain the commit in one line (use the imperative) ("feat" for features, "fix", "style", "chore", "docs", etc)
+     - Be descriptive.
+     - Don't make the title too long and add commit descriptions if you think the changes need it.
+     - e.g. "feat: add support for X", "fix(config): config parser segfaulting", "docs(typo): fix a typo in README.md"
 
 4. Once you are happy with your changes, submit a pull request.
-   * Open the pull request.
-   * Add a short description explaining what you've done (or if it's a work-in-progress - what you need to do)
+   - Open the pull request.
+   - Add a short description explaining what you've done (or if it's a work-in-progress - what you need to do)
 
 ## Issues
 
 1. Do a quick search on GitHub to check if the issue has already been reported.
 2. [Open an issue](https://github.com//javalsai/lidm/issues/new) and describe the issue you are having - you could include:
-   * Screenshots.
-   * Ways to reproduce the issue.
-   * Your lidm version.
-   * Your platform (e.g. arch linux or Ubuntu 15.04 x64) and init system if you know.
+   - Screenshots.
+   - Ways to reproduce the issue.
+   - Your lidm version.
+   - Your platform (e.g. arch linux or Ubuntu 15.04 x64) and init system if you know.
 
 After reporting you should aim to answer questions or clarifications as this helps pinpoint the cause of the issue.
 

docs/INSTALL.md

@@ -1,9 +1,9 @@
-# Index
+# Table of Contents
 
-- [Index](#index)
 - [Installing from Source](#installing-from-source)
 - [AUR](#aur)
 - [Nix Flake](#nix-flake)
+- [Nix Module](#nix-module)
 
 > [!CAUTION]
 > I encourage you to read the manual installation steps to understand what will get installed in your computer by this package.
@@ -29,7 +29,7 @@ Then you can install the files onto your filesystem with:
 make install
 ```
 
-And additionally, to install service files (start-up behavior). <sup>[more docs](./assets/services/README.md)</sup>
+And additionally, to install service files (start-up behavior). <sup>[more docs](../assets/services/README.md)</sup>
 
 ```sh
 # automatically detects your init system
@@ -52,10 +52,10 @@ make install-service-s6-etc # s6 (/etc/s6/sv)
 
 # AUR
 
-[AUR packages](https://aur.archlinux.org/packages?K=lidm\&SeB=n) will automatically install most files.
+[AUR packages](https://aur.archlinux.org/packages?K=lidm&SeB=n) will automatically install most files.
 
 > [!CAUTION]
-> [service files](./assets/pkg/aur#services) have to be manually installed by now.
+> [service files](../assets/pkg/aur#services) have to be manually installed by now.
 
 # Nix Flake
 
@@ -72,4 +72,57 @@ nix run github:javalsai/lidm
 ```
 
 > [!CAUTION]
-> This doesn't include [service files](./assets/pkg/aur#services) neither
+> This doesn't include [service files](../assets/pkg/aur#services) neither
+
+# Nix Module
+
+<details>
+<summary>Sidenote</summary>
+
+The nix module lacks on several aspects, if you know much about nix and know
+how to improve this package, feel free to open an issue or a PR to help. The
+nix package maintainer position is open too.
+
+</details>
+
+Lidm includes a nix module in `assets/pkg/nix/module.nix` that you can add
+(along the included nix files) and import in your `configuration.nix`.
+
+Once imported you'll need to add:
+
+```nix
+services.displayManager.enable = true;
+systemd.services.lidm.enable = true;
+```
+
+Optionally, you can configure it setting `services.lidm.config`. You can either
+pass:
+
+- A string to copy the config from a theme in `themes/` with said name
+  (**name**, e.g `"cherry"`).
+- An attribute tree with the same names as the config file, e.g:
+
+```nix
+with config.lidm.keysEnum; {
+    strings = {
+        f_poweroff = "custom_poweroff";
+    };
+
+    behavior = {
+        include_defshell = true;
+        source = [
+            "path1"
+            "path2"
+        ];
+    };
+
+    functions = { poweroff = F1; };
+
+    # etc...
+};
+```
+
+> _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

docs/PACKAGERS.md

@@ -0,0 +1,73 @@
+This is a guide listing all possible options packagers have to tweak behavior of lidm and the extra stuff to package.
+
+# Components
+
+If you want to package lidm for a distribution you have to package the binary and:
+
+- Man pages ([`../assets/man/`](../assets/man/))
+- Service files ([`../assets/services/`](../assets/services/))
+- PAM (see [#preprocessor-defines](#preprocessor-defines))
+- And optionally you can include some default themes in `/usr` ([`../themes/`](../themes/))
+
+# Preprocessor Defines
+
+Most of the behavior that can be tweaked using preprocessor `#define`s, to include some simply add `CPPFLAGS+='-D{{name}}={{value}}'` to your `make` command. e.g:
+
+```sh
+make \
+    CPPFLAGS+='-DSESSIONS_XSESSIONS=\"/var/empty\"' \
+    CPPFLAGS+='-DSESSIONS_WAYLAND=\"/var/empty\"'
+```
+
+The list of possible `#define`s is:
+
+| Name                   | Default                         | Description                                                                | Env Override?            |
+| ---------------------- | ------------------------------- | -------------------------------------------------------------------------- | ------------------------ |
+| `PAM_SERVICE_FALLBACK` | `"login"`                       | Name of the default PAM module to use. Defaults to the distro's `"login"`. | Yes (`LIDM_PAM_SERVICE`) |
+| `SESSIONS_XSESSIONS`   | `"/usr/share/xsessions"`        |                                                                            | No                       |
+| `SESSIONS_WAYLAND`     | `"/usr/share/wayland-sessions"` |                                                                            | No                       |
+| `LIDM_CONF_PATH`       | `"/etc/lidm.ini"`               | Path of the default configuration.                                         | Yes (`LIDM_CONF`)        |
+
+# Other Build Settings
+
+## Compiler
+
+Lidm attempts to support being built by `gcc` and `clang` with preference over the first. However, if you wish to take advantage of LLVM's optimizations over GNU's you can change the compiler with `make CC=clang` or try any other compiler.
+
+## Compiler Flags
+
+Compiler flags should be passed with `CFLAGS`, its `-O3 -Wall` by default so adding anything will overwrite this.
+
+## Build Metadata
+
+`lidm -v` outputs some information about the build version, this can be weaked with `INFO_GIT_REV` and `INFO_BUILD_TS`, by default they are:
+
+```make
+INFO_GIT_REV?=$$(git describe --long --tags --always || echo '?')
+INFO_BUILD_TS?=$$(date +%s)
+```
+
+But this can be changed by just passing those env variables, for example, in the case git is not applicable in the build environment of the package.
+
+## Target Directory
+
+`DESTDIR` can be used to for installation recipes to install on alternative root directories. Along with `PREFIX` (defaults to `/usr`) for systems which don't use the common `/usr` structure. e.g. `make install DESTDIR=$out PREFIX=`
+
+```txt
+$ fd -t f . --base-directory $out
+bin/lidm
+etc/lidm.ini
+share/man/man1/lidm.1
+share/man/man5/lidm-config.5
+```
+
+# Build Recipes for Packaging
+
+To ease most of the installation process there's several `make` recipes to install man pages and service files, I encpurage you to check their source yourself, but:
+
+- `make` / `make lidm`: Builds the app binary.
+- `make install`: Attempts to install the binary, place a default config file in `/etc/lidm.ini` and install the man pages.
+- `make install-service-(systemd|dinit|runit|openrc|s6)(|-etc)`: Just check the source, service files for different init systems and `-etc` variants for alternative paths.
+- `make print-version`: Outputs the current version in the `Makefile` for scripts that might want to extract that info.
+
+You can choose to use these packages or create your own service files / etc. There's are merely suggestions on what to use.

flake.lock

@@ -5,11 +5,11 @@
         "systems": "systems"
       },
       "locked": {
-        "lastModified": 1710146030,
-        "narHash": "sha256-SZ5L6eA7HJ/nmkzGG7/ISclqe6oZdOZTNoesiInkXPQ=",
+        "lastModified": 1731533236,
+        "narHash": "sha256-l0KFg5HjrsfsO/JpG+r7fRrqm12kzFHyUHqHCVpMMbI=",
         "owner": "numtide",
         "repo": "flake-utils",
-        "rev": "b1d9ab70662946ef0850d488da1c9019f3a9752a",
+        "rev": "11707dc2f618dd54ca8739b309ec4fc024de578b",
         "type": "github"
       },
       "original": {
@@ -20,11 +20,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1724224976,
-        "narHash": "sha256-Z/ELQhrSd7bMzTO8r7NZgi9g5emh+aRKoCdaAv5fiO0=",
+        "lastModified": 1751637120,
+        "narHash": "sha256-xVNy/XopSfIG9c46nRmPaKfH1Gn/56vQ8++xWA8itO4=",
         "owner": "nixos",
         "repo": "nixpkgs",
-        "rev": "c374d94f1536013ca8e92341b540eba4c22f9c62",
+        "rev": "5c724ed1388e53cc231ed98330a60eb2f7be4be3",
         "type": "github"
       },
       "original": {

flake.nix

@@ -1,46 +1,46 @@
 {
+  description = "A ✨fully✨ colorful customizable TUI display manager made in C for simplicity.";
+
   inputs = {
     flake-utils.url = "github:numtide/flake-utils";
     nixpkgs.url = "github:nixos/nixpkgs?ref=nixos-unstable";
   };
+
   outputs =
-    { flake-utils, nixpkgs, ... }:
+    {
+      flake-utils,
+      nixpkgs,
+      self,
+    }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = import nixpkgs { inherit system; };
 
         name = "lidm";
-        version = "0.0.2";
-
-        lidm = (
-          pkgs.stdenv.mkDerivation {
-            pname = name;
-            version = version;
+        version = builtins.elemAt (builtins.match "VERSION[[:blank:]]*=[[:space:]]*([^\n]*)\n.*" (builtins.readFile ./Makefile)) 0;
 
+        lidm = pkgs.callPackage assets/pkg/nix/lidm.nix {
+          inherit pkgs;
+          lib = pkgs.lib;
+          config = {
+            inherit version;
             src = ./.;
-
-            nativeBuildInputs = with pkgs; [
-              gcc
-              gnumake
-              linux-pam
-            ];
-
-            makeFlags = [
-              "DESTDIR=$(out)"
-              "PREFIX="
-            ];
-
-            fixupPhase = ''
-              rm -rf $out/etc
-            '';
-          }
-        );
+            xsessions = null;
+            wayland-sessions = null;
+            cfg = null;
+            # cfg = "cherry";
+          };
+        };
       in
       rec {
         defaultApp = flake-utils.lib.mkApp { drv = defaultPackage; };
         defaultPackage = lidm;
         devShell = pkgs.mkShell { buildInputs = lidm.nativeBuildInputs ++ [ pkgs.clang-tools ]; };
+        formatter = nixpkgs.legacyPackages.${system}.nixfmt-tree;
       }
-    );
+    )
+    // {
+      nixosModules.lidm = assets/pkg/nix/module.nix;
+    };
 }

include/log.h

@@ -3,10 +3,12 @@
 
 #include <stdio.h>
 
-void log_init(FILE* fd);
-void log_puts(const char* msg);
-void log_printf(const char* fmt, ...);
+#include "macros.h"
+
+void log_init(FILE* NNULLABLE fd);
+void log_puts(const char* NNULLABLE msg);
+void log_printf(const char* NNULLABLE fmt, ...);
 // NOLINTNEXTLINE(readability-identifier-length)
-void log_perror(const char* s);
+void log_perror(const char* NNULLABLE s);
 
 #endif

include/macros.h

@@ -1,6 +1,11 @@
 #ifndef MACROSH_
 #define MACROSH_
 
+// More like constants but I'm not making yet another header file just for this
+#ifndef LIDM_CONF_PATH
+  #define LIDM_CONF_PATH "/etc/lidm.ini"
+#endif
+
 // Do we just replace the compiler with clang??
 #if defined(__clang__)
   #define NULLABLE _Nullable

include/util.h

@@ -1,11 +1,11 @@
 #ifndef UTILH_
 #define UTILH_
 
-#include <bits/types/struct_timeval.h>
 #include <stdbool.h>
 #include <stddef.h>
 #include <stdint.h>
 #include <stdio.h>
+#include <sys/time.h>
 #include <sys/types.h>
 
 #include "keys.h"
@@ -19,6 +19,7 @@ bool read_press_nb(u_char* length, char* out, struct timeval* tv);
 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);

src/auth.c

@@ -35,6 +35,10 @@ int pam_conversation(int num_msg, const struct pam_message** msg,
   return PAM_SUCCESS;
 }
 
+#ifndef PAM_SERVICE_FALLBACK
+  #define PAM_SERVICE_FALLBACK "login"
+#endif
+
 #define CHECK_PAM_RET(call) \
   ret = (call);             \
   if (ret != PAM_SUCCESS) { \
@@ -51,7 +55,11 @@ pam_handle_t* get_pamh(char* user, char* passwd) {
   struct pam_conv pamc = {pam_conversation, (void*)passwd};
   int ret;
 
-  CHECK_PAM_RET(pam_start("login", user, &pamc, &pamh))
+  char* pam_service_override = getenv("LIDM_PAM_SERVICE");
+  char* pam_service_name =
+      pam_service_override ? pam_service_override : PAM_SERVICE_FALLBACK;
+
+  CHECK_PAM_RET(pam_start(pam_service_name, user, &pamc, &pamh))
   CHECK_PAM_RET(pam_authenticate(pamh, 0))
   CHECK_PAM_RET(pam_acct_mgmt(pamh, 0))
   CHECK_PAM_RET(pam_setcred(pamh, PAM_ESTABLISH_CRED))
@@ -245,7 +253,7 @@ bool launch(char* user, char* passwd, struct session session, void (*cb)(void),
     perror("execl error");
     (void)fputs("failure calling session\n", stderr);
   } else {
-    __pid_t child_pid = (__pid_t)pid;
+    pid_t child_pid = (pid_t)pid;
     waitpid(child_pid, NULL, 0);
 
     pam_setcred(pamh, PAM_DELETE_CRED);

src/config.c

@@ -12,6 +12,7 @@
 #include "config.h"
 #include "desktop.h"
 #include "log.h"
+#include "macros.h"
 #include "util.h"
 
 #define UPPER_HALF_BYTE 4
@@ -240,12 +241,10 @@ struct status config_line_handler(void* _config, char* table, char* k,
 int parse_config(struct config* NNULLABLE config, char* NNULLABLE path) {
   FILE* fd = fopen(path, "r");
   if (fd == NULL) {
-    perror("fopen");
-    (void)fputs(
-        "Please place a config file at /etc/lidm.ini or set the LIDM_CONF "
-        "env variable",
-        stderr);
-    return -1;
+    log_perror("fopen");
+    log_printf(" [I] No config, place one at " LIDM_CONF_PATH
+               " or set the LIDM_CONF env variable\n");
+    return 0; // Its fine now anyways
   }
 
   bool ret = read_desktop(fd, config, config_line_handler);

src/desktop.c

@@ -66,7 +66,7 @@ int read_desktop(FILE* fd, void* ctx,
       buf_start[eq_idx] = '\0'; // the equal
       key = trim_str(key);
       char* value = &buf_start[eq_idx + 1];
-      buf_start[read_size - 1] = '\0'; // the newline
+      if (buf_start[read_size - 1] == '\n') buf_start[read_size - 1] = '\0';
       value = trim_str(value);
 
       // Callback

src/log.c

@@ -32,7 +32,7 @@ void log_perror(const char* s) {
   if (!logger_out) return;
 
   if (s)
-    (void)fprintf(logger_out, "%s: %s", s, strerror(errno));
+    (void)fprintf(logger_out, "%s: %s\n", s, strerror(errno));
   else
-    (void)fprintf(logger_out, "%s", strerror(errno));
+    (void)fprintf(logger_out, "%s\n", strerror(errno));
 }

src/main.c

@@ -72,9 +72,10 @@ int main(int argc, char* argv[]) {
     chvt_str(argv[1]);
   }
 
+  // Copy
   struct config config = DEFAULT_CONFIG;
   char* conf_override = getenv("LIDM_CONF");
-  char* conf_path = conf_override ? conf_override : "/etc/lidm.ini";
+  char* conf_path = conf_override ? conf_override : LIDM_CONF_PATH;
   if (parse_config(&config, conf_path) != 0) {
     (void)fputs("error parsing config\n", stderr);
     return 1;

src/sessions.c

@@ -16,9 +16,16 @@ struct source_dir {
   enum session_type type;
   char* dir;
 };
+
+#ifndef SESSIONS_XSESSIONS
+  #define SESSIONS_XSESSIONS "/usr/share/xsessions"
+#endif
+#ifndef SESSIONS_WAYLAND
+  #define SESSIONS_WAYLAND "/usr/share/wayland-sessions"
+#endif
 static const struct source_dir SOURCES[] = {
-    {XORG, "/usr/share/xsessions"},
-    {WAYLAND, "/usr/share/wayland-sessions"},
+    {XORG, SESSIONS_XSESSIONS},
+    {WAYLAND, SESSIONS_WAYLAND},
 };
 
 static struct Vector* cb_sessions = NULL;

src/ui.c

@@ -3,6 +3,7 @@
 
 #include <asm-generic/errno.h>
 #include <errno.h>
+#include <limits.h>
 #include <pwd.h>
 #include <signal.h>
 #include <stdbool.h>
@@ -108,30 +109,22 @@ static char* fmt_time(const char* fmt) {
   }
 }
 
-char* trunc_gethostname(const size_t MAXSIZE, const char* const ELLIPSIS) {
-  if (utf8len(ELLIPSIS) > MAXSIZE) return NULL;
-  size_t alloc_size = MAXSIZE + 1;
+char* trunc_gethostname(const size_t MAXLEN, const char* const ELLIPSIS) {
+  if (utf8len(ELLIPSIS) > MAXLEN) return NULL;
+  size_t alloc_size = HOST_NAME_MAX + strlen(ELLIPSIS) + 1;
   char* buf = malloc(alloc_size);
   if (!buf) return NULL;
-  while (true) {
-    if (gethostname(buf, alloc_size) == 0) return buf;
-    if (errno == ENAMETOOLONG) {
-      buf[alloc_size] = '\0';
-      if (utf8len(buf) > MAXSIZE - utf8len(ELLIPSIS)) {
-        strcpy(&buf[MAXSIZE - utf8len(ELLIPSIS)], ELLIPSIS);
-        return buf;
-      }
 
-      alloc_size *= 2;
-      char* nbuf = realloc(buf, alloc_size);
-      if (!nbuf) goto fail;
-      buf = nbuf;
-    } else
-      goto fail;
+  if (gethostname(buf, alloc_size) != 0) {
+    free(buf);
+    return NULL;
   }
-fail:
-  free(buf);
-  return NULL;
+
+  if (utf8len(buf) > MAXLEN) {
+    size_t end = utf8trunc(buf, MAXLEN - utf8len(ELLIPSIS));
+    strcpy(&buf[end], ELLIPSIS);
+  }
+  return buf;
 }
 
 void ui_update_cursor_focus() {

src/util.c

@@ -103,6 +103,24 @@ size_t utf8len_until(const char* str, const char* until) {
   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))) {
   }