From 22c75a37e19ec6d01d122a8bee127f4c9e32c82a Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sat, 5 Jul 2025 22:28:02 +0200
Subject: [PATCH 01/13] feat(nix): make flake read version from makefile

---
 flake.nix | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/flake.nix b/flake.nix
index ecd90a1..6435871 100644
--- a/flake.nix
+++ b/flake.nix
@@ -1,8 +1,11 @@
 {
+  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.lib.eachDefaultSystem (
@@ -11,7 +14,9 @@
         pkgs = import nixpkgs { inherit system; };
 
         name = "lidm";
-        version = "0.0.2";
+        version = builtins.elemAt (
+          builtins.match "VERSION[[:blank:]]*=[[:space:]]*([^\n]*)\n.*" (builtins.readFile ./Makefile)
+        ) 0;
 
         lidm = (
           pkgs.stdenv.mkDerivation {

From b580b6917beef5fc042b2579b5a8c489dd38290e Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 01:24:43 +0200
Subject: [PATCH 02/13] feat(nix): reorganize nix flake for modularity and
 flexibility

---
 assets/pkg/nix/lidm.nix | 26 ++++++++++++++++++++++++++
 flake.nix               | 27 ++++-----------------------
 2 files changed, 30 insertions(+), 23 deletions(-)
 create mode 100644 assets/pkg/nix/lidm.nix

diff --git a/assets/pkg/nix/lidm.nix b/assets/pkg/nix/lidm.nix
new file mode 100644
index 0000000..8c368ca
--- /dev/null
+++ b/assets/pkg/nix/lidm.nix
@@ -0,0 +1,26 @@
+{ config, pkgs, ...}: pkgs.stdenv.mkDerivation rec {
+    pname = "lidm";
+    version = config.version;
+    src = config.src;
+
+    nativeBuildInputs = with pkgs; [
+        gcc
+        gnumake
+        linux-pam
+    ];
+
+    makeFlags = [
+        "DESTDIR=$(out)"
+        "PREFIX="
+    ];
+
+    installPhase = ''
+        make install DESTDIR=$out PREFIX=
+        mkdir -p $out/etc/systemd/system/
+        make install-service-systemd DESTDIR=$out PREFIX=
+    '';
+
+    fixupPhase = ''
+        rm -rf $out/etc
+    '';
+}
diff --git a/flake.nix b/flake.nix
index 6435871..96838e5 100644
--- a/flake.nix
+++ b/flake.nix
@@ -18,29 +18,10 @@
           builtins.match "VERSION[[:blank:]]*=[[:space:]]*([^\n]*)\n.*" (builtins.readFile ./Makefile)
         ) 0;
 
-        lidm = (
-          pkgs.stdenv.mkDerivation {
-            pname = name;
-            version = version;
-
-            src = ./.;
-
-            nativeBuildInputs = with pkgs; [
-              gcc
-              gnumake
-              linux-pam
-            ];
-
-            makeFlags = [
-              "DESTDIR=$(out)"
-              "PREFIX="
-            ];
-
-            fixupPhase = ''
-              rm -rf $out/etc
-            '';
-          }
-        );
+        lidm = pkgs.callPackage assets/pkg/nix/lidm.nix {
+          inherit pkgs;
+          config = { inherit version; src = ./.; };
+        };
       in
       rec {
         defaultApp = flake-utils.lib.mkApp { drv = defaultPackage; };

From 6cac2f91ed0636a63700581fb552dad005585060 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 04:21:49 +0200
Subject: [PATCH 03/13] fix: neccessary code changes for nix

---
 Makefile       |  4 +++-
 src/config.c   | 11 +++++------
 src/main.c     |  1 +
 src/sessions.c | 11 +++++++++--
 4 files changed, 18 insertions(+), 9 deletions(-)

diff --git a/Makefile b/Makefile
index 365760d..77bce10 100644
--- a/Makefile
+++ b/Makefile
@@ -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
 
diff --git a/src/config.c b/src/config.c
index ea71559..44a20b6 100644
--- a/src/config.c
+++ b/src/config.c
@@ -240,12 +240,11 @@ 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 /etc/lidm.ini or set the LIDM_CONF "
+        "env variable");
+    return 0; // Its fine now anyways
   }
 
   bool ret = read_desktop(fd, config, config_line_handler);
diff --git a/src/main.c b/src/main.c
index c67072c..db2a2e0 100644
--- a/src/main.c
+++ b/src/main.c
@@ -72,6 +72,7 @@ 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";
diff --git a/src/sessions.c b/src/sessions.c
index f8f09b3..4d36bc5 100644
--- a/src/sessions.c
+++ b/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;

From be6e039a9b44e70766a7dee4c7b1cfa8b0e2f1ab Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 05:06:54 +0200
Subject: [PATCH 04/13] feat: make a complete nix module

---
 assets/pkg/nix/lidm.nix         | 14 +++++-----
 assets/pkg/nix/module.nix       | 47 +++++++++++++++++++++++++++++++++
 assets/services/systemd.service |  2 +-
 flake.nix                       | 12 +++++++--
 4 files changed, 64 insertions(+), 11 deletions(-)
 create mode 100644 assets/pkg/nix/module.nix

diff --git a/assets/pkg/nix/lidm.nix b/assets/pkg/nix/lidm.nix
index 8c368ca..7753eb5 100644
--- a/assets/pkg/nix/lidm.nix
+++ b/assets/pkg/nix/lidm.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, ...}: pkgs.stdenv.mkDerivation rec {
+{ config, pkgs, lib, ...}: pkgs.stdenv.mkDerivation rec {
     pname = "lidm";
     version = config.version;
     src = config.src;
@@ -12,13 +12,11 @@
     makeFlags = [
         "DESTDIR=$(out)"
         "PREFIX="
-    ];
-
-    installPhase = ''
-        make install DESTDIR=$out PREFIX=
-        mkdir -p $out/etc/systemd/system/
-        make install-service-systemd 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}\\\"";
 
     fixupPhase = ''
         rm -rf $out/etc
diff --git a/assets/pkg/nix/module.nix b/assets/pkg/nix/module.nix
new file mode 100644
index 0000000..69b013d
--- /dev/null
+++ b/assets/pkg/nix/module.nix
@@ -0,0 +1,47 @@
+{ config, lib, pkgs, ... }:
+
+let
+    dmcfg = config.services.displayManager;
+    desktops = dmcfg.sessionData.desktops;
+
+    version = "1.2.1";
+    lidmPkg = pkgs.callPackage ./lidm.nix {
+        inherit pkgs;
+        config = {
+            inherit version lib;
+            src = pkgs.fetchFromGitHub {
+              owner = "javalsai";
+              repo = "lidm";
+              rev = "v${version}";
+              sha256 = "sha256-3CgUI8PUs4c1bfBrykPw87SSa4lzrh4E4Hug7cGRKFk=";
+            };
+
+            xsessions = "${desktops}/share/xsessions";
+            wayland-sessions = "${desktops}/share/wayland-sessions";
+        };
+    };
+in
+{
+    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";
+            };
+        };
+    };
+}
diff --git a/assets/services/systemd.service b/assets/services/systemd.service
index 39ef026..c34e89d 100644
--- a/assets/services/systemd.service
+++ b/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
diff --git a/flake.nix b/flake.nix
index 96838e5..95f8e3c 100644
--- a/flake.nix
+++ b/flake.nix
@@ -20,7 +20,13 @@
 
         lidm = pkgs.callPackage assets/pkg/nix/lidm.nix {
           inherit pkgs;
-          config = { inherit version; src = ./.; };
+          lib = pkgs.lib;
+          config = {
+            inherit version;
+            src = ./.;
+            xsessions = null;
+            wayland-sessions = null;
+          };
         };
       in
       rec {
@@ -28,5 +34,7 @@
         defaultPackage = lidm;
         devShell = pkgs.mkShell { buildInputs = lidm.nativeBuildInputs ++ [ pkgs.clang-tools ]; };
       }
-    );
+    ) // {
+      nixosModules.lidm = assets/pkg/nix/module.nix;
+    };
 }

From 689c962cc99ca9572fe82c584b23381b36cb19b1 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 05:13:09 +0200
Subject: [PATCH 05/13] fix: necessary code changes for nix configurability

---
 include/macros.h | 5 +++++
 src/config.c     | 6 +++---
 src/main.c       | 2 +-
 3 files changed, 9 insertions(+), 4 deletions(-)

diff --git a/include/macros.h b/include/macros.h
index 56f3fb3..9915636 100644
--- a/include/macros.h
+++ b/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
diff --git a/src/config.c b/src/config.c
index 44a20b6..fc11b11 100644
--- a/src/config.c
+++ b/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
@@ -241,9 +242,8 @@ int parse_config(struct config* NNULLABLE config, char* NNULLABLE path) {
   FILE* fd = fopen(path, "r");
   if (fd == NULL) {
     log_perror("fopen");
-    log_printf(
-        " [I] No config, place one at /etc/lidm.ini or set the LIDM_CONF "
-        "env variable");
+    log_printf(" [I] No config, place one at " LIDM_CONF_PATH
+               " or set the LIDM_CONF env variable");
     return 0; // Its fine now anyways
   }
 
diff --git a/src/main.c b/src/main.c
index db2a2e0..4a8aa29 100644
--- a/src/main.c
+++ b/src/main.c
@@ -75,7 +75,7 @@ int main(int argc, char* argv[]) {
   // 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;

From 16901b14c842d9933f6e03b7938e15bdb4ac24ae Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 22:53:09 +0200
Subject: [PATCH 06/13] feat: nixos module is configurable now

---
 assets/pkg/nix/get-cfg-file.nix | 13 ++++++
 assets/pkg/nix/lidm.nix         | 15 ++++++-
 assets/pkg/nix/make-cfg.nix     | 70 +++++++++++++++++++++++++++++++++
 assets/pkg/nix/module.nix       |  8 ++++
 flake.nix                       |  2 +
 5 files changed, 106 insertions(+), 2 deletions(-)
 create mode 100644 assets/pkg/nix/get-cfg-file.nix
 create mode 100644 assets/pkg/nix/make-cfg.nix

diff --git a/assets/pkg/nix/get-cfg-file.nix b/assets/pkg/nix/get-cfg-file.nix
new file mode 100644
index 0000000..a1e3de0
--- /dev/null
+++ b/assets/pkg/nix/get-cfg-file.nix
@@ -0,0 +1,13 @@
+{ cfg, src, lib, ... }:
+let
+    maker = import ./make-cfg.nix {
+        inherit lib;
+        keys-h-file = builtins.readFile "${src}/include/keys.h";
+    };
+in 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"
+)
diff --git a/assets/pkg/nix/lidm.nix b/assets/pkg/nix/lidm.nix
index 7753eb5..cbe77b4 100644
--- a/assets/pkg/nix/lidm.nix
+++ b/assets/pkg/nix/lidm.nix
@@ -1,4 +1,13 @@
-{ config, pkgs, lib, ...}: pkgs.stdenv.mkDerivation rec {
+{ config, pkgs, lib, ...}:
+let
+    cfg-file = if config.cfg != null then
+        import ./get-cfg-file.nix {
+            inherit lib;
+            inherit (config) cfg src;
+        }
+    else null;
+in
+pkgs.stdenv.mkDerivation rec {
     pname = "lidm";
     version = config.version;
     src = config.src;
@@ -16,7 +25,9 @@
     ++ lib.optional (config.xsessions != null)
         "CPPFLAGS+=-DSESSIONS_XSESSIONS=\\\"${config.xsessions}\\\""
     ++ lib.optional (config.wayland-sessions != null)
-        "CPPFLAGS+=-DSESSIONS_WAYLAND=\\\"${config.wayland-sessions}\\\"";
+        "CPPFLAGS+=-DSESSIONS_WAYLAND=\\\"${config.wayland-sessions}\\\""
+    ++ lib.optional (cfg-file != null)
+        "CPPFLAGS+=-DLIDM_CONF_PATH=\\\"${cfg-file}\\\"";
 
     fixupPhase = ''
         rm -rf $out/etc
diff --git a/assets/pkg/nix/make-cfg.nix b/assets/pkg/nix/make-cfg.nix
new file mode 100644
index 0000000..659e9f3
--- /dev/null
+++ b/assets/pkg/nix/make-cfg.nix
@@ -0,0 +1,70 @@
+{ 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);
+}
diff --git a/assets/pkg/nix/module.nix b/assets/pkg/nix/module.nix
index 69b013d..d530814 100644
--- a/assets/pkg/nix/module.nix
+++ b/assets/pkg/nix/module.nix
@@ -1,6 +1,8 @@
 { config, lib, pkgs, ... }:
 
 let
+    cfg = config.services.lidm;
+
     dmcfg = config.services.displayManager;
     desktops = dmcfg.sessionData.desktops;
 
@@ -9,6 +11,7 @@ let
         inherit pkgs;
         config = {
             inherit version lib;
+            cfg = cfg.config;
             src = pkgs.fetchFromGitHub {
               owner = "javalsai";
               repo = "lidm";
@@ -22,6 +25,11 @@ let
     };
 in
 {
+    options.services.lidm.conig = 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";
 
diff --git a/flake.nix b/flake.nix
index 95f8e3c..1633d14 100644
--- a/flake.nix
+++ b/flake.nix
@@ -26,6 +26,8 @@
             src = ./.;
             xsessions = null;
             wayland-sessions = null;
+            cfg = null;
+            # cfg = "cherry";
           };
         };
       in

From 9af69c2417276cbf01b1e4539af50e7b7323a951 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 22:56:38 +0200
Subject: [PATCH 07/13] fix(nix module): typo

howtf did it work in my VM, oh nvm
---
 assets/pkg/nix/module.nix | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/assets/pkg/nix/module.nix b/assets/pkg/nix/module.nix
index d530814..4e168b0 100644
--- a/assets/pkg/nix/module.nix
+++ b/assets/pkg/nix/module.nix
@@ -25,7 +25,7 @@ let
     };
 in
 {
-    options.services.lidm.conig = lib.mkOption {
+    options.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";

From 2f2a2c269610fb583c074f5ed73b50746654e9c1 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 23:03:41 +0200
Subject: [PATCH 08/13] fix(cfg): parser bugs on missing final newline

---
 src/desktop.c | 3 ++-
 1 file changed, 2 insertions(+), 1 deletion(-)

diff --git a/src/desktop.c b/src/desktop.c
index 04c96c0..1244d48 100644
--- a/src/desktop.c
+++ b/src/desktop.c
@@ -66,7 +66,8 @@ 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

From fcc8be77ee57f6739407957d4207a8c3ad3784e7 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 23:14:04 +0200
Subject: [PATCH 09/13] dev(ci): add nix version check to pre-release ci checks

---
 .github/workflows/make-release.yml | 16 ++++++++++++++++
 1 file changed, 16 insertions(+)

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 4f936bf..6549a17 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -16,17 +16,33 @@ jobs:
           packages: "git"
           version: 1.0
       - uses: actions/checkout@v4
+        with:
+          fetch-tags: true
 
       - name: Check Version Changed
         id: check-ver-changed
         run: |
           GIT_TAG=$(git describe --no-long --abbrev=0 --tags --always)
+
           MAKE_TAG=$(make print-version)
+          NIX_VER=$(sed -nE \
+            's/.*version\s*=\s*"([0-9.]*)".*/\1/p' \
+            assets/pkg/nix/module.nix
+          )
 
           if [[ "$GIT_TAG" == "v$MAKE_TAG" ]]; then
             echo "ERR: Git tag matches makefile, did you bump Makefile up?" >&2
             exit 1
           fi
+          if [[ "$GIT_TAG" == "v$NIX_VER" ]]; then
+            echo "ERR: Nix module version matches git, did you bump Nix up?" >&2
+            exit 1
+          fi
+
+          if ! [[ "$NIX_VER" == "$MAKE_TAG" ]]; then
+            echo "ERR: Nix module version and make tag don't match" >&2
+            exit 1
+          fi
           echo "VERSION=$MAKE_TAG" >> "$GITHUB_OUTPUT"
 
 

From 3625aa9426173da6c9762713f443d2d1741b5ecd Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Sun, 6 Jul 2025 23:26:08 +0200
Subject: [PATCH 10/13] docs(nix module): add

---
 INSTALL.md | 52 ++++++++++++++++++++++++++++++++++++++++++++++++++++
 1 file changed, 52 insertions(+)

diff --git a/INSTALL.md b/INSTALL.md
index 8f2ce27..14bf062 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -4,6 +4,7 @@
 - [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.
@@ -73,3 +74,54 @@ nix run github:javalsai/lidm
 
 > [!CAUTION]
 > 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
+{
+    strings = {
+        f_poweroff = "custom_poweroff";
+        # etc
+    };
+    behavior = {
+        include_defshell = true;
+        source = [
+            "path1"
+            "path2"
+        ];
+        # etc
+    };
+    # etc
+};
+```
+
+> *it's not necessary to cover all keys and anything can be put there, even if
+> its not valid config*
+
+> [!NOTE]
+> [service files](./assets/pkg/aur#services) **are** included and enabled

From 4611ad87a852c735f4883a4b53f0fe49cf3918de Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Mon, 7 Jul 2025 02:38:04 +0200
Subject: [PATCH 11/13] fmt(nix): add `nix fmt`, fmt and update `flake.lock`

---
 assets/pkg/nix/get-cfg-file.nix |  29 +++++----
 assets/pkg/nix/lidm.nix         |  63 ++++++++++--------
 assets/pkg/nix/make-cfg.nix     | 111 ++++++++++++++++----------------
 assets/pkg/nix/module.nix       |  98 +++++++++++++++-------------
 flake.lock                      |  12 ++--
 flake.nix                       |  14 ++--
 6 files changed, 180 insertions(+), 147 deletions(-)

diff --git a/assets/pkg/nix/get-cfg-file.nix b/assets/pkg/nix/get-cfg-file.nix
index a1e3de0..095f589 100644
--- a/assets/pkg/nix/get-cfg-file.nix
+++ b/assets/pkg/nix/get-cfg-file.nix
@@ -1,13 +1,20 @@
-{ cfg, src, lib, ... }:
+{
+  cfg,
+  src,
+  lib,
+  ...
+}:
 let
-    maker = import ./make-cfg.nix {
-        inherit lib;
-        keys-h-file = builtins.readFile "${src}/include/keys.h";
-    };
-in 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"
+  maker = import ./make-cfg.nix {
+    inherit lib;
+    keys-h-file = builtins.readFile "${src}/include/keys.h";
+  };
+in
+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"
 )
diff --git a/assets/pkg/nix/lidm.nix b/assets/pkg/nix/lidm.nix
index cbe77b4..37006b7 100644
--- a/assets/pkg/nix/lidm.nix
+++ b/assets/pkg/nix/lidm.nix
@@ -1,35 +1,44 @@
-{ config, pkgs, lib, ...}:
+{
+  config,
+  pkgs,
+  lib,
+  ...
+}:
 let
-    cfg-file = if config.cfg != null then
-        import ./get-cfg-file.nix {
-            inherit lib;
-            inherit (config) cfg src;
-        }
-    else null;
+  cfg-file =
+    if config.cfg != null then
+      import ./get-cfg-file.nix {
+        inherit lib;
+        inherit (config) cfg src;
+      }
+    else
+      null;
 in
 pkgs.stdenv.mkDerivation rec {
-    pname = "lidm";
-    version = config.version;
-    src = config.src;
+  pname = "lidm";
+  version = config.version;
+  src = config.src;
 
-    nativeBuildInputs = with pkgs; [
-        gcc
-        gnumake
-        linux-pam
-    ];
+  nativeBuildInputs = with pkgs; [
+    gcc
+    gnumake
+    linux-pam
+  ];
 
-    makeFlags = [
-        "DESTDIR=$(out)"
-        "PREFIX="
+  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}\\\"";
+    ++ 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
-    '';
+  fixupPhase = ''
+    rm -rf $out/etc
+  '';
 }
diff --git a/assets/pkg/nix/make-cfg.nix b/assets/pkg/nix/make-cfg.nix
index 659e9f3..8114c71 100644
--- a/assets/pkg/nix/make-cfg.nix
+++ b/assets/pkg/nix/make-cfg.nix
@@ -1,70 +1,73 @@
 { lib, keys-h-file }:
 
 let
-    double-match-to-nameval = dmatch: { name = builtins.elemAt dmatch 0; value = builtins.elemAt dmatch 1; };
+  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-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)
-            );
+      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
+    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);
+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;
+      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} = ${
+      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
+              ser-str value
             else if builtins.isInt value then
-                builtins.toString value
+              builtins.toString value
             else if builtins.isBool value then
-                ser-bool value
+              ser-bool value
             else if builtins.isAttrs value then
-                value.__enum_key
-            else builtins.throw "type not supported"
-        }";
+              value.__enum_key
+            else
+              builtins.throw "type not supported"
+          }";
 
-        ser-table = table': let
-            tname = table'.name;
-            table = table'.value;
+      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);
+        "[${tname}]\n" + (concat-with "\n" (map-attrs table ser-kvs));
+    in
+    cfg: concat-with "\n\n" (map-attrs cfg ser-table);
 }
diff --git a/assets/pkg/nix/module.nix b/assets/pkg/nix/module.nix
index 4e168b0..9a6bbc0 100644
--- a/assets/pkg/nix/module.nix
+++ b/assets/pkg/nix/module.nix
@@ -1,55 +1,65 @@
-{ config, lib, pkgs, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 
 let
-    cfg = config.services.lidm;
+  cfg = config.services.lidm;
 
-    dmcfg = config.services.displayManager;
-    desktops = dmcfg.sessionData.desktops;
+  dmcfg = config.services.displayManager;
+  desktops = dmcfg.sessionData.desktops;
 
-    version = "1.2.1";
-    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-3CgUI8PUs4c1bfBrykPw87SSa4lzrh4E4Hug7cGRKFk=";
-            };
+  version = "1.2.1";
+  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-3CgUI8PUs4c1bfBrykPw87SSa4lzrh4E4Hug7cGRKFk=";
+      };
 
-            xsessions = "${desktops}/share/xsessions";
-            wayland-sessions = "${desktops}/share/wayland-sessions";
-        };
+      xsessions = "${desktops}/share/xsessions";
+      wayland-sessions = "${desktops}/share/wayland-sessions";
     };
+  };
 in
 {
-    options.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";
+  options.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";
-            };
-        };
+    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";
+      };
     };
+  };
 }
diff --git a/flake.lock b/flake.lock
index 5e1e2f1..69ad071 100644
--- a/flake.lock
+++ b/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": {
diff --git a/flake.nix b/flake.nix
index 1633d14..2d9a490 100644
--- a/flake.nix
+++ b/flake.nix
@@ -7,16 +7,18 @@
   };
 
   outputs =
-    { flake-utils, nixpkgs, ... }:
+    {
+      flake-utils,
+      nixpkgs,
+      self,
+    }:
     flake-utils.lib.eachDefaultSystem (
       system:
       let
         pkgs = import nixpkgs { inherit system; };
 
         name = "lidm";
-        version = builtins.elemAt (
-          builtins.match "VERSION[[:blank:]]*=[[:space:]]*([^\n]*)\n.*" (builtins.readFile ./Makefile)
-        ) 0;
+        version = builtins.elemAt (builtins.match "VERSION[[:blank:]]*=[[:space:]]*([^\n]*)\n.*" (builtins.readFile ./Makefile)) 0;
 
         lidm = pkgs.callPackage assets/pkg/nix/lidm.nix {
           inherit pkgs;
@@ -35,8 +37,10 @@
         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;
     };
 }

From d85ebc0e780762b2a5d34ed2cff8ca01de7255e2 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Mon, 7 Jul 2025 03:22:16 +0200
Subject: [PATCH 12/13] feat(nix): add keys enum to global cfg

---
 INSTALL.md                      | 11 +++++++----
 assets/pkg/nix/get-cfg-file.nix | 19 +++++++++++--------
 assets/pkg/nix/lidm.nix         |  8 +++++++-
 assets/pkg/nix/module.nix       | 26 +++++++++++++++++---------
 4 files changed, 42 insertions(+), 22 deletions(-)

diff --git a/INSTALL.md b/INSTALL.md
index 14bf062..dcc0de9 100644
--- a/INSTALL.md
+++ b/INSTALL.md
@@ -102,21 +102,24 @@ 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";
-        # etc
     };
+
     behavior = {
         include_defshell = true;
         source = [
             "path1"
             "path2"
         ];
-        # etc
     };
-    # etc
+
+    functions = { poweroff = F1; };
+
+    # etc...
 };
 ```
 
diff --git a/assets/pkg/nix/get-cfg-file.nix b/assets/pkg/nix/get-cfg-file.nix
index 095f589..06f339e 100644
--- a/assets/pkg/nix/get-cfg-file.nix
+++ b/assets/pkg/nix/get-cfg-file.nix
@@ -10,11 +10,14 @@ let
     keys-h-file = builtins.readFile "${src}/include/keys.h";
   };
 in
-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"
-)
+{
+  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"
+  );
+}
diff --git a/assets/pkg/nix/lidm.nix b/assets/pkg/nix/lidm.nix
index 37006b7..26656fa 100644
--- a/assets/pkg/nix/lidm.nix
+++ b/assets/pkg/nix/lidm.nix
@@ -5,7 +5,7 @@
   ...
 }:
 let
-  cfg-file =
+  get-cfg =
     if config.cfg != null then
       import ./get-cfg-file.nix {
         inherit lib;
@@ -13,6 +13,8 @@ let
       }
     else
       null;
+  cfg-file = get-cfg.file;
+  maker = get-cfg.maker;
 in
 pkgs.stdenv.mkDerivation rec {
   pname = "lidm";
@@ -41,4 +43,8 @@ pkgs.stdenv.mkDerivation rec {
   fixupPhase = ''
     rm -rf $out/etc
   '';
+
+  passthru = {
+    keysEnum = maker.keys-enum;
+  };
 }
diff --git a/assets/pkg/nix/module.nix b/assets/pkg/nix/module.nix
index 9a6bbc0..362fb02 100644
--- a/assets/pkg/nix/module.nix
+++ b/assets/pkg/nix/module.nix
@@ -30,15 +30,23 @@ let
   };
 in
 {
-  options.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";
+  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";

From f0ef834eaa112c6d22f42fe35c0ec4ff096fd140 Mon Sep 17 00:00:00 2001
From: javalsai <jvssxxi@gmail.com>
Date: Mon, 7 Jul 2025 03:48:38 +0200
Subject: [PATCH 13/13] ci(release): add nix module version&sha256 bump

---
 .github/workflows/make-release.yml | 48 +++++++++++++++++++++---------
 1 file changed, 34 insertions(+), 14 deletions(-)

diff --git a/.github/workflows/make-release.yml b/.github/workflows/make-release.yml
index 6549a17..2c542ca 100644
--- a/.github/workflows/make-release.yml
+++ b/.github/workflows/make-release.yml
@@ -23,26 +23,13 @@ jobs:
         id: check-ver-changed
         run: |
           GIT_TAG=$(git describe --no-long --abbrev=0 --tags --always)
-
           MAKE_TAG=$(make print-version)
-          NIX_VER=$(sed -nE \
-            's/.*version\s*=\s*"([0-9.]*)".*/\1/p' \
-            assets/pkg/nix/module.nix
-          )
 
           if [[ "$GIT_TAG" == "v$MAKE_TAG" ]]; then
             echo "ERR: Git tag matches makefile, did you bump Makefile up?" >&2
             exit 1
           fi
-          if [[ "$GIT_TAG" == "v$NIX_VER" ]]; then
-            echo "ERR: Nix module version matches git, did you bump Nix up?" >&2
-            exit 1
-          fi
 
-          if ! [[ "$NIX_VER" == "$MAKE_TAG" ]]; then
-            echo "ERR: Nix module version and make tag don't match" >&2
-            exit 1
-          fi
           echo "VERSION=$MAKE_TAG" >> "$GITHUB_OUTPUT"
 
 
@@ -86,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: |
@@ -112,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 }}