Compare commits

..

4 Commits

Author SHA1 Message Date
0009f09e82 Updating treesitter config
Removing unneeded, adding all languages and fixing php indent
2024-02-28 14:48:36 +01:00
ae1e337895 Highlight current line 2024-01-11 12:41:46 +01:00
947d04c265 fix harpoon - lazy - version to branch 2024-01-11 12:37:33 +01:00
3d987091c6 remove neorg as not needed 2024-01-10 22:53:36 +01:00
5 changed files with 15 additions and 61 deletions

View File

@ -1,47 +1,13 @@
local harpoon = require("harpoon") local harpoon = require("harpoon")
-- REQUIRED -- REQUIRED
harpoon:setup({}) harpoon:setup()
-- REQUIRED -- 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({}, { vim.keymap.set("n", "<leader>a", function() harpoon:list():append() end)
prompt_title = "Harpoon", vim.keymap.set("n", "<leader>h", function() harpoon.ui:toggle_quick_menu(harpoon:list()) end)
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", "<C-h>", function() harpoon:list():select(1) 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-j>", function() harpoon:list():select(2) end)
vim.keymap.set("n", "<C-k>", function() harpoon:list():select(3) 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-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" })

View File

@ -1,8 +1,8 @@
-- parsing and highlighting -- parsing and highlighting
require'nvim-treesitter.configs'.setup { require'nvim-treesitter.configs'.setup {
-- A list of parser names, or "all" (the five listed parsers should always be installed) -- 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`) -- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false, sync_install = false,
@ -14,6 +14,7 @@ require'nvim-treesitter.configs'.setup {
enable = true, enable = true,
}, },
-- Needed because treesitter highlight turns off autoindent for php files
indent = { indent = {
enable = true, enable = true,
}, },

View File

@ -1,6 +1,6 @@
require("sevi-kun") 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 if not vim.loop.fs_stat(lazypath) then
vim.fn.system({ vim.fn.system({
"git", "git",

View File

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

View File

@ -16,7 +16,7 @@ vim.opt.wrap = false
vim.opt.swapfile = false vim.opt.swapfile = false
vim.opt.backup = 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.undofile = true
vim.opt.hlsearch = true vim.opt.hlsearch = true
@ -30,7 +30,7 @@ vim.opt.isfname:append("@-@")
vim.opt.updatetime = 50 vim.opt.updatetime = 50
vim.opt.colorcolumn = "95" vim.opt.colorcolumn = "80"
vim.g.netrw_preview = 1 vim.g.netrw_preview = 1
vim.g.netrw_liststyle = 3 vim.g.netrw_liststyle = 3