diff --git a/hmModules/apps/neovim/app.nix b/hmModules/apps/neovim/app.nix index 4ef6b51..d655103 100644 --- a/hmModules/apps/neovim/app.nix +++ b/hmModules/apps/neovim/app.nix @@ -8,6 +8,7 @@ go.enable = lib.mkEnableOption "Enables go support"; nix.enable = lib.mkEnableOption "Enables nix support"; rust.enable = lib.mkEnableOption "Enables rust support"; + typescript.enable = lib.mkEnableOption "Enables typescript support"; }; themes = { catppuccin.enable = lib.mkEnableOption "Enables catppuccin theme"; @@ -118,6 +119,16 @@ go-nvim ]); + typescript-pkg = lopts cfgl.typescript.enable (with pkgs.vimPlugins; [ + { + plugin = typescript-tools-nvim; + type = "lua"; + config = '' + require("typescript-tools").setup {} + ''; + } + ]); + catppuccin-pkg = lopts cfgt.catppuccin.enable (with pkgs.vimPlugins; [ { plugin = catppuccin-nvim; @@ -151,8 +162,8 @@ ''; } ]); - in comments ++ fugitive ++ luasnip-pkg ++ lualine ++ - nix-pkg ++ rust-pkg ++ go-pkg ++ wiki ++ catppuccin-pkg; + in comments ++ fugitive ++ luasnip-pkg ++ lualine ++ nix-pkg ++ rust-pkg + ++ go-pkg ++ wiki ++ catppuccin-pkg ++ typescript-pkg; }; }; } diff --git a/hmModules/apps/neovim/plugin/treesitter.nix b/hmModules/apps/neovim/plugin/treesitter.nix index d1e9fe3..a6bb8c0 100644 --- a/hmModules/apps/neovim/plugin/treesitter.nix +++ b/hmModules/apps/neovim/plugin/treesitter.nix @@ -25,6 +25,7 @@ in { p.tree-sitter-go p.tree-sitter-nix p.tree-sitter-rust + p.tree-sitter-typescript ]; in with pkgs.vimPlugins; [ { diff --git a/hosts/onizuka/users/pan/user.nix b/hosts/onizuka/users/pan/user.nix index 2efdf12..bc112d7 100644 --- a/hosts/onizuka/users/pan/user.nix +++ b/hosts/onizuka/users/pan/user.nix @@ -58,6 +58,7 @@ c.enable = true; nix.enable = true; rust.enable = true; + typescript.enable = true; }; neovim.plugins = { comments.enable = true;