diff -rN -u old-nvim-tree-sitter-unicode-conceal/flake.nix new-nvim-tree-sitter-unicode-conceal/flake.nix
--- old-nvim-tree-sitter-unicode-conceal/flake.nix	2024-11-24 22:46:46.343319309 +0000
+++ new-nvim-tree-sitter-unicode-conceal/flake.nix	2024-11-24 22:46:46.343319309 +0000
@@ -19,21 +19,26 @@
             "x86_64-darwin"
          ];
 
-         forAllSystems = nixpkgs.lib.genAttrs supportedSystems;
-
-         nixpkgsFor = forAllSystems (
+         nixpkgsFor = nixpkgs.lib.genAttrs supportedSystems (
             system:
             import nixpkgs {
                inherit system;
-               config = {
-                  allowlistedLicenses = with nixpkgs.lib.licenses; [ ];
-               };
-               overlays = with self.overlays; [
-                  default
-                  vimPlugins
-               ];
+               config = { };
+               overlays = [ self.overlays.default ];
             }
          );
+
+         forAllSystems =
+            fn:
+            nixpkgs.lib.genAttrs supportedSystems (
+               system:
+               fn rec {
+                  inherit system;
+                  pkgs = nixpkgsFor.${system};
+                  inherit (pkgs) lib;
+                  fs = lib.fileset;
+               }
+            );
       in
       {
          overlays = {
@@ -66,27 +71,29 @@
          };
 
          packages = forAllSystems (
-            system:
-            let
-               pkgs = nixpkgsFor.${system};
-               inherit (pkgs) lib;
-            in
+            {
+               system,
+               pkgs,
+               lib,
+               fs,
+               ...
+            }:
             {
                default = self.packages.${system}.${name};
 
                ${name} = pkgs.vimUtils.buildVimPlugin {
                   inherit name;
                   namePrefix = "";
-                  src = lib.fileset.toSource {
+                  src = fs.toSource {
                      root = ./.;
-                     fileset = lib.fileset.unions [
+                     fileset = fs.unions [
                         ./after
                         ./COPYING.txt
                         ./COPYING.LESSER.txt
                      ];
                   };
                   meta = {
-                     license = lib.licenses.lgpl21;
+                     license = with lib.licenses; [ lgpl21 ];
                   };
                };
 
@@ -172,10 +179,7 @@
          );
 
          apps = forAllSystems (
-            system:
-            let
-               pkgs = nixpkgsFor.${system};
-            in
+            { system, pkgs, ... }:
             {
                default = self.apps.${system}.nvim-mod;
 
@@ -187,12 +191,9 @@
          );
 
          devShells = forAllSystems (
-            system:
-            let
-               pkgs = nixpkgsFor.${system};
-            in
+            { system, pkgs, ... }:
             {
-               ${name} = pkgs.mkShell {
+               ${name} = pkgs.mkShellNoCC {
                   inherit name;
                   buildInputs = with pkgs; [
                      nixfmt-3-space
@@ -204,6 +205,6 @@
             }
          );
 
-         formatter = forAllSystems (system: nixpkgsFor.${system}.nixfmt-3-space);
+         formatter = forAllSystems ({ pkgs, ... }: pkgs.nixfmt-3-space);
       };
 }