From a5febc40e4043bd00c552acde7bf2442f072fa34 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 12 Oct 2023 15:19:44 +0000
Subject: [PATCH 1/2] home: comma: remove 'COMMA_PKGS_FLAKE' definition

Now that my configurations also set `nixpkgs` in `NIX_PATH`, there's
isn't a need for this to be defined anymore.
---
 home/comma/default.nix | 14 --------------
 1 file changed, 14 deletions(-)

diff --git a/home/comma/default.nix b/home/comma/default.nix
index cc6a0ad..60de863 100644
--- a/home/comma/default.nix
+++ b/home/comma/default.nix
@@ -5,25 +5,11 @@ in
 {
   options.my.home.comma = with lib; {
     enable = my.mkDisableOption "comma configuration";
-
-    pkgsFlake = mkOption {
-      type = types.str;
-      default = "pkgs";
-      example = "nixpkgs";
-      description = ''
-        Which flake from the registry should be used with
-        <command>nix shell</command>.
-      '';
-    };
   };
 
   config = lib.mkIf cfg.enable {
     home.packages = with pkgs; [
       ambroisie.comma
     ];
-
-    home.sessionVariables = {
-      COMMA_PKGS_FLAKE = cfg.pkgsFlake;
-    };
   };
 }

From 2d36ffd96dba1ac9acab698d9370983eec0b3574 Mon Sep 17 00:00:00 2001
From: Bruno BELANYI <bruno@belanyi.fr>
Date: Thu, 12 Oct 2023 15:19:44 +0000
Subject: [PATCH 2/2] pkgs: comma: rename 'COMMA_{,NIX}PKGS_FLAKE'

This aligns with the rust implementation of this tool [1].

[1]: https://github.com/nix-community/comma/commit/17a4f3384954a43cec0f91361f153cda908fe3d3
---
 pkgs/comma/comma | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/pkgs/comma/comma b/pkgs/comma/comma
index ba5c6ae..4367a26 100755
--- a/pkgs/comma/comma
+++ b/pkgs/comma/comma
@@ -30,4 +30,4 @@ if [ -z "$PROGRAM" ]; then
     exit 1
 fi
 
-nix shell "${COMMA_PKGS_FLAKE:-nixpkgs}#$PROGRAM" -c "$@"
+nix shell "${COMMA_NIXPKGS_FLAKE:-nixpkgs}#$PROGRAM" -c "$@"