Merge branch 'master' of git.nussnougate.net:sevi-kun/nvim

Removing unneeded, adding all languages and fixing php indent

after/plugin/harpoon.lua

@@ -1,47 +1,13 @@
 local harpoon = require("harpoon")
 
 -- REQUIRED
-harpoon:setup({})
+harpoon:setup()
 -- REQUIRED
---
--- basic telescope configuration
-local conf = require("telescope.config").values
-local function toggle_telescope(harpoon_files)
-    local file_paths = {}
-    for _, item in ipairs(harpoon_files.items) do
-        table.insert(file_paths, item.value)
-    end
 
-    require("telescope.pickers").new({}, {
-        prompt_title = "Harpoon",
-        finder = require("telescope.finders").new_table({
-            results = file_paths,
-        }),
-        previewer = conf.file_previewer({}),
-        sorter = conf.generic_sorter({}),
-    }):find()
-end
-
-vim.keymap.set("n", "<leader>H", function() toggle_telescope(harpoon:list()) end,
-    { desc = "Open harpoon in telescope" })
-
-
-vim.keymap.set("n", "<leader>a", function() harpoon:list():add() end,
-    { desc = "Harpoon: Add current buffer" })
-vim.keymap.set("n", "<leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end,
-    { desc = "Harpoon: Toggle quick menu" })
+vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end)
+vim.keymap.set("n", "<leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
 
 vim.keymap.set("n", "<C-h>", function() harpoon:list():select(1) end)
 vim.keymap.set("n", "<C-j>", function() harpoon:list():select(2) end)
 vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) end)
 vim.keymap.set("n", "<C-l>", function() harpoon:list():select(4) end)
-vim.keymap.set("n", "<C-y>", function() harpoon:list():select(5) end)
-vim.keymap.set("n", "<C-u>", function() harpoon:list():select(6) end)
-vim.keymap.set("n", "<C-i>", function() harpoon:list():select(7) end)
-vim.keymap.set("n", "<C-o>", function() harpoon:list():select(8) end)
-
--- Toggle previous & next buffers stored within Harpoon list
-vim.keymap.set("n", "<C-S-P>", function() harpoon:list():prev() end,
-    { desc = "Harpoon: Previous buffer" })
-vim.keymap.set("n", "<C-S-N>", function() harpoon:list():next() end,
-    { desc = "Harpoon: Next buffer" })

after/plugin/treesitter.lua

@@ -1,8 +1,8 @@
 -- parsing and highlighting
 require'nvim-treesitter.configs'.setup {
   -- A list of parser names, or "all" (the five listed parsers should always be installed)
-  ensure_installed = { "python", "javascript", "php", "typescript", "bash", "lua", "vim", "vimdoc", "query" },
 
+  ensure_installed = 'all',
   -- Install parsers synchronously (only applied to `ensure_installed`)
   sync_install = false,
 
@@ -11,9 +11,10 @@ require'nvim-treesitter.configs'.setup {
   auto_install = true,
 
   highlight = {
-      enable = true,
+    enable = true,
   },
 
+  -- Needed because treesitter highlight turns off autoindent for php files
   indent = {
       enable = true,
   },

init.lua

@@ -1,6 +1,6 @@
 require("sevi-kun")
 
-local lazypath = vim.fn.stdpath("data") .. "\\lazy\\lazy.nvim"
+local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
 if not vim.loop.fs_stat(lazypath) then
   vim.fn.system({
     "git",

lua/sevi-kun/plugins.lua

@@ -17,42 +17,34 @@ return {
         }
     },
 
-    { "nvim-telescope/telescope.nvim", 
-        version = "0.1.x",
+    { "nvim-telescope/telescope.nvim", branch = "0.1.x",
         dependencies = { "nvim-lua/plenary.nvim" }
     },
 
     { "ThePrimeagen/harpoon",
     	branch = "harpoon2",
-        dependencies = { 
-            "nvim-lua/plenary.nvim",
-            "nvim-telescope/telescope.nvim"
-        },
+        dependencies = { "nvim-lua/plenary.nvim" },
     },
 
     { "NeogitOrg/neogit",
         branch = "nightly",
-        dependencies = { 
+        dependencies = {
             "nvim-lua/plenary.nvim",
-            "sindrets/diffview.nvim",        -- optional - Diff integration
-            "nvim-telescope/telescope.nvim", -- optional
+            "sindrets/diffview.nvim",
+            "nvim-telescope/telescope.nvim",
         }
     },
 
-    { "stevearc/oil.nvim",
-        dependencies = { "nvim-tree/nvim-web-devicons" }
-    },
+    { "stevearc/oil.nvim" },
 
     { "kylechui/nvim-surround",
         version = "*",
-        event = "VeryLazy",
         config = function()
             require("nvim-surround").setup()
         end
     },
 
     { "numToStr/Comment.nvim",
-        lazy = false,
         config = function()
             require("Comment").setup()
         end
@@ -69,11 +61,11 @@ return {
 
     -- pretty
 
-    { "loctvl842/monokai-pro.nvim",
+    { "navarasu/onedark.nvim",
         lazy = false,
         priority = 1000,
         config = function()
-            vim.cmd("colorscheme monokai-pro")
+            vim.cmd("colorscheme onedark")
         end
     },
 

lua/sevi-kun/set.lua

@@ -16,7 +16,7 @@ vim.opt.wrap = false
 
 vim.opt.swapfile = false
 vim.opt.backup = false
-vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir"
+vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
 vim.opt.undofile = true
 
 vim.opt.hlsearch = true
@@ -30,7 +30,7 @@ vim.opt.isfname:append("@-@")
 
 vim.opt.updatetime = 50
 
-vim.opt.colorcolumn = "95"
+vim.opt.colorcolumn = "80"
 
 vim.g.netrw_preview   = 1
 vim.g.netrw_liststyle = 3