From 7fba97378a0014a9c6037c8c20527199a336c30c Mon Sep 17 00:00:00 2001
From: Jelle Spreeuwenberg <mail@jelles.net>
Date: Sat, 25 Apr 2026 19:46:09 +0200
Subject: [PATCH] fix: comma not having database

---
 flake.lock                 | 81 +++++++++++++++++++++++++++-----------
 flake.nix                  |  1 +
 modules/features/nix.nix   | 15 +++----
 modules/features/shell.nix |  1 -
 4 files changed, 67 insertions(+), 31 deletions(-)

diff --git a/flake.lock b/flake.lock
index 56860cd..b32f02a 100644
--- a/flake.lock
+++ b/flake.lock
@@ -279,10 +279,28 @@
         "type": "github"
       }
     },
-    "nix-wrapper-modules": {
+    "nix-index-database": {
       "inputs": {
         "nixpkgs": "nixpkgs_6"
       },
+      "locked": {
+        "lastModified": 1776829403,
+        "narHash": "sha256-oHVcvP2Ahhj1KUsEzp+2BQF55/r5VSa3QxdPdwE1p00=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "c43246d4e9e506178b69baed075d797ec2d873e2",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
+    "nix-wrapper-modules": {
+      "inputs": {
+        "nixpkgs": "nixpkgs_7"
+      },
       "locked": {
         "lastModified": 1776924494,
         "narHash": "sha256-/DAu081O5/lTZx5H9jjhwOaLX9/xjclEJbQaMuE9v5k=",
@@ -361,6 +379,22 @@
       }
     },
     "nixpkgs_10": {
+      "locked": {
+        "lastModified": 1775888245,
+        "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "13043924aaa7375ce482ebe2494338e058282925",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_11": {
       "locked": {
         "lastModified": 1768564909,
         "narHash": "sha256-Kell/SpJYVkHWMvnhqJz/8DqQg2b6PguxVWOuadbHCc=",
@@ -441,6 +475,22 @@
       }
     },
     "nixpkgs_6": {
+      "locked": {
+        "lastModified": 1776169885,
+        "narHash": "sha256-l/iNYDZ4bGOAFQY2q8y5OAfBBtrDAaPuRQqWaFHVRXM=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "4bd9165a9165d7b5e33ae57f3eecbcb28fb231c9",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixos-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
+    "nixpkgs_7": {
       "locked": {
         "lastModified": 1775579569,
         "narHash": "sha256-/m3yyS/EnXqoPGBJYVy4jTOsirdgsEZ3JdN2gGkBr14=",
@@ -456,7 +506,7 @@
         "type": "github"
       }
     },
-    "nixpkgs_7": {
+    "nixpkgs_8": {
       "locked": {
         "lastModified": 1776329215,
         "narHash": "sha256-mBqzkn7oJti2hqeO8iTbDxKw+1ifxpP53feQ0CEXies=",
@@ -469,7 +519,7 @@
         "url": "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz"
       }
     },
-    "nixpkgs_8": {
+    "nixpkgs_9": {
       "locked": {
         "lastModified": 1776548001,
         "narHash": "sha256-ZSK0NL4a1BwVbbTBoSnWgbJy9HeZFXLYQizjb2DPF24=",
@@ -485,25 +535,9 @@
         "type": "github"
       }
     },
-    "nixpkgs_9": {
-      "locked": {
-        "lastModified": 1775888245,
-        "narHash": "sha256-nwASzrRDD1JBEu/o8ekKYEXm/oJW6EMCzCRdrwcLe90=",
-        "owner": "NixOS",
-        "repo": "nixpkgs",
-        "rev": "13043924aaa7375ce482ebe2494338e058282925",
-        "type": "github"
-      },
-      "original": {
-        "owner": "NixOS",
-        "ref": "nixpkgs-unstable",
-        "repo": "nixpkgs",
-        "type": "github"
-      }
-    },
     "noctalia": {
       "inputs": {
-        "nixpkgs": "nixpkgs_8",
+        "nixpkgs": "nixpkgs_9",
         "noctalia-qs": "noctalia-qs"
       },
       "locked": {
@@ -555,9 +589,10 @@
         "llm-agents": "llm-agents",
         "lux-pkgs": "lux-pkgs",
         "niri": "niri",
+        "nix-index-database": "nix-index-database",
         "nix-wrapper-modules": "nix-wrapper-modules",
         "nixos-hardware": "nixos-hardware",
-        "nixpkgs": "nixpkgs_7",
+        "nixpkgs": "nixpkgs_8",
         "noctalia": "noctalia",
         "sops-nix": "sops-nix",
         "vicinae-extensions": "vicinae-extensions"
@@ -565,7 +600,7 @@
     },
     "sops-nix": {
       "inputs": {
-        "nixpkgs": "nixpkgs_9"
+        "nixpkgs": "nixpkgs_10"
       },
       "locked": {
         "lastModified": 1776771786,
@@ -697,7 +732,7 @@
     "vicinae-extensions": {
       "inputs": {
         "flake-compat": "flake-compat",
-        "nixpkgs": "nixpkgs_10",
+        "nixpkgs": "nixpkgs_11",
         "systems": "systems_3",
         "vicinae": "vicinae"
       },
diff --git a/flake.nix b/flake.nix
index 0b42bec..538d5c3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -13,6 +13,7 @@
     nixpkgs.url = "https://channels.nixos.org/nixpkgs-unstable/nixexprs.tar.xz";
     noctalia.url = "github:noctalia-dev/noctalia-shell";
     sops-nix.url = "github:Mic92/sops-nix";
+    nix-index-database.url = "github:nix-community/nix-index-database";
 
     #vicinae.url = "github:vicinaehq/vicinae";
     vicinae-extensions.url = "github:vicinaehq/extensions";
diff --git a/modules/features/nix.nix b/modules/features/nix.nix
index aa7a4d0..98d5749 100644
--- a/modules/features/nix.nix
+++ b/modules/features/nix.nix
@@ -1,12 +1,7 @@
+{ inputs, ... }:
 {
   flake.modules.nixos.nix =
-    {
-      config,
-      inputs,
-      lib,
-      pkgs,
-      ...
-    }:
+    { ... }:
     {
       nixpkgs.config.allowUnfree = true;
 
@@ -32,6 +27,10 @@
   flake.modules.homeManager.nix =
     { pkgs, ... }:
     {
+      imports = [
+        inputs.nix-index-database.homeModules.default
+      ];
+
       home.packages = [
         (pkgs.writeShellApplication {
           name = "ns";
@@ -43,6 +42,8 @@
         })
       ];
 
+      programs.nix-index-database.comma.enable = true;
+
       programs.television = {
         enable = true;
         enableZshIntegration = false;
diff --git a/modules/features/shell.nix b/modules/features/shell.nix
index acd62ad..0b9dc03 100644
--- a/modules/features/shell.nix
+++ b/modules/features/shell.nix
@@ -176,7 +176,6 @@
       home.packages = [
         pkgs.fd
         pkgs.bat
-        pkgs.comma
         pkgs.tlrc
         pkgs.sd
         pkgs.procs