aboutsummaryrefslogtreecommitdiff
path: root/.config/nvim/lua
diff options
context:
space:
mode:
Diffstat (limited to '.config/nvim/lua')
-rw-r--r--.config/nvim/lua/autocomplete.lua27
-rw-r--r--.config/nvim/lua/lsp.lua32
-rw-r--r--.config/nvim/lua/map.lua28
-rw-r--r--.config/nvim/lua/plugin.lua71
-rw-r--r--.config/nvim/lua/plugin/autopairs.lua13
-rw-r--r--.config/nvim/lua/plugin/lsp.lua48
-rw-r--r--.config/nvim/lua/plugin/lualine.lua7
-rw-r--r--.config/nvim/lua/plugin/presence.lua20
-rw-r--r--.config/nvim/lua/plugin/telescope.lua7
-rw-r--r--.config/nvim/lua/plugin/treesitter.lua9
-rw-r--r--.config/nvim/lua/plugin_conf.lua65
-rw-r--r--.config/nvim/lua/pluginconf.lua3
-rw-r--r--.config/nvim/lua/plugins.lua43
-rw-r--r--.config/nvim/lua/remapping.lua42
-rw-r--r--.config/nvim/lua/set.lua9
15 files changed, 210 insertions, 214 deletions
diff --git a/.config/nvim/lua/autocomplete.lua b/.config/nvim/lua/autocomplete.lua
deleted file mode 100644
index 96495c4..0000000
--- a/.config/nvim/lua/autocomplete.lua
+++ /dev/null
@@ -1,27 +0,0 @@
-local cmp = require("cmp")
-
-cmp.setup({
- snippet = {
- expand = function(args)
- vim.fn["vsnip#anonymous"](args.body) -- For `vsnip` users.
- end,
- },
- mapping = {
- ['<C-b>'] = cmp.mapping(cmp.mapping.scroll_docs(-4), { 'i', 'c' }),
- ['<C-f>'] = cmp.mapping(cmp.mapping.scroll_docs(4), { 'i', 'c' }),
- ['<C-Space>'] = cmp.mapping(cmp.mapping.complete(), { 'i', 'c' }),
- ['<C-y>'] = cmp.config.disable,
- ['<C-e>'] = cmp.mapping({
- i = cmp.mapping.abort(),
- c = cmp.mapping.close(),
- }),
- ['<tab>'] = cmp.mapping.confirm({ select = true }),
- },
- sources = cmp.config.sources({
- { name = 'nvim_lsp' },
- { name = 'vsnip' },
- }, {
- { name = 'buffer' },
- })
-})
-
diff --git a/.config/nvim/lua/lsp.lua b/.config/nvim/lua/lsp.lua
deleted file mode 100644
index 92c7b0e..0000000
--- a/.config/nvim/lua/lsp.lua
+++ /dev/null
@@ -1,32 +0,0 @@
-local lsp = require("lspconfig")
-
-local capabilities = require("cmp_nvim_lsp").default_capabilities(
- vim.lsp.protocol.make_client_capabilities())
-
-lsp.lua_ls.setup({
- capabilities=capabilities,
- Lua = {
- runtime = {
- version = "LuaJIT",
- },
- telementry = {
- enable = false,
- }
- }
-})
-
-lsp.clangd.setup {
- capabilities=capabilities,
-}
-
-lsp.cmake.setup {}
-
-lsp.gdscript.setup {}
-
-lsp.rust_analyzer.setup({
- capabilities=capabilities,
- settings = {
- ["rust-analyzer"] = {},
- },
-})
-
diff --git a/.config/nvim/lua/map.lua b/.config/nvim/lua/map.lua
new file mode 100644
index 0000000..9784d79
--- /dev/null
+++ b/.config/nvim/lua/map.lua
@@ -0,0 +1,28 @@
+vim.keymap.set("i", "jk", "<escape>", {})
+-- vim.keymap.set("n", "<leader>n", [[:NvimTreeToggle<cr>]], {})
+vim.keymap.set("n", "<leader>n", [[:Ex<cr>]], {})
+vim.keymap.set("n", "<leader>g", [[:Git<cr>]], {})
+vim.keymap.set("n", "<leader>to", [[:TermOpen<cr><cr>]], {})
+vim.keymap.set("n", "<leader>c", [[:noh<cr>]], {})
+vim.keymap.set("n", "<leader>zm", [[:ZenMode<CR>]], {})
+
+vim.keymap.set("n", "<C-h>", "<C-w>h", {})
+vim.keymap.set("n", "<C-j>", "<C-w>j", {})
+vim.keymap.set("n", "<C-k>", "<C-w>k", {})
+vim.keymap.set("n", "<C-l>", "<C-w>l", {})
+
+vim.keymap.set("n", "<up>", "<C-u>zz", {})
+vim.keymap.set("n", "<down>", "<C-d>zz", {})
+
+vim.keymap.set("o", "as", "a\"", {})
+vim.keymap.set("o", "is", "i\"", {})
+vim.keymap.set("o", "it", "i[", {})
+vim.keymap.set("o", "at", "a[", {})
+vim.keymap.set("o", "ic", "i<", {})
+vim.keymap.set("o", "ac", "a<", {})
+
+vim.keymap.set("n", "<leader>y", "\"+y")
+vim.keymap.set("v", "<leader>y", "\"+y")
+
+vim.keymap.set("t", "<escape>", "<C-\\><C-n>", {})
+vim.keymap.set("t", "jk", "<C-\\><C-n>", {})
diff --git a/.config/nvim/lua/plugin.lua b/.config/nvim/lua/plugin.lua
new file mode 100644
index 0000000..f409c9c
--- /dev/null
+++ b/.config/nvim/lua/plugin.lua
@@ -0,0 +1,71 @@
+
+return require("packer").startup(function(use)
+ use 'wbthomason/packer.nvim'
+
+ use { "ThePrimeagen/vim-be-good" }
+
+ use {
+ "kyazdani42/nvim-tree.lua",
+ requires = "kyazdani42/nvim-web-devicons"
+ }
+
+ use {
+ "nvim-telescope/telescope.nvim",
+ requires = { { "nvim-lua/plenary.nvim" } }
+ }
+
+ use { "majutsushi/tagbar" }
+ use { "Yggdroot/indentLine" }
+ use { "windwp/nvim-autopairs" }
+ use { "airblade/vim-gitgutter" }
+
+ use { "weedatom/presence.nvim" }
+ use { "mhinz/vim-startify" }
+ use { "DanilaMihailov/beacon.nvim" }
+ use {
+ "nvim-lualine/lualine.nvim",
+ requires = { "kyazdani42/nvim-web-devicons", opt = true }
+ }
+ use { "numToStr/Comment.nvim" }
+ use { "folke/zen-mode.nvim" }
+
+ use {
+ 'VonHeikemen/lsp-zero.nvim',
+ requires = {
+ -- LSP Support
+ {'neovim/nvim-lspconfig'},
+ {'williamboman/mason.nvim'},
+ {'williamboman/mason-lspconfig.nvim'},
+
+ -- Autocompletion
+ {'hrsh7th/nvim-cmp'},
+ {'hrsh7th/cmp-buffer'},
+ {'hrsh7th/cmp-path'},
+ {'saadparwaiz1/cmp_luasnip'},
+ {'hrsh7th/cmp-nvim-lsp'},
+ {'hrsh7th/cmp-nvim-lua'},
+
+ -- Snippets
+ {'L3MON4D3/LuaSnip'},
+ {'rafamadriz/friendly-snippets'},
+ }
+ }
+
+ use {
+ "loctvl842/monokai-pro.nvim",
+ config = function()
+ vim.cmd("colorscheme monokai-pro")
+ end
+ }
+ use {
+ "catppuccin/nvim",
+ as = "catppuccin",
+ }
+
+ use {
+ "nvim-treesitter/nvim-treesitter",
+ run = ":TSUpdate"
+ }
+ use("nvim-treesitter/playground")
+end)
+
diff --git a/.config/nvim/lua/plugin/autopairs.lua b/.config/nvim/lua/plugin/autopairs.lua
new file mode 100644
index 0000000..c30a37d
--- /dev/null
+++ b/.config/nvim/lua/plugin/autopairs.lua
@@ -0,0 +1,13 @@
+
+require("nvim-autopairs").setup {
+ fast_wrap = {
+ map = "<M-e>",
+ chars = { "{", "[", "(", "\"", "'" },
+ pattern = [=[[%"%"%>%]%)%}%,]]=],
+ end_key = "$",
+ keys = "qwertyuiopzxcvbnmasdfghjkl",
+ check_comma = true,
+ highlight = "Search",
+ highlight_grey="Comment"
+ }
+}
diff --git a/.config/nvim/lua/plugin/lsp.lua b/.config/nvim/lua/plugin/lsp.lua
new file mode 100644
index 0000000..1cce12f
--- /dev/null
+++ b/.config/nvim/lua/plugin/lsp.lua
@@ -0,0 +1,48 @@
+local lsp = require("lsp-zero")
+local lspconfig = require("lspconfig")
+
+lsp.preset("recommended")
+
+lsp.ensure_installed {
+ "lua_ls",
+ "clangd",
+ "cmake",
+ "rust_analyzer",
+}
+
+lspconfig.gdscript.setup {}
+
+local cmp = require("cmp")
+local cmp_select = { behavior = cmp.SelectBehavior.Select }
+local cmp_mappings = lsp.defaults.cmp_mappings {
+ ["<down>"] = cmp.mapping.select_next_item(cmp_select),
+ ["<up>"] = cmp.mapping.select_prev_item(cmp_select),
+ ["<C-a>"] = cmp.mapping.confirm({ select = true }),
+ ["<CR>"] = cmp.mapping.confirm({ select = true }),
+}
+
+lsp.setup_nvim_cmp {
+ mapping = cmp_mappings
+}
+
+lsp.set_preferences {
+ suggest_lsp_servers = false,
+ sign_icons = {
+ error = "E",
+ warn = "W",
+ hint = "H",
+ info = "I",
+ }
+}
+
+lsp.on_attach(function(_, buffer)
+ local opts = { buffer=buffer, remap=false }
+
+ vim.keymap.set("n", "<leader>ld", function() vim.lsp.buf.definition() end, opts)
+end)
+
+lsp.setup()
+
+vim.diagnostic.config {
+ virtual_text = true
+}
diff --git a/.config/nvim/lua/plugin/lualine.lua b/.config/nvim/lua/plugin/lualine.lua
new file mode 100644
index 0000000..81071ec
--- /dev/null
+++ b/.config/nvim/lua/plugin/lualine.lua
@@ -0,0 +1,7 @@
+
+require("lualine").setup {
+ options = {
+ component_separators = { left = "", right = "" },
+ section_separators = { left = "", right = "" },
+ },
+}
diff --git a/.config/nvim/lua/plugin/presence.lua b/.config/nvim/lua/plugin/presence.lua
new file mode 100644
index 0000000..46369be
--- /dev/null
+++ b/.config/nvim/lua/plugin/presence.lua
@@ -0,0 +1,20 @@
+require("presence").setup{
+ auto_update = true,
+ neovim_image_text = "The One True Text Editor",
+ main_image = "neovim",
+ log_level = nil,
+ debounce_timeout = 10,
+ enable_line_number = false,
+ blacklist = {},
+ buttons = true,
+ file_assets = {},
+ show_time = true,
+
+ editing_text = "Editing %s",
+ file_explorer_text = "Browsing %s",
+ git_commit_text = "Committing changes",
+ plugin_manager_text = "Managing plugins",
+ reading_text = "Reading %s",
+ workspace_text = "Working on %s",
+ line_number_text = "Line %s out of %s",
+}
diff --git a/.config/nvim/lua/plugin/telescope.lua b/.config/nvim/lua/plugin/telescope.lua
new file mode 100644
index 0000000..d5bea56
--- /dev/null
+++ b/.config/nvim/lua/plugin/telescope.lua
@@ -0,0 +1,7 @@
+local builtin = require("telescope.builtin")
+vim.keymap.set("n", "<leader>ff", builtin.find_files, {})
+vim.keymap.set("n", "<leader>fg", builtin.git_files, {})
+vim.keymap.set("n", "<leader>fs", function()
+ builtin.grep_string({ search = vim.fn.input("grep>") })
+end)
+
diff --git a/.config/nvim/lua/plugin/treesitter.lua b/.config/nvim/lua/plugin/treesitter.lua
new file mode 100644
index 0000000..a6a4bf8
--- /dev/null
+++ b/.config/nvim/lua/plugin/treesitter.lua
@@ -0,0 +1,9 @@
+require("nvim-treesitter.configs").setup {
+ ensure_installed = { "c", "rust", "lua", "vimdoc" },
+ sync_install = false,
+ highlight = {
+ enable = true,
+ additional_vim_regex_highlighting = true,
+ },
+ indent = { enable = true },
+}
diff --git a/.config/nvim/lua/plugin_conf.lua b/.config/nvim/lua/plugin_conf.lua
deleted file mode 100644
index 53f0929..0000000
--- a/.config/nvim/lua/plugin_conf.lua
+++ /dev/null
@@ -1,65 +0,0 @@
-require("nvim-tree").setup{}
-
-require("lualine").setup {
- options = {
- icons_enabled = false,
- -- theme = "dracula-nvim",
- component_separators = { left = " ", right = " "},
- section_separators = { left = " ", right = " "},
- disabled_filetypes = {
- statusline = {},
- winbar = {},
- },
- ignore_focus = {},
- always_divide_middle = true,
- globalstatus = false,
- refresh = {
- statusline = 1000,
- tabline = 1000,
- winbar = 1000,
- }
- },
- sections = {
- lualine_a = {"mode"},
- lualine_b = {"branch", "diff", "diagnostics"},
- lualine_c = {"filename"},
- lualine_x = {"encoding", "fileformat", "filetype"},
- lualine_y = {"progress"},
- lualine_z = {"location"}
- },
- inactive_sections = {
- lualine_a = {},
- lualine_b = {},
- lualine_c = {"filename"},
- lualine_x = {"location"},
- lualine_y = {},
- lualine_z = {}
- },
- tabline = {},
- winbar = {},
- inactive_winbar = {},
- extensions = {}
-}
-
-require("nvim-autopairs").setup {
- fast_wrap = {
- map = "<M-e>",
- chars = { "{", "[", "(", "\"", "'" },
- pattern = [=[[%"%"%>%]%)%}%,]]=],
- end_key = "$",
- keys = "qwertyuiopzxcvbnmasdfghjkl",
- check_comma = true,
- highlight = "Search",
- highlight_grey="Comment"
- }
-}
-
-require("barbar").setup {}
-
-require("terminal").setup{
- layout = { open_cmd = "botright new" },
- cmd = { vim.o.shell },
- autoclose = false,
-}
-
-require("Comment").setup {}
diff --git a/.config/nvim/lua/pluginconf.lua b/.config/nvim/lua/pluginconf.lua
new file mode 100644
index 0000000..38f6382
--- /dev/null
+++ b/.config/nvim/lua/pluginconf.lua
@@ -0,0 +1,3 @@
+-- require("nvim-tree").setup {}
+require("Comment").setup {}
+require("zen-mode").setup {}
diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua
deleted file mode 100644
index 39cb8c0..0000000
--- a/.config/nvim/lua/plugins.lua
+++ /dev/null
@@ -1,43 +0,0 @@
-return require("packer").startup(function(use)
- use { "ThePrimeagen/vim-be-good" }
-
- use {
- "kyazdani42/nvim-tree.lua",
- requires = "kyazdani42/nvim-web-devicons"
- }
-
- use {
- "nvim-telescope/telescope.nvim",
- requires = { { "nvim-lua/plenary.nvim" } }
- }
-
- use {
- "rebelot/terminal.nvim",
- }
-
- use { "neovim/nvim-lspconfig" }
-
- use { "majutsushi/tagbar" }
- use { "Yggdroot/indentLine" }
- use { "tpope/vim-fugitive" }
- use { "junegunn/gv.vim" }
- use { "windwp/nvim-autopairs" }
-
- use { "mhinz/vim-startify" }
- use { "DanilaMihailov/beacon.nvim" }
- use {
- "nvim-lualine/lualine.nvim",
- requires = { "kyazdani42/nvim-web-devicons", opt = true }
- }
- use { "numToStr/Comment.nvim" }
- use { "romgrk/barbar.nvim" }
-
- use { "hrsh7th/cmp-nvim-lsp" }
- use { "hrsh7th/cmp-buffer" }
- use { "hrsh7th/cmp-path" }
- use { "hrsh7th/cmp-cmdline" }
- use { "hrsh7th/nvim-cmp" }
- use { "hrsh7th/vim-vsnip" }
-
- use { "loctvl842/monokai-pro.nvim" }
-end)
diff --git a/.config/nvim/lua/remapping.lua b/.config/nvim/lua/remapping.lua
deleted file mode 100644
index b59a504..0000000
--- a/.config/nvim/lua/remapping.lua
+++ /dev/null
@@ -1,42 +0,0 @@
-vim.g.mapleader = " "
-
-vim.keymap.set("i", "jk", "<escape>", {})
-vim.keymap.set("n", "<leader>n", [[:NvimTreeToggle<cr>]], {})
-vim.keymap.set("n", "<leader>f", [[:Telescope find_files<cr>]], {})
-vim.keymap.set("n", "<leader>g", [[:Git<cr>]], {})
-vim.keymap.set("n", "<leader>to", [[:TermOpen<cr><cr>]], {})
-vim.keymap.set("n", "<leader>c", [[:noh<cr>]], {})
-
-vim.keymap.set("n", "<C-h>", "<C-w>h", {})
-vim.keymap.set("n", "<C-j>", "<C-w>j", {})
-vim.keymap.set("n", "<C-k>", "<C-w>k", {})
-vim.keymap.set("n", "<C-l>", "<C-w>l", {})
-
-vim.keymap.set("n", "<up>", "<C-u>zz", {})
-vim.keymap.set("n", "<down>", "<C-d>zz", {})
-
-vim.keymap.set("o", "as", "a\"", {})
-vim.keymap.set("o", "is", "i\"", {})
-vim.keymap.set("o", "it", "i[", {})
-vim.keymap.set("o", "at", "a[", {})
-vim.keymap.set("o", "ic", "i<", {})
-vim.keymap.set("o", "ac", "a<", {})
-
-vim.keymap.set("t", "<escape>", "<C-\\><C-n>", {})
-vim.keymap.set("t", "jk", "<C-\\><C-n>", {})
-
-vim.keymap.set("n", "<leader>1", ":BufferGoto 1<CR>", {})
-vim.keymap.set("n", "<leader>2", ":BufferGoto 2<CR>", {})
-vim.keymap.set("n", "<leader>3", ":BufferGoto 3<CR>", {})
-vim.keymap.set("n", "<leader>4", ":BufferGoto 4<CR>", {})
-vim.keymap.set("n", "<leader>5", ":BufferGoto 5<CR>", {})
-vim.keymap.set("n", "<leader>6", ":BufferGoto 6<CR>", {})
-vim.keymap.set("n", "<leader>7", ":BufferGoto 7<CR>", {})
-vim.keymap.set("n", "<leader>8", ":BufferGoto 8<CR>", {})
-vim.keymap.set("n", "<leader>9", ":BufferGoto 9<CR>", {})
-vim.keymap.set("n", "<leader>0", ":BufferLast<CR>", {})
-
-vim.keymap.set("n", "<leader>ww", ":BufferClose!<CR>", {})
-vim.keymap.set("n", "<leader>wa", ":BufferCloseAllButCurrent<CR>", {})
-vim.keymap.set("n", "<leader>wu", ":BufferRestore<CR>", {})
-vim.keymap.set("n", "<leader>wl", ":BufferLast<CR>", {})
diff --git a/.config/nvim/lua/set.lua b/.config/nvim/lua/set.lua
index 1f358e0..88816af 100644
--- a/.config/nvim/lua/set.lua
+++ b/.config/nvim/lua/set.lua
@@ -13,15 +13,14 @@ vim.opt.ignorecase = true
vim.opt.smartcase = true
vim.opt.incsearch = true
+local tabwidth = 2
vim.opt.expandtab = true
-vim.opt.shiftwidth = 2
-vim.opt.softtabstop = 2
-vim.opt.tabstop = 2
+vim.opt.shiftwidth = tabwidth
+vim.opt.softtabstop = tabwidth
+vim.opt.tabstop = tabwidth
vim.opt.splitright = true
vim.opt.splitbelow = true
vim.opt.cc = "80"
vim.opt.mouse = ""
-
-vim.api.nvim_command("colorscheme monokai-pro-spectrum")
generated by cgit v1.3-2-g0d8e (git 2.53.0) at 2026-06-06 10:20:04 +0000