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

lua/autocmd.lua

@@ -196,6 +196,7 @@ vim.api.nvim_create_autocmd('SwapExists', {
                                     local add_cmd = " add -A"
                                     os.execute(git_base .. add_cmd)
                                     os.execute(git_base .. " commit -m " .. vim.fn.shellescape(msg))
+                                    os.execute(git_base .. " push")
                                     print("\nChanges committed.")
                                 end
                             end

lua/plugins/color.lua

@@ -4,19 +4,24 @@ return {
     -- change the command in the config to whatever the name of that colorscheme is.
     --
     -- If you want to see what colorschemes are already installed, you can use `:Telescope colorscheme`.
+    'AlphaTechnolog/pywal.nvim',
+    dependencies = {
         'folke/tokyonight.nvim',
+    },
     priority = 1000, -- Make sure to load this before all the other start plugins.
     config = function()
         ---@diagnostic disable-next-line: missing-fields
-        require('tokyonight').setup {
+        require('tokyonight').setup()
-            styles = {
-                comments = { italic = false }, -- Disable italics in comments
-            },
-        }
 
-        -- Load the colorscheme here.
-        -- Like many other themes, this one has different styles, and you could load
-        -- any other, such as 'tokyonight-storm', 'tokyonight-moon', or 'tokyonight-day'.
         vim.cmd.colorscheme 'tokyonight-night'
+
+        -- 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
     end,
 }

lua/plugins/pywal.lua

@@ -0,0 +1,3 @@
+return {
+    'AlphaTechnolog/pywal.nvim',
+}

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 = {
+    config = function()
-        ensure_installed = {
+        local langs = {
             'bash',
             'c',
             'diff',
@@ -17,22 +17,16 @@ return {
             'query',
             'vim',
             'vimdoc',
-        },
+            'php',
-        -- Autoinstall languages that are not installed
+            'yaml',
-        auto_install = true,
+        }
-        highlight = {
+        require('nvim-treesitter').install(langs)
-            enable = true,
+
-            -- Some languages depend on vim's regex highlighting system (such as Ruby) for indent rules.
+        vim.api.nvim_create_autocmd('FileType', {
-            --  If you are experiencing weird indenting issues, add the language to
+            pattern = langs,
-            --  the list of additional_vim_regex_highlighting and disabled languages for indent.
+            callback = function()
-            additional_vim_regex_highlighting = { 'ruby' },
+                vim.treesitter.start()
-        },
+            end,
-        indent = { enable = true, disable = { 'ruby' } },
+        })
-    },
+    end,
-    -- 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
 }

lua/snippets/javascript.lua

@@ -43,7 +43,7 @@ return {
     s(etr('return ', 'Add semicolon after return'), fmta('return #~;', { i(0) })),
     s(etr('rt ', 'return alias'), fmta('return #~;', { i(0) })),
 
-    s(etr('const', 'const declaration'), {
+    s(etr('const ', 'const declaration'), {
         c(1, {
             sn(nil, fmta('const #~ = #~;', { i(1, 'variableName'), i(2, 'value') })),
             sn(