Merge branch 'main' of labs.scarif.space:chris/nvim

lua/plugins/color.lua

@@ -10,21 +10,18 @@ return {
     },
     priority = 1000, -- Make sure to load this before all the other start plugins.
     config = function()
-
-        -- Check if wal directory exists otherwise use tokyo
-        local handle = io.popen('ls -d $HOME/.cache/wal 2>/dev/null')
-        local result = handle:read('*a')
-        handle:close()
-
-        if result == "" then
         ---@diagnostic disable-next-line: missing-fields
-            require('tokyonight').setup();
+        require('tokyonight').setup()
 
         vim.cmd.colorscheme 'tokyonight-night'
-            return
+
+        -- Check if wal directory exists otherwise use tokyo
+        local handle = io.popen 'ls -d $HOME/.cache/wal 2>/dev/null'
+        local result = handle:read '*a'
+        handle:close()
+
+        if result ~= '' then
+            require('pywal').setup()
         end
-
-        require('pywal').setup();
-
     end,
 }

lua/plugins/treesitter.lua

@@ -1,11 +1,11 @@
 -- Highlight, edit, and navigate code
 return {
     'nvim-treesitter/nvim-treesitter',
+    branch = 'main',
     build = ':TSUpdate',
-    -- main = 'nvim-treesitter.configs', -- Sets main module to use for opts
     -- [[ Configure Treesitter ]] See `:help nvim-treesitter`
-    opts = {
-        ensure_installed = {
+    config = function()
+        local langs = {
             'bash',
             'c',
             'diff',
@@ -17,22 +17,16 @@ return {
             'query',
             'vim',
             'vimdoc',
-        },
-        -- Autoinstall languages that are not installed
-        auto_install = true,
-        highlight = {
-            enable = true,
-            -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
-            --  If you are experiencing weird indenting issues, add the language to
-            --  the list of additional_vim_regex_highlighting and disabled languages for indent.
-            additional_vim_regex_highlighting = { 'ruby' },
-        },
-        indent = { enable = true, disable = { 'ruby' } },
-    },
-    -- There are additional nvim-treesitter modules that you can use to interact
-    -- with nvim-treesitter. You should go explore a few and see what interests you:
-    --
-    --    - Incremental selection: Included, see `:help nvim-treesitter-incremental-selection-mod`
-    --    - Show your current context: https://github.com/nvim-treesitter/nvim-treesitter-context
-    --    - Treesitter + textobjects: https://github.com/nvim-treesitter/nvim-treesitter-textobjects
+            'php',
+            'yaml',
+        }
+        require('nvim-treesitter').install(langs)
+
+        vim.api.nvim_create_autocmd('FileType', {
+            pattern = langs,
+            callback = function()
+                vim.treesitter.start()
+            end,
+        })
+    end,
 }