Compare commits

...

20 Commits

Author SHA1 Message Date
5cdf7648aa Refining harpoon2 keybindings and add telescope binding 2024-04-12 11:00:01 +02:00
ea22f5bef7 Refining package definitions for nvim nightly 2024-04-12 10:59:28 +02:00
bdf62f36ae Fixing php indentation 2024-04-12 10:30:47 +02:00
7d95e8b061 Merge branch 'office' of https://git.nussnougate.net/sevi-kun/nvim into office 2024-01-11 12:50:34 +01:00
36e050f50b add php back to treesitter after lost in rebase 2024-01-11 12:48:51 +01:00
54f4e12f04 Update 'lua/sevi-kun/set.lua'
Change wrap indicator to 95 (company standards)
2024-01-11 12:47:46 +01:00
f5c012f1c6 Rebase office branch to move to lazy. Additional minor fixes 2024-01-11 12:47:07 +01:00
91374acae5 add php back to treesitter after lost in rebase 2023-09-05 22:22:59 +02:00
c595443f97 Merge branch 'office' of git.nussnougate.net:sevi-kun/nvim into office 2023-09-05 22:09:41 +02:00
20e588f4a6 Add neorg fix for windows 2023-09-05 22:09:12 +02:00
b0c7e3e4e1 Update 'lua/sevi-kun/set.lua'
Change wrap indicator to 95 (company standards)
2023-09-05 22:09:12 +02:00
19cba86399 Added branch for office/windows environment 2023-09-05 22:09:12 +02:00
d3e9655b50 Add neorg fix for windows 2023-09-05 21:57:59 +02:00
607a6fb01a Merge branch 'office' of git.nussnougate.net:sevi-kun/nvim into office 2023-09-05 21:48:56 +02:00
741fe78cad Update 'lua/sevi-kun/set.lua'
Change wrap indicator to 95 (company standards)
2023-09-05 21:48:45 +02:00
6d60071768 Added branch for office/windows environment 2023-09-05 21:48:26 +02:00
8576c77886 Update 'lua/sevi-kun/set.lua'
Change wrap indicator to 95 (company standards)
2023-08-24 12:56:43 +02:00
c163e6a83b Merge branch 'office' of git.nussnougate.net:sevi-kun/nvim into office 2023-08-04 22:28:34 +02:00
1030d9da0a Added branch for office/windows environment 2023-08-04 22:26:11 +02:00
c51164f6e0 Added branch for office/windows environment 2023-08-04 07:36:32 +00:00
6 changed files with 65 additions and 49 deletions

View File

@ -1,13 +1,47 @@
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
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)
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", "<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" })

View File

@ -1,7 +0,0 @@
-- Note keymaps
vim.keymap.set("n", "<leader>ni", ":Neorg index<CR>")
vim.keymap.set("n", "<leader>nr", ":Neorg return<CR>")
vim.keymap.set("n", "<leader>nj", ":Neorg journal custom<CR>")
vim.keymap.set("n", "<leader>nim", ":Neorg inject-metadata<CR>")
vim.keymap.set("n", "<leader>nis", ":Neorg inject-metadata<CR>")

View File

@ -1,7 +1,7 @@
-- 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", "typescript", "c", "rust", "bash", "lua", "vim", "vimdoc", "query" },
ensure_installed = { "python", "javascript", "php", "typescript", "bash", "lua", "vim", "vimdoc", "query" },
-- Install parsers synchronously (only applied to `ensure_installed`)
sync_install = false,
@ -11,13 +11,10 @@ require'nvim-treesitter.configs'.setup {
auto_install = true,
highlight = {
enable = true,
enable = true,
},
-- Setting this to true will run `:h syntax` and tree-sitter at the same time.
-- Set this to `true` if you depend on 'syntax' being enabled (like for indentation).
-- Using this option may slow down your editor, and you may see some duplicate highlights.
-- Instead of true it can also be a list of languages
additional_vim_regex_highlighting = false,
indent = {
enable = true,
},
}

View File

@ -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",

View File

@ -17,51 +17,42 @@ return {
}
},
{ "nvim-telescope/telescope.nvim", version = "0.1.x",
{ "nvim-telescope/telescope.nvim",
version = "0.1.x",
dependencies = { "nvim-lua/plenary.nvim" }
},
{ "ThePrimeagen/harpoon",
version = "harpoon2",
dependencies = { "nvim-lua/plenary.nvim" },
branch = "harpoon2",
dependencies = {
"nvim-lua/plenary.nvim",
"nvim-telescope/telescope.nvim"
},
},
{ "NeogitOrg/neogit",
dependencies = { "nvim-lua/plenary.nvim" }
branch = "nightly",
dependencies = {
"nvim-lua/plenary.nvim",
"sindrets/diffview.nvim", -- optional - Diff integration
"nvim-telescope/telescope.nvim", -- optional
}
},
{ "stevearc/oil.nvim" },
{ "nvim-neorg/neorg",
version = "*",
build = ":Neorg sync-parsers",
dependencies = { "nvim-lua/plenary.nvim" },
config = function()
require("neorg").setup {
load = {
["core.defaults"] = {}, -- Loads default behaviour
["core.concealer"] = {}, -- Adds pretty icons to your documents
["core.dirman"] = { -- Manages Neorg workspaces
config = {
workspaces = {
notes = "~/Documents/Notes",
},
default_workspace = "notes",
},
},
},
}
end,
{ "stevearc/oil.nvim",
dependencies = { "nvim-tree/nvim-web-devicons" }
},
{ "kylechui/nvim-surround",
version = "*",
event = "VeryLazy",
config = function()
require("nvim-surround").setup()
end
},
{ "numToStr/Comment.nvim",
lazy = false,
config = function()
require("Comment").setup()
end
@ -78,11 +69,11 @@ return {
-- pretty
{ "navarasu/onedark.nvim",
{ "loctvl842/monokai-pro.nvim",
lazy = false,
priority = 1000,
config = function()
vim.cmd("colorscheme onedark")
vim.cmd("colorscheme monokai-pro")
end
},

View File

@ -3,6 +3,7 @@ vim.g.mapleader = " "
vim.opt.nu = true
vim.opt.relativenumber = true
vim.opt.ignorecase = true
vim.opt.cursorline = true
vim.opt.tabstop = 4
vim.opt.softtabstop = 4
@ -15,7 +16,7 @@ vim.opt.wrap = false
vim.opt.swapfile = false
vim.opt.backup = false
vim.opt.undodir = os.getenv("HOME") .. "/.vim/undodir"
vim.opt.undodir = os.getenv("LOCALAPPDATA") .. "\\nvim-data\\undodir"
vim.opt.undofile = true
vim.opt.hlsearch = true
@ -29,7 +30,7 @@ vim.opt.isfname:append("@-@")
vim.opt.updatetime = 50
vim.opt.colorcolumn = "80"
vim.opt.colorcolumn = "95"
vim.g.netrw_preview = 1
vim.g.netrw_liststyle = 3