diff --git a/roles/common/programs/comma.nix b/roles/common/programs/comma.nix
new file mode 100644
index 0000000..3c3f07b
--- /dev/null
+++ b/roles/common/programs/comma.nix
@@ -0,0 +1,8 @@
+{ config, pkgs, ... }:
+
+{
+	 # Use nix-index-database's comma wrapper
+	 programs.nix-index-database.comma.enable = true;
+	 # Run programs from the system's nixpkgs
+	 environment.variables = { COMMA_NIXPKGS_FLAKE="system"; };
+}
diff --git a/roles/common/programs/default.nix b/roles/common/programs/default.nix
index e3aaa87..83991eb 100755
--- a/roles/common/programs/default.nix
+++ b/roles/common/programs/default.nix
@@ -7,6 +7,7 @@
 		./micro.nix
 		./nix-index.nix
 		./command-not-found.nix
+		./comma.nix
 	];
 	# Some programs dont have a programs.*.enable option, so I install their package here
 	environment.systemPackages = with pkgs; [