use treesitter language injection

ners · Jan 9, 2024 · accb305 · accb305
1 parent 2477485
commit accb305
Show file tree

Hide file tree

Showing 12 changed files with 16 additions and 14 deletions.
diff --git a/modules/home/neovim/default.nix b/modules/home/neovim/default.nix
@@ -12,11 +12,11 @@ with lib;
     vimdiffAlias = true;
     withNodeJs = true;
     withPython3 = true;
-    extraConfig = mkBefore ''
+    extraConfig = mkBefore /*vim*/ ''
       syntax on
       command W w
     '';
-    extraLuaConfig = mkBefore ''
+    extraLuaConfig = mkBefore /*lua*/ ''
       -- bytecompile lua modules
       vim.loader.enable()
 

diff --git a/modules/home/neovim/plugins/autopairs.nix b/modules/home/neovim/plugins/autopairs.nix
@@ -5,7 +5,7 @@
     {
       plugin = pkgs.vimPlugins.nvim-autopairs;
       type = "lua";
-      config = ''
+      config = /*lua*/ ''
         require('nvim-autopairs').setup({})
       '';
     }

diff --git a/modules/home/neovim/plugins/base16.nix b/modules/home/neovim/plugins/base16.nix
@@ -5,7 +5,7 @@
     {
       plugin = pkgs.vimPlugins.nvim-base16;
       type = "viml";
-      config = ''
+      config = /*vim*/ ''
         colorscheme base16-default-dark
       '';
     }

diff --git a/modules/home/neovim/plugins/gitsigns.nix b/modules/home/neovim/plugins/gitsigns.nix
@@ -5,7 +5,7 @@
     {
       plugin = pkgs.vimPlugins.gitsigns-nvim;
       type = "lua";
-      config = ''
+      config = /*lua*/ ''
         require('gitsigns').setup({})
       '';
     }

diff --git a/modules/home/neovim/plugins/hlslens.nix b/modules/home/neovim/plugins/hlslens.nix
@@ -5,7 +5,7 @@
     {
       plugin = nvim-hlslens;
       type = "lua";
-      config = ''
+      config = /*lua*/ ''
         require("hlslens").setup()
       '';
     }

diff --git a/modules/home/neovim/plugins/illuminate.nix b/modules/home/neovim/plugins/illuminate.nix
@@ -5,7 +5,7 @@
     {
       plugin = vim-illuminate;
       type = "lua";
-      config = ''
+      config = /*lua*/ ''
         require('illuminate').configure({})
       '';
     }

diff --git a/modules/home/neovim/plugins/lsp.nix b/modules/home/neovim/plugins/lsp.nix
@@ -10,7 +10,7 @@
     {
       plugin = lsp_lines-nvim;
       type = "lua";
-      config = ''
+      config = /*lua*/ ''
         -- Disable virtual_text since it's redundant due to lsp_lines.
         vim.diagnostic.config({
           virtual_text = false,

diff --git a/modules/home/neovim/plugins/nix.nix b/modules/home/neovim/plugins/nix.nix
@@ -3,11 +3,11 @@
 {
   home.packages = with pkgs; [ nil nixpkgs-fmt ];
 
-  programs.neovim.extraLuaConfig = ''
+  programs.neovim.extraLuaConfig = /*lua*/ ''
     require('lspconfig').nil_ls.setup({})
   '';
 
-  xdg.configFile."nvim/ftplugin/nix.lua".text = ''
+  xdg.configFile."nvim/ftplugin/nix.lua".text = /*lua*/ ''
     vim.bo.expandtab = true
     vim.bo.shiftwidth = 2
     vim.bo.softtabstop = 2

diff --git a/modules/home/neovim/plugins/scrollbar.nix b/modules/home/neovim/plugins/scrollbar.nix
@@ -5,7 +5,7 @@
     {
       plugin = nvim-scrollbar;
       type = "lua";
-      config = ''
+      config = /*lua*/ ''
         require("scrollbar").setup()
         require("scrollbar.handlers.search").setup()
       '';

diff --git a/modules/home/neovim/plugins/treesitter/default.nix b/modules/home/neovim/plugins/treesitter/default.nix
@@ -13,7 +13,9 @@
     {
       plugin = nvim-treesitter-context;
       type = "lua";
-      config = "require('treesitter-context').setup({})";
+      config = /*lua*/ ''
+        require('treesitter-context').setup({})
+      '';
     }
   ];
 }
diff --git a/modules/home/zsh/default.nix b/modules/home/zsh/default.nix
@@ -8,7 +8,7 @@
 
   programs.zsh = {
     enable = true;
-    initExtra = ''
+    initExtra = /*bash*/ ''
       source "${pkgs.zsh-syntax-highlighting}/share/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh"
       source "${pkgs.zsh-history-substring-search}/share/zsh-history-substring-search/zsh-history-substring-search.zsh"
       source "${pkgs.zsh-autosuggestions}/share/zsh-autosuggestions/zsh-autosuggestions.zsh"

diff --git a/modules/profiles/fonts.nix b/modules/profiles/fonts.nix
@@ -46,7 +46,7 @@ in
         emoji = [ "Noto Color Emoji" ];
       };
 
-      fontconfig.localConf = ''
+      fontconfig.localConf = /*xml*/ ''
         <?xml version="1.0"?>
         <!DOCTYPE fontconfig SYSTEM "fonts.dtd">
         <fontconfig>