From 347d9fcb6f809a8662283cc8615c84d64324ec10 Mon Sep 17 00:00:00 2001
From: Bloxx12 <charlie@charlieroot.dev>
Date: Mon, 21 Jul 2025 23:27:37 +0200
Subject: [PATCH] use unstable comma

Signed-off-by: Bloxx12 <charlie@charlieroot.dev>
Change-Id: I6a6a69648046cf7bdab09db39431ffcabec8d6a0
---
 hosts/hermit/programs.nix         |  1 -
 hosts/temperance/programs.nix     |  1 -
 modules/packages/packages.mod.nix | 32 ++++++++++++++++++++++++++++++-
 npins/sources.json                | 13 +++++++++++++
 4 files changed, 44 insertions(+), 3 deletions(-)

diff --git a/hosts/hermit/programs.nix b/hosts/hermit/programs.nix
index b0d0029..afad470 100644
--- a/hosts/hermit/programs.nix
+++ b/hosts/hermit/programs.nix
@@ -16,7 +16,6 @@
       cbonsai
       cinny-desktop
       cmus
-      comma
       difftastic
       dua
       evince
diff --git a/hosts/temperance/programs.nix b/hosts/temperance/programs.nix
index 98474f2..f24c3ba 100644
--- a/hosts/temperance/programs.nix
+++ b/hosts/temperance/programs.nix
@@ -11,7 +11,6 @@
       calc
       calibre
       carapace
-      comma
       digikam
       difftastic
       dnsutils
diff --git a/modules/packages/packages.mod.nix b/modules/packages/packages.mod.nix
index c54378d..57494bd 100644
--- a/modules/packages/packages.mod.nix
+++ b/modules/packages/packages.mod.nix
@@ -1,10 +1,36 @@
 {
+  lib,
   pkgs,
   sources,
   ...
 }:
 let
   nixfmt = pkgs.callPackage "${sources.nixfmt}/default.nix" { };
+  comma = pkgs.callPackage (
+    _:
+    pkgs.rustPlatform.buildRustPackage {
+      pname = "comma";
+      version = "unstable";
+      src = sources.comma;
+      cargoLock = {
+        allowBuiltinFetchGit = true;
+        lockFile = "${sources.comma}/Cargo.lock";
+      };
+      nativeBuildInputs = [ pkgs.makeBinaryWrapper ];
+      doInstallCheck = false;
+
+      postInstall = ''
+        wrapProgram $out/bin/comma \
+          --prefix PATH : ${
+            lib.makeBinPath [
+              pkgs.fzy
+              pkgs.nix-index-unwrapped
+            ]
+          }
+        ln -s $out/bin/comma $out/bin/,
+      '';
+    }
+  ) { };
 in
 {
   environment.systemPackages =
@@ -40,6 +66,7 @@ in
       glow
       # dua-cli
       dust
+      iamb
       kondo
       # better grep
       ripgrep
@@ -75,5 +102,8 @@ in
       unzip
       zip
     ]
-    ++ [ nixfmt ];
+    ++ [
+      nixfmt
+      comma
+    ];
 }
diff --git a/npins/sources.json b/npins/sources.json
index 25e0429..4f5ba51 100644
--- a/npins/sources.json
+++ b/npins/sources.json
@@ -1,5 +1,18 @@
 {
   "pins": {
+    "comma": {
+      "type": "Git",
+      "repository": {
+        "type": "GitHub",
+        "owner": "nix-community",
+        "repo": "comma"
+      },
+      "branch": "master",
+      "submodules": false,
+      "revision": "4bc672b80356b4d3f283a2988def1ea2580eecbf",
+      "url": "https://github.com/nix-community/comma/archive/4bc672b80356b4d3f283a2988def1ea2580eecbf.tar.gz",
+      "hash": "sha256-mhSX2yx+/xDwCtLVb+aSFFxP2TOJek/ZX/28khvetwE="
+    },
     "flake-compat": {
       "type": "Git",
       "repository": {