treesitter: re-enable tsx / js; refactor builders

gvolpe · Jan 9, 2025 · eb2ab32 · eb2ab32
1 parent 689f737
commit eb2ab32
Show file tree

Hide file tree

Showing 3 changed files with 17 additions and 18 deletions.
diff --git a/flake.nix b/flake.nix
@@ -119,7 +119,7 @@
     };
   };
 
-  outputs = inputs:
+  outputs = inputs @ { self, ... }:
     let
       system = "x86_64-linux";
 
@@ -130,13 +130,11 @@
         config.allowUnfree = true;
       };
 
-      homeConfigurations = pkgs.mkHomeConfigurations { };
-      nixosConfigurations = pkgs.mkNixosConfigurations { };
-
-      neovim = homeConfigurations.hyprland-hdmi.config.programs.neovim-ide.finalPackage;
+      neovim = self.homeConfigurations.hyprland-hdmi.config.programs.neovim-ide.finalPackage;
     in
     {
-      inherit homeConfigurations nixosConfigurations;
+      homeConfigurations = pkgs.builders.mkHome { };
+      nixosConfigurations = pkgs.builders.mkNixos { };
 
       out = { inherit pkgs overlays; };
 

diff --git a/lib/overlays.nix b/lib/overlays.nix
@@ -31,11 +31,13 @@ let
   };
 
   buildersOverlay = f: p: {
-    mkHomeConfigurations = { pkgs ? f, extraImports ? { } }:
-      import ../outputs/hm.nix { inherit extraImports inputs pkgs system; };
+    builders = {
+      mkHome = { pkgs ? f, extraHomeConfig ? { } }:
+        import ../outputs/hm.nix { inherit extraHomeConfig inputs pkgs system; };
 
-    mkNixosConfigurations = { pkgs ? f, extraSystemConfig ? { } }:
-      import ../outputs/os.nix { inherit extraSystemConfig inputs pkgs system; };
+      mkNixos = { pkgs ? f, extraSystemConfig ? { } }:
+        import ../outputs/os.nix { inherit extraSystemConfig inputs pkgs system; };
+    };
   };
 
   treesitterGrammarsOverlay = f: p: {
@@ -52,12 +54,11 @@ let
       p.tree-sitter-comment
       p.tree-sitter-toml
       p.tree-sitter-make
-      # FIXME: typescript is broken at the minute
-      #p.tree-sitter-tsx
-      #p.tree-sitter-typescript
-      #p.tree-sitter-html
-      #p.tree-sitter-javascript
-      #p.tree-sitter-css
+      p.tree-sitter-tsx
+      p.tree-sitter-typescript
+      p.tree-sitter-html
+      p.tree-sitter-javascript
+      p.tree-sitter-css
       p.tree-sitter-graphql
       p.tree-sitter-json
       p.tree-sitter-smithy

diff --git a/outputs/hm.nix b/outputs/hm.nix
@@ -1,4 +1,4 @@
-{ extraImports, inputs, system, pkgs, ... }:
+{ extraHomeConfig, inputs, system, pkgs, ... }:
 
 with inputs;
 
@@ -7,7 +7,7 @@ let
     neovim-flake.homeManagerModules.${system}.default
     nix-index.homeManagerModules.${system}.default
     ({ nix.registry.nixpkgs.flake = inputs.nixpkgs; })
-    extraImports
+    extraHomeConfig
   ];
 
   mkXmonadHome = { hidpi }: