summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorKyren223 <ulmliad223@gmail.com>2024-06-26 19:54:00 +0300
committerKyren223 <ulmliad223@gmail.com>2024-06-26 19:54:00 +0300
commite3896e07385cbc1327dcd23e1e28ca17f710b709 (patch)
tree326a0b88b1d864c991b7e3ab73545e61bca98353
parent1062f6935d84409dc8b2498d4cb38e1e3aee465a (diff)
Accidentally placed the nvim files in the wrong place, fixed now
-rw-r--r--.config/nvim/lua/autocmds.lua (renamed from .config/nvim/nvim/lua/autocmds.lua)0
-rw-r--r--.config/nvim/lua/keymaps.lua (renamed from .config/nvim/nvim/lua/keymaps.lua)0
-rw-r--r--.config/nvim/lua/plugins/autopair.lua (renamed from .config/nvim/nvim/lua/plugins/autopair.lua)0
-rw-r--r--.config/nvim/lua/plugins/completions.lua (renamed from .config/nvim/nvim/lua/plugins/completions.lua)0
-rw-r--r--.config/nvim/lua/plugins/indent-blankline.lua (renamed from .config/nvim/nvim/lua/plugins/indent-blankline.lua)0
-rw-r--r--.config/nvim/lua/plugins/lazydev.lua (renamed from .config/nvim/nvim/lua/plugins/lazydev.lua)0
-rw-r--r--.config/nvim/lua/plugins/lsp.lua47
-rw-r--r--.config/nvim/lua/plugins/neotree.lua2
-rw-r--r--.config/nvim/nvim/init.lua20
-rw-r--r--.config/nvim/nvim/lua/options.lua62
-rw-r--r--.config/nvim/nvim/lua/plugins.lua2
-rw-r--r--.config/nvim/nvim/lua/plugins/alpha.lua51
-rw-r--r--.config/nvim/nvim/lua/plugins/catppuccin.lua9
-rw-r--r--.config/nvim/nvim/lua/plugins/lsp.lua52
-rw-r--r--.config/nvim/nvim/lua/plugins/lualine.lua10
-rw-r--r--.config/nvim/nvim/lua/plugins/neotree.lua13
-rw-r--r--.config/nvim/nvim/lua/plugins/none-ls.lua13
-rw-r--r--.config/nvim/nvim/lua/plugins/telescope.lua33
-rw-r--r--.config/nvim/nvim/lua/plugins/tokyonight.lua8
-rw-r--r--.config/nvim/nvim/lua/plugins/treesitter.lua12
20 files changed, 12 insertions, 322 deletions
diff --git a/.config/nvim/nvim/lua/autocmds.lua b/.config/nvim/lua/autocmds.lua
index a9a4d7b..a9a4d7b 100644
--- a/.config/nvim/nvim/lua/autocmds.lua
+++ b/.config/nvim/lua/autocmds.lua
diff --git a/.config/nvim/nvim/lua/keymaps.lua b/.config/nvim/lua/keymaps.lua
index c043fc7..c043fc7 100644
--- a/.config/nvim/nvim/lua/keymaps.lua
+++ b/.config/nvim/lua/keymaps.lua
diff --git a/.config/nvim/nvim/lua/plugins/autopair.lua b/.config/nvim/lua/plugins/autopair.lua
index c51bf19..c51bf19 100644
--- a/.config/nvim/nvim/lua/plugins/autopair.lua
+++ b/.config/nvim/lua/plugins/autopair.lua
diff --git a/.config/nvim/nvim/lua/plugins/completions.lua b/.config/nvim/lua/plugins/completions.lua
index 51b7a78..51b7a78 100644
--- a/.config/nvim/nvim/lua/plugins/completions.lua
+++ b/.config/nvim/lua/plugins/completions.lua
diff --git a/.config/nvim/nvim/lua/plugins/indent-blankline.lua b/.config/nvim/lua/plugins/indent-blankline.lua
index aec0a40..aec0a40 100644
--- a/.config/nvim/nvim/lua/plugins/indent-blankline.lua
+++ b/.config/nvim/lua/plugins/indent-blankline.lua
diff --git a/.config/nvim/nvim/lua/plugins/lazydev.lua b/.config/nvim/lua/plugins/lazydev.lua
index a073d8d..a073d8d 100644
--- a/.config/nvim/nvim/lua/plugins/lazydev.lua
+++ b/.config/nvim/lua/plugins/lazydev.lua
diff --git a/.config/nvim/lua/plugins/lsp.lua b/.config/nvim/lua/plugins/lsp.lua
index 86da37a..beeaf0a 100644
--- a/.config/nvim/lua/plugins/lsp.lua
+++ b/.config/nvim/lua/plugins/lsp.lua
@@ -30,43 +30,18 @@ return {
{
"neovim/nvim-lspconfig",
config = function()
- local capabilities = require("cmp_nvim_lsp").default_capabilities()
-
local lspconfig = require("lspconfig")
- lspconfig.lua_ls.setup({
- capabilities = capabilities
- })
-
- lspconfig.clangd.setup({
- capabilities = capabilities
- })
- lspconfig.gradle_ls.setup({
- capabilities = capabilities
- })
- lspconfig.jdtls.setup({
- capabilities = capabilities
- })
- lspconfig.kotlin_language_server.setup({
- capabilities = capabilities
- })
- lspconfig.pyright.setup({
- capabilities = capabilities
- })
- lspconfig.rust_analyzer.setup({
- capabilities = capabilities
- })
- lspconfig.taplo.setup({
- capabilities = capabilities
- })
- lspconfig.bashls.setup({
- capabilities = capabilities
- })
- lspconfig.lemminx.setup({
- capabilities = capabilities
- })
- lspconfig.yamlls.setup({
- capabilities = capabilities
- })
+ lspconfig.lua_ls.setup({})
+ lspconfig.clangd.setup({})
+ lspconfig.gradle_ls.setup({})
+ lspconfig.jdtls.setup({})
+ lspconfig.kotlin_language_server.setup({})
+ lspconfig.pyright.setup({})
+ lspconfig.rust_analyzer.setup({})
+ lspconfig.taplo.setup({})
+ lspconfig.bashls.setup({})
+ lspconfig.lemminx.setup({})
+ lspconfig.yamlls.setup({})
vim.keymap.set('n', 'gh', vim.lsp.buf.hover, { desc = "[G]oto [H]over" })
vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "[G]oto [D]efinition" })
diff --git a/.config/nvim/lua/plugins/neotree.lua b/.config/nvim/lua/plugins/neotree.lua
index d55218d..50a7b5c 100644
--- a/.config/nvim/lua/plugins/neotree.lua
+++ b/.config/nvim/lua/plugins/neotree.lua
@@ -3,7 +3,7 @@ return {
branch = "v3.x",
dependencies = {
"nvim-lua/plenary.nvim",
- "nvim-tree/nvim-web-devicons",
+ "nvim-tree/nvim-web-devicons",
"MunifTanjim/nui.nvim",
},
config = function()
diff --git a/.config/nvim/nvim/init.lua b/.config/nvim/nvim/init.lua
deleted file mode 100644
index 754c885..0000000
--- a/.config/nvim/nvim/init.lua
+++ /dev/null
@@ -1,20 +0,0 @@
--- Install Lazy if it doesn't exist yet
-local lazypath = vim.fn.stdpath("data") .. "/lazy/lazy.nvim"
-if not (vim.uv or vim.loop).fs_stat(lazypath) then
- vim.fn.system({
- "git",
- "clone",
- "--filter=blob:none",
- "https://github.com/folke/lazy.nvim.git",
- "--branch=stable",
- lazypath,
- })
-end
-vim.opt.rtp:prepend(lazypath)
-
-require("options")
-require("lazy").setup("plugins")
-
-
-
-
diff --git a/.config/nvim/nvim/lua/options.lua b/.config/nvim/nvim/lua/options.lua
deleted file mode 100644
index 4093897..0000000
--- a/.config/nvim/nvim/lua/options.lua
+++ /dev/null
@@ -1,62 +0,0 @@
-vim.g.mapleader = " "
-vim.g.maplocalleader = " "
-
-vim.g.have_nerd_font = true
-
-vim.opt.number = true
-vim.opt.relativenumber = true
-
-vim.opt.expandtab = true
-vim.opt.tabstop = 4
-vim.opt.softtabstop = 4
-vim.opt.shiftwidth = 4
-
-vim.opt.mouse = 'a'
-vim.opt.clipboard = 'unnamedplus'
-
-vim.opt.undofile = true
-
-vim.opt.ignorecase = true
-vim.opt.smartcase = true
-
-vim.opt.signcolumn = 'auto'
-
-vim.opt.updatetime = 250
-
--- Displays which-key sooner, once that's setupped
-vim.opt.timeoutlen = 300
-
-vim.opt.splitright = true
-vim.opt.splitbelow = true
-
--- vim.opt.list = true
--- vim.opt.listchars = { tab = '» ', trail = '·', nbsp = '␣' }
-
-vim.opt.cursorline = true
-
-vim.opt.scrolloff = 8
-
-vim.opt.hlsearch = true
-vim.keymap.set('n', '<Esc>', '<cmd>nohlsearch<CR>')
-
-vim.keymap.set('n', '<C-h>', '<C-w><C-h>', { desc = 'Move focus to the left window' })
-vim.keymap.set('n', '<C-l>', '<C-w><C-l>', { desc = 'Move focus to the right window' })
-vim.keymap.set('n', '<C-j>', '<C-w><C-j>', { desc = 'Move focus to the lower window' })
-vim.keymap.set('n', '<C-k>', '<C-w><C-k>', { desc = 'Move focus to the upper window' })
-
-vim.api.nvim_create_autocmd('TextYankPost', {
- desc = 'Highlight when yanking (copying) text',
- group = vim.api.nvim_create_augroup('kickstart-highlight-yank', { clear = true }),
- callback = function()
- vim.highlight.on_yank()
- end,
-})
-
-
-
-
-
-
-
-
-
diff --git a/.config/nvim/nvim/lua/plugins.lua b/.config/nvim/nvim/lua/plugins.lua
deleted file mode 100644
index a2b4f84..0000000
--- a/.config/nvim/nvim/lua/plugins.lua
+++ /dev/null
@@ -1,2 +0,0 @@
-return {}
-
diff --git a/.config/nvim/nvim/lua/plugins/alpha.lua b/.config/nvim/nvim/lua/plugins/alpha.lua
deleted file mode 100644
index 9799e77..0000000
--- a/.config/nvim/nvim/lua/plugins/alpha.lua
+++ /dev/null
@@ -1,51 +0,0 @@
-return {
- "goolord/alpha-nvim",
- dependencies = {
- "nvim-tree/nvim-web-devicons",
- },
-
- config = function()
- local alpha = require("alpha")
- local dashboard = require("alpha.themes.startify")
-
- dashboard.section.header.val = {
- [[ ]],
- [[ ]],
- [[ ]],
- [[ ]],
- [[  ]],
- [[ ████ ██████ █████ ██ ██ ]],
- [[ ███████████ █████ ███ ]],
- [[ █████████ ███████████████████ ███ ███████████ ]],
- [[ █████████ ███ █████████████ █████ ██████████████ ]],
- [[ █████████ ██████████ █████████ █████ █████ ████ █████ ]],
- [[ ███████████ ███ ███ █████████ █████ █████ ████ █████ ]],
- [[ ██████ █████████████████████ ████ █████ █████ ████ ██████ ]],
- [[ ]],
- [[ ]],
- [[ ]],
- }
-
- --[=[
- dashboard.section.header.val = {
- [[ ]],
- [[ ]],
- [[ ]],
- [[ ]],
- [[ ]],
- [[ ████ ███ ]],
- [[ █████████ ]],
- [[ ██████████ ████████ ████████ ]],
- [[ ██████████ ███ ███ ███ ]],
- [[ ████████ ████████ ███ ███ ]],
- [[ █████████ ███ ███ ███ ]],
- [[ ██████ ███ █████████ ███ ███ ]],
- [[ ]],
- [[ ]],
- [[ ]],
- }
- ]=]
-
- alpha.setup(dashboard.opts)
- end,
-}
diff --git a/.config/nvim/nvim/lua/plugins/catppuccin.lua b/.config/nvim/nvim/lua/plugins/catppuccin.lua
deleted file mode 100644
index 0b2ad91..0000000
--- a/.config/nvim/nvim/lua/plugins/catppuccin.lua
+++ /dev/null
@@ -1,9 +0,0 @@
-return {
- "catppuccin/nvim",
- lazy = false,
- name = "catppuccin",
- priority = 1000,
- config = function()
- -- vim.cmd.colorscheme "tokyonight-night"
- end
-}
diff --git a/.config/nvim/nvim/lua/plugins/lsp.lua b/.config/nvim/nvim/lua/plugins/lsp.lua
deleted file mode 100644
index beeaf0a..0000000
--- a/.config/nvim/nvim/lua/plugins/lsp.lua
+++ /dev/null
@@ -1,52 +0,0 @@
-return {
- {
- "williamboman/mason.nvim",
- config = function()
- require("mason").setup()
- end
- },
-
- {
- "williamboman/mason-lspconfig.nvim",
- config = function()
- require("mason-lspconfig").setup({
- ensure_installed = {
- "lua_ls",
- "clangd",
- "gradle_ls",
- "jdtls",
- "kotlin_language_server",
- "pyright",
- "rust_analyzer",
- "taplo",
- "bashls",
- "lemminx",
- "yamlls"
- }
- })
- end
- },
-
- {
- "neovim/nvim-lspconfig",
- config = function()
- local lspconfig = require("lspconfig")
- lspconfig.lua_ls.setup({})
- lspconfig.clangd.setup({})
- lspconfig.gradle_ls.setup({})
- lspconfig.jdtls.setup({})
- lspconfig.kotlin_language_server.setup({})
- lspconfig.pyright.setup({})
- lspconfig.rust_analyzer.setup({})
- lspconfig.taplo.setup({})
- lspconfig.bashls.setup({})
- lspconfig.lemminx.setup({})
- lspconfig.yamlls.setup({})
-
- vim.keymap.set('n', 'gh', vim.lsp.buf.hover, { desc = "[G]oto [H]over" })
- vim.keymap.set('n', 'gd', vim.lsp.buf.definition, { desc = "[G]oto [D]efinition" })
- vim.keymap.set('n', '<leader>ca', vim.lsp.buf.code_action, { desc = "[C]ode [A]ction" })
- vim.keymap.set('n', '<M-Enter>', vim.lsp.buf.code_action, { desc = "Code Actions" })
- end
- }
-}
diff --git a/.config/nvim/nvim/lua/plugins/lualine.lua b/.config/nvim/nvim/lua/plugins/lualine.lua
deleted file mode 100644
index 67c517c..0000000
--- a/.config/nvim/nvim/lua/plugins/lualine.lua
+++ /dev/null
@@ -1,10 +0,0 @@
-return {
- "nvim-lualine/lualine.nvim",
- config = function()
- require("lualine").setup({
- options = {
- theme = "dracula"
- }
- })
- end
-}
diff --git a/.config/nvim/nvim/lua/plugins/neotree.lua b/.config/nvim/nvim/lua/plugins/neotree.lua
deleted file mode 100644
index 50a7b5c..0000000
--- a/.config/nvim/nvim/lua/plugins/neotree.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
- "nvim-neo-tree/neo-tree.nvim",
- branch = "v3.x",
- dependencies = {
- "nvim-lua/plenary.nvim",
- "nvim-tree/nvim-web-devicons",
- "MunifTanjim/nui.nvim",
- },
- config = function()
- vim.keymap.set('n', 'gp', ':Neotree filesystem reveal left<cr>', { desc = '[F]ind Recent Files ("." for repeat)' })
- end
-}
-
diff --git a/.config/nvim/nvim/lua/plugins/none-ls.lua b/.config/nvim/nvim/lua/plugins/none-ls.lua
deleted file mode 100644
index 0389275..0000000
--- a/.config/nvim/nvim/lua/plugins/none-ls.lua
+++ /dev/null
@@ -1,13 +0,0 @@
-return {
- 'nvimtools/none-ls.nvim',
- config = function()
- local null_ls = require 'null-ls'
- null_ls.setup {
- sources = {
- null_ls.builtins.formatting.stylua,
- },
- }
-
- vim.keymap.set('n', '=', vim.lsp.buf.format, { desc = 'Format File' })
- end,
-}
diff --git a/.config/nvim/nvim/lua/plugins/telescope.lua b/.config/nvim/nvim/lua/plugins/telescope.lua
deleted file mode 100644
index 18daf0a..0000000
--- a/.config/nvim/nvim/lua/plugins/telescope.lua
+++ /dev/null
@@ -1,33 +0,0 @@
-return {
- {
- 'nvim-telescope/telescope.nvim',
- tag = '0.1.5',
- dependencies = { 'nvim-lua/plenary.nvim' },
- config = function()
- local builtin = require("telescope.builtin")
- vim.keymap.set('n', '<leader>th', builtin.colorscheme, { desc = "List [Th]eme" })
- vim.keymap.set('n', '<leader>ff', builtin.find_files, { desc = '[F]ind [F]iles' })
- vim.keymap.set('n', '<leader>fh', builtin.help_tags, { desc = '[F]ind [H]elp' })
- vim.keymap.set('n', '<leader>fk', builtin.keymaps, { desc = '[F]ind [K]eymaps' })
- vim.keymap.set('n', '<leader>fs', builtin.builtin, { desc = '[F]ind [S]elect Telescope' })
- vim.keymap.set('n', '<leader>fw', builtin.grep_string, { desc = '[F]ind current [W]ord' })
- vim.keymap.set('n', '<leader>fg', builtin.live_grep, { desc = '[F]ind by [G]rep' })
- vim.keymap.set('n', '<leader>f.', builtin.oldfiles, { desc = '[F]ind Recent Files ("." for repeat)' })
- end
- },
- {
- "nvim-telescope/telescope-ui-select.nvim",
- config = function()
- local telescope = require("telescope")
- telescope.setup({
- extensions = {
- ["ui_select"] = {
- require("telescope.themes").get_dropdown {}
- }
- }
- })
- telescope.load_extension("ui-select")
- end
- }
-}
-
diff --git a/.config/nvim/nvim/lua/plugins/tokyonight.lua b/.config/nvim/nvim/lua/plugins/tokyonight.lua
deleted file mode 100644
index 21a772e..0000000
--- a/.config/nvim/nvim/lua/plugins/tokyonight.lua
+++ /dev/null
@@ -1,8 +0,0 @@
-return {
- 'folke/tokyonight.nvim',
- priority = 1000,
- config = function()
- vim.cmd.colorscheme "tokyonight-night"
- end
-}
-
diff --git a/.config/nvim/nvim/lua/plugins/treesitter.lua b/.config/nvim/nvim/lua/plugins/treesitter.lua
deleted file mode 100644
index 44c98c0..0000000
--- a/.config/nvim/nvim/lua/plugins/treesitter.lua
+++ /dev/null
@@ -1,12 +0,0 @@
-return {
- 'nvim-treesitter/nvim-treesitter',
- build = ":TSUpdate" ,
- config = function()
- local config = require("nvim-treesitter.configs")
- config.setup({
- auto_install = true,
- highlight = { enable = true },
- indent = { enable = true }
- })
- end
-}