add comma, clean up default module definitions

2 files changed, 43 insertions, 8 deletions

diff --git a/flake.lock b/flake.lock
index bbd33a2..b1cebaa 100644
--- a/flake.lock
+++ b/flake.lock
@@ -686,6 +686,26 @@
         "type": "github"
       }
     },
+    "nix-index-database": {
+      "inputs": {
+        "nixpkgs": [
+          "nixpkgs-unstable"
+        ]
+      },
+      "locked": {
+        "lastModified": 1772945408,
+        "narHash": "sha256-PMt48sEQ8cgCeljQ9I/32uoBq/8t8y+7W/nAZhf72TQ=",
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "rev": "1c1d8ea87b047788fd7567adf531418c5da321ec",
+        "type": "github"
+      },
+      "original": {
+        "owner": "nix-community",
+        "repo": "nix-index-database",
+        "type": "github"
+      }
+    },
     "nixlib": {
       "locked": {
         "lastModified": 1736643958,
@@ -887,6 +907,7 @@
         "microvm": "microvm",
         "modded-minecraft-servers": "modded-minecraft-servers",
         "nix-colors": "nix-colors",
+        "nix-index-database": "nix-index-database",
         "nixos-generators": "nixos-generators",
         "nixpkgs": "nixpkgs_3",
         "nixpkgs-old": "nixpkgs-old",
diff --git a/flake.nix b/flake.nix
index a9a8dcc..32c9b0f 100644
--- a/flake.nix
+++ b/flake.nix
@@ -6,6 +6,9 @@
     nixpkgs-unstable.url = "github:nixos/nixpkgs/nixos-unstable";
     nixpkgs-old.url = "github:nixos/nixpkgs/nixos-25.05";
 
+    nix-index-database.url = "github:nix-community/nix-index-database";
+    nix-index-database.inputs.nixpkgs.follows = "nixpkgs-unstable";
+
     home-manager = {
       url = "github:nix-community/home-manager/release-25.11"; 
       # The `follows` keyword in inputs is used for inheritance.
@@ -201,15 +204,24 @@
           home-manager.useUserPackages = true;
           home-manager.extraSpecialArgs = { inherit inputs; };
         }
+      ];
+      nixIndex = [
+        nix-index-database.nixosModules.nix-index {
+          programs.nix-index-database.comma.enable = true;
+        }
+      ];
+      minimalModuleConfig = minimalHomeManagerSettings ++ nixIndex ++ [
         # lib.nixosSystem {
         #   modules = [
-        #     ./modules/nixos/nix-common.nix
-        #     ./modules/nixos/environment.nix
-        #     ./modules/nixos/system-packages.nix
-
-        #     ./modules/users/defin.nix
-        #     ./modules/users/root.nix
-        #   ];
+              ./modules/nixos/nix-common.nix
+              ./modules/nixos/environment.nix
+              ./modules/nixos/system-packages.nix
+
+              ./modules/users/defin.nix
+              ./modules/users/root.nix
+          #   nix-index-database.nixosModules.nix-index
+          #     { programs.nix-index-database.comma.enable = true;}
+          # ];
         #   # # Let 'nixos-version --json' know the Git revision of this flake. (for containers?)
         #   # system.configurationRevision = nixpkgs.lib.mkIf (self ? rev) self.rev;
         #   # nix.registry.nixpkgs.flake = nixpkgs;
@@ -250,7 +262,9 @@
         };
         zenbook = lib.nixosSystem { # Personal laptop
           # specialArgs = { inherit inputs; };
-          modules = minimalHomeManagerSettings ++ [ ./machines/zenbook
+          modules = minimalModuleConfig ++ [ ./machines/zenbook
+            # minimalNixConfig
+            # nix-index-database.nixosModules.nix-index { programs.nix-index-database.comma.enable = true;}
             # lix-module.nixosModules.default
             # hyprland.homeManagerModules.default {wayland.windowManager.hyprland.enable = true;}
             home-manager.nixosModules.home-manager { home-manager.users.defin = import ./home-manager/tiling-wm.nix; }