From 3f1dfd5fa9fc8ce081bbb1aa01ccc7bdb5a9d073 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Leon=20Schwarz=C3=A4ugl?=
 <leon.schwarzaeugl@imba.oeaw.ac.at>
Date: Tue, 25 Nov 2025 19:54:32 +0100
Subject: [PATCH] fix[client]: actually use nix-index-database

---
 modules/home/common/nix-index.nix | 2 ++
 modules/home/common/packages.nix  | 1 -
 modules/nixos/client/packages.nix | 8 ++++++--
 nix/overlays.nix                  | 2 ++
 4 files changed, 10 insertions(+), 3 deletions(-)

diff --git a/modules/home/common/nix-index.nix b/modules/home/common/nix-index.nix
index 42aa8d1..b749bf8 100644
--- a/modules/home/common/nix-index.nix
+++ b/modules/home/common/nix-index.nix
@@ -14,11 +14,13 @@
       in
 
       {
+
         enable = true;
         package = pkgs.symlinkJoin {
           name = "nix-index";
           paths = [ commandNotFound ];
         };
       };
+    programs.nix-index-database.comma.enable = true;
   };
 }
diff --git a/modules/home/common/packages.nix b/modules/home/common/packages.nix
index a1c84bf..72c27e5 100644
--- a/modules/home/common/packages.nix
+++ b/modules/home/common/packages.nix
@@ -60,7 +60,6 @@
       nix-inspect
       nixpkgs-review
       manix
-      comma
 
       # shellscripts
       shfmt
diff --git a/modules/nixos/client/packages.nix b/modules/nixos/client/packages.nix
index b4233eb..f52bfd4 100644
--- a/modules/nixos/client/packages.nix
+++ b/modules/nixos/client/packages.nix
@@ -30,8 +30,9 @@
 
       libsForQt5.qt5.qtwayland
 
-      # nix package database
-      nix-index
+      # do not do this! clashes with the flake
+      # nix-index
+
       nixos-generators
 
       # commit hooks
@@ -47,6 +48,9 @@
       # better make for general tasks
       just
 
+      # sops
+      ssh-to-age
+      sops
 
       # keyboards
       qmk
diff --git a/nix/overlays.nix b/nix/overlays.nix
index 1f8fdc2..0468d04 100644
--- a/nix/overlays.nix
+++ b/nix/overlays.nix
@@ -86,7 +86,9 @@ in
               // (inputs.nur.overlays.default final prev)
               // (inputs.emacs-overlay.overlay final prev)
               // (inputs.nix-topology.overlays.default final prev)
+              // (inputs.nix-index-database.overlays.nix-index final prev)
               // (inputs.nixgl.overlay final prev)
+              // (inputs.nix-minecraft.overlay final prev)
               // (inputs.nixos-extra-modules.overlays.default final prev)
             )
             (modifications final prev);