From 326088a13dda260901641ffd1b0a3b54609431b3 Mon Sep 17 00:00:00 2001 From: Taken Date: Wed, 14 Jun 2023 20:20:18 +0200 Subject: [PATCH] Initial commit --- after/plugin/bufferline.lua | 30 ++++++ after/plugin/lsp.lua | 40 ++++++++ after/plugin/lualine.lua | 40 ++++++++ after/plugin/nvimtree.lua | 9 ++ after/plugin/telescope.lua | 5 + after/plugin/treesitter.lua | 10 ++ init.lua | 1 + lua/taken/init.lua | 5 + lua/taken/opts.lua | 27 +++++ lua/taken/packer.lua | 59 +++++++++++ lua/taken/remaps.lua | 34 ++++++ plugin/packer_compiled.lua | 199 ++++++++++++++++++++++++++++++++++++ 12 files changed, 459 insertions(+) create mode 100644 after/plugin/bufferline.lua create mode 100644 after/plugin/lsp.lua create mode 100644 after/plugin/lualine.lua create mode 100644 after/plugin/nvimtree.lua create mode 100644 after/plugin/telescope.lua create mode 100644 after/plugin/treesitter.lua create mode 100644 init.lua create mode 100644 lua/taken/init.lua create mode 100644 lua/taken/opts.lua create mode 100644 lua/taken/packer.lua create mode 100644 lua/taken/remaps.lua create mode 100644 plugin/packer_compiled.lua diff --git a/after/plugin/bufferline.lua b/after/plugin/bufferline.lua new file mode 100644 index 0000000..80ab0e8 --- /dev/null +++ b/after/plugin/bufferline.lua @@ -0,0 +1,30 @@ +local bufferline = require("bufferline") + +bufferline.setup { + options = { + mode = "buffers", + style_preset = bufferline.style_preset.default, + themable = true, + numbers = "none", + close_command = "bdelete! %d", + indicator = { + icon = "▎", + style = "icon" + }, + max_name_length = 18, + max_prefix_length = 15, + truncate_names = true, + tab_size = 18, + offsets = { + { + filetype = "NvimTree", + } + }, + color_icons = true, + get_element_icon = function(element) + local icon, hl = require('nvim-web-devicons').get_icon_by_filetype(element.filetype, { default = false }) + return icon, hl + end, + always_show_bufferline = true, + } +} diff --git a/after/plugin/lsp.lua b/after/plugin/lsp.lua new file mode 100644 index 0000000..b1cd8be --- /dev/null +++ b/after/plugin/lsp.lua @@ -0,0 +1,40 @@ +local lsp = require('lsp-zero').preset({}) + +lsp.on_attach(function(client, bufnr) + lsp.default_keymaps({buffer = bufnr}) + vim.keymap.set("n", "gd", function() vim.lsp.buf.definition() end, opts) + vim.keymap.set("n", "K", function() vim.lsp.buf.hover() end, opts) + vim.keymap.set("n", "vws", function() vim.lsp.buf.workspace_symbol() end, opts) + vim.keymap.set("n", "vd", function() vim.diagnostic.open_float() end, opts) + vim.keymap.set("n", "[d", function() vim.diagnostic.goto_next() end, opts) + vim.keymap.set("n", "]d", function() vim.diagnostic.goto_prev() end, opts) + vim.keymap.set("n", "vca", function() vim.lsp.buf.code_action() end, opts) + vim.keymap.set("n", "vrr", function() vim.lsp.buf.references() end, opts) + vim.keymap.set("n", "vrn", function() vim.lsp.buf.rename() end, opts) + vim.keymap.set("i", "", function() vim.lsp.buf.signature_help() end, opts) +end) + +local cmp = require('cmp') +local cmp_select = {behavior = cmp.SelectBehavior.Select} +local cmp_mappings = lsp.defaults.cmp_mappings({ + [''] = cmp.mapping.select_prev_item(cmp_select), + [''] = cmp.mapping.select_next_item(cmp_select), + [''] = cmp.mapping.confirm({ select = true }), + [""] = cmp.mapping.complete(), +}) + +cmp_mappings[''] = nil +cmp_mappings[''] = nil + +lsp.setup_nvim_cmp({ + mapping = cmp_mappings +}) + +lsp.ensure_installed({ + 'lua_ls', + 'tsserver', + 'rust_analyzer', +}) +require('lspconfig').lua_ls.setup(lsp.nvim_lua_ls()) + +lsp.setup() diff --git a/after/plugin/lualine.lua b/after/plugin/lualine.lua new file mode 100644 index 0000000..56c426a --- /dev/null +++ b/after/plugin/lualine.lua @@ -0,0 +1,40 @@ +require('lualine').setup { + options = { + icons_enabled = true, + theme = 'auto', + 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 = {} +} diff --git a/after/plugin/nvimtree.lua b/after/plugin/nvimtree.lua new file mode 100644 index 0000000..ae5ab8f --- /dev/null +++ b/after/plugin/nvimtree.lua @@ -0,0 +1,9 @@ +local nvimtree = require("nvim-tree") + +nvimtree.setup({ + + view = { + width = 30, + } + +}) diff --git a/after/plugin/telescope.lua b/after/plugin/telescope.lua new file mode 100644 index 0000000..39bc72e --- /dev/null +++ b/after/plugin/telescope.lua @@ -0,0 +1,5 @@ +local builtin = require('telescope.builtin') +vim.keymap.set('n', 'ff', builtin.find_files, { desc = "Find files" }) +vim.keymap.set('n', 'fg', builtin.live_grep, { desc = "Live grep" }) +vim.keymap.set('n', 'fb', builtin.buffers, { desc = "Find buffers" }) +vim.keymap.set('n', 'fh', builtin.help_tags, { desc = "Help tags" }) diff --git a/after/plugin/treesitter.lua b/after/plugin/treesitter.lua new file mode 100644 index 0000000..0b06c8d --- /dev/null +++ b/after/plugin/treesitter.lua @@ -0,0 +1,10 @@ +require'nvim-treesitter.configs'.setup { + ensure_installed = { "lua", "vim", "vimdoc", "javascript", "java" }, + sync_install = false, + auto_install = true, + + highlight = { + enable = true, + additional_vim_regex_highlighting = false, + }, +} diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..8571503 --- /dev/null +++ b/init.lua @@ -0,0 +1 @@ +require("taken") diff --git a/lua/taken/init.lua b/lua/taken/init.lua new file mode 100644 index 0000000..93b0046 --- /dev/null +++ b/lua/taken/init.lua @@ -0,0 +1,5 @@ +require("taken.packer") +require("taken.opts") +require("taken.remaps") + +vim.notify = require("notify") diff --git a/lua/taken/opts.lua b/lua/taken/opts.lua new file mode 100644 index 0000000..d0c7ff7 --- /dev/null +++ b/lua/taken/opts.lua @@ -0,0 +1,27 @@ +vim.g.mapleader = " " + +vim.opt.nu = true +vim.opt.relativenumber = true + +vim.opt.tabstop = 4 +vim.opt.softtabstop = 4 +vim.opt.shiftwidth = 4 +vim.opt.expandtab = true + +vim.opt.smartindent = true +vim.opt.wrap = false + +vim.opt.hlsearch = false +vim.opt.incsearch = true + +vim.opt.termguicolors = true + +vim.opt.scrolloff = 8 +vim.opt.signcolumn = "yes" +vim.opt.isfname:append("@-@") + +vim.opt.updatetime = 50 + +-- Options for nvim-tree +vim.g.loaded_netrw = 1 +vim.g.loaded_netrwPlugin = 1 diff --git a/lua/taken/packer.lua b/lua/taken/packer.lua new file mode 100644 index 0000000..8b4900d --- /dev/null +++ b/lua/taken/packer.lua @@ -0,0 +1,59 @@ +vim.cmd [[packadd packer.nvim]] + +return require('packer').startup(function(use) + use 'wbthomason/packer.nvim' + use({ + "catppuccin/nvim", + as = "catppuccin", + config = function() + vim.cmd [[colorscheme catppuccin-mocha]] + end + }) + use { + 'nvim-telescope/telescope.nvim', tag = '0.1.1', + requires = { { 'nvim-lua/plenary.nvim' } } + } + use 'github/copilot.vim' + use { + 'nvim-tree/nvim-tree.lua', + requires = { { 'nvim-tree/nvim-web-devicons' } } + } + use { + 'nvim-treesitter/nvim-treesitter', + run = ':TSUpdate' + } + use { + 'VonHeikemen/lsp-zero.nvim', + branch = 'v2.x', + requires = { + { 'neovim/nvim-lspconfig' }, -- Required + { -- Optional + 'williamboman/mason.nvim', + run = function() + pcall(vim.cmd, 'MasonUpdate') + end, + }, + { 'williamboman/mason-lspconfig.nvim' }, -- Optional + + -- Autocompletion + { 'hrsh7th/nvim-cmp' }, -- Required + { 'hrsh7th/cmp-nvim-lsp' }, -- Required + { 'L3MON4D3/LuaSnip' }, -- Required + } + } + use { + "folke/which-key.nvim", + config = function() + vim.o.timeout = true + vim.o.timeoutlen = 300 + require("which-key").setup { + } + end + } + use { + 'nvim-lualine/lualine.nvim', + requires = { 'nvim-tree/nvim-web-devicons', opt = true } + } + use 'rcarriga/nvim-notify' + use {'akinsho/bufferline.nvim', tag = "*", requires = 'nvim-tree/nvim-web-devicons'} +end) diff --git a/lua/taken/remaps.lua b/lua/taken/remaps.lua new file mode 100644 index 0000000..eea4c16 --- /dev/null +++ b/lua/taken/remaps.lua @@ -0,0 +1,34 @@ +vim.keymap.set("v", "J", ":m '>+1gv=gv") +vim.keymap.set("v", "K", ":m '<-2gv=gv") + +vim.keymap.set("n", "J", "mzJ`z") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "", "zz") +vim.keymap.set("n", "n", "nzzzv") +vim.keymap.set("n", "N", "Nzzzv") + +-- greatest remap ever +-- vim.keymap.set("x", "p", [["_dP]]) + +-- next greatest remap ever : asbjornHaland +vim.keymap.set({"n", "v"}, "y", [["+y]], { desc = "Yank in to sys clipboard" }) +vim.keymap.set({"n", "v"}, "d", [["_d]]) + +vim.keymap.set("n", "Q", "") +vim.keymap.set("n", "bf", vim.lsp.buf.format, { desc = "Formate buffer" }) + +vim.keymap.set("n", "", "cnextzz") +vim.keymap.set("n", "", "cprevzz") +vim.keymap.set("n", "k", "lnextzz") +vim.keymap.set("n", "j", "lprevzz") + +vim.keymap.set("n", "s", [[:%s/\<\>//gI]]) +vim.keymap.set("n", "x", "!chmod +x %", { silent = true }) +vim.keymap.set("n", "", function() + vim.cmd("so") +end, +{ desc = "Source current file" }) + +-- nvim-tree +vim.keymap.set("n", "n", ":NvimTreeToggle ") +vim.keymap.set("n", "e", ":NvimTreeFocus ") diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..bde102a --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,199 @@ +-- Automatically generated packer.nvim plugin loader code + +if vim.api.nvim_call_function('has', {'nvim-0.5'}) ~= 1 then + vim.api.nvim_command('echohl WarningMsg | echom "Invalid Neovim version for packer.nvim! | echohl None"') + return +end + +vim.api.nvim_command('packadd packer.nvim') + +local no_errors, error_msg = pcall(function() + +_G._packer = _G._packer or {} +_G._packer.inside_compile = true + +local time +local profile_info +local should_profile = false +if should_profile then + local hrtime = vim.loop.hrtime + profile_info = {} + time = function(chunk, start) + if start then + profile_info[chunk] = hrtime() + else + profile_info[chunk] = (hrtime() - profile_info[chunk]) / 1e6 + end + end +else + time = function(chunk, start) end +end + +local function save_profiles(threshold) + local sorted_times = {} + for chunk_name, time_taken in pairs(profile_info) do + sorted_times[#sorted_times + 1] = {chunk_name, time_taken} + end + table.sort(sorted_times, function(a, b) return a[2] > b[2] end) + local results = {} + for i, elem in ipairs(sorted_times) do + if not threshold or threshold and elem[2] > threshold then + results[i] = elem[1] .. ' took ' .. elem[2] .. 'ms' + end + end + if threshold then + table.insert(results, '(Only showing plugins that took longer than ' .. threshold .. ' ms ' .. 'to load)') + end + + _G._packer.profile_output = results +end + +time([[Luarocks path setup]], true) +local package_path_str = "C:\\Users\\Ante\\AppData\\Local\\Temp\\nvim\\packer_hererocks\\2.1.0-beta3\\share\\lua\\5.1\\?.lua;C:\\Users\\Ante\\AppData\\Local\\Temp\\nvim\\packer_hererocks\\2.1.0-beta3\\share\\lua\\5.1\\?\\init.lua;C:\\Users\\Ante\\AppData\\Local\\Temp\\nvim\\packer_hererocks\\2.1.0-beta3\\lib\\luarocks\\rocks-5.1\\?.lua;C:\\Users\\Ante\\AppData\\Local\\Temp\\nvim\\packer_hererocks\\2.1.0-beta3\\lib\\luarocks\\rocks-5.1\\?\\init.lua" +local install_cpath_pattern = "C:\\Users\\Ante\\AppData\\Local\\Temp\\nvim\\packer_hererocks\\2.1.0-beta3\\lib\\lua\\5.1\\?.so" +if not string.find(package.path, package_path_str, 1, true) then + package.path = package.path .. ';' .. package_path_str +end + +if not string.find(package.cpath, install_cpath_pattern, 1, true) then + package.cpath = package.cpath .. ';' .. install_cpath_pattern +end + +time([[Luarocks path setup]], false) +time([[try_loadstring definition]], true) +local function try_loadstring(s, component, name) + local success, result = pcall(loadstring(s), name, _G.packer_plugins[name]) + if not success then + vim.schedule(function() + vim.api.nvim_notify('packer.nvim: Error running ' .. component .. ' for ' .. name .. ': ' .. result, vim.log.levels.ERROR, {}) + end) + end + return result +end + +time([[try_loadstring definition]], false) +time([[Defining packer_plugins]], true) +_G.packer_plugins = { + LuaSnip = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["bufferline.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\bufferline.nvim", + url = "https://github.com/akinsho/bufferline.nvim" + }, + catppuccin = { + config = { "\27LJ\2\n@\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0!colorscheme catppuccin-mocha\bcmd\bvim\0" }, + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\catppuccin", + url = "https://github.com/catppuccin/nvim" + }, + ["cmp-nvim-lsp"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\cmp-nvim-lsp", + url = "https://github.com/hrsh7th/cmp-nvim-lsp" + }, + ["copilot.vim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\copilot.vim", + url = "https://github.com/github/copilot.vim" + }, + ["lsp-zero.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\lsp-zero.nvim", + url = "https://github.com/VonHeikemen/lsp-zero.nvim" + }, + ["lualine.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-cmp"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-notify"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\nvim-notify", + url = "https://github.com/rcarriga/nvim-notify" + }, + ["nvim-tree.lua"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\nvim-tree.lua", + url = "https://github.com/nvim-tree/nvim-tree.lua" + }, + ["nvim-treesitter"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\nvim-treesitter", + url = "https://github.com/nvim-treesitter/nvim-treesitter" + }, + ["nvim-web-devicons"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\nvim-web-devicons", + url = "https://github.com/nvim-tree/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["plenary.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\plenary.nvim", + url = "https://github.com/nvim-lua/plenary.nvim" + }, + ["telescope.nvim"] = { + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\telescope.nvim", + url = "https://github.com/nvim-telescope/telescope.nvim" + }, + ["which-key.nvim"] = { + config = { "\27LJ\2\nt\0\0\3\0\a\0\0156\0\0\0009\0\1\0+\1\2\0=\1\2\0006\0\0\0009\0\1\0)\1,\1=\1\3\0006\0\4\0'\2\5\0B\0\2\0029\0\6\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\15timeoutlen\ftimeout\6o\bvim\0" }, + loaded = true, + path = "C:\\Users\\Ante\\AppData\\Local\\nvim-data\\site\\pack\\packer\\start\\which-key.nvim", + url = "https://github.com/folke/which-key.nvim" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: which-key.nvim +time([[Config for which-key.nvim]], true) +try_loadstring("\27LJ\2\nt\0\0\3\0\a\0\0156\0\0\0009\0\1\0+\1\2\0=\1\2\0006\0\0\0009\0\1\0)\1,\1=\1\3\0006\0\4\0'\2\5\0B\0\2\0029\0\6\0004\2\0\0B\0\2\1K\0\1\0\nsetup\14which-key\frequire\15timeoutlen\ftimeout\6o\bvim\0", "config", "which-key.nvim") +time([[Config for which-key.nvim]], false) +-- Config for: catppuccin +time([[Config for catppuccin]], true) +try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\0056\0\0\0009\0\1\0'\2\2\0B\0\2\1K\0\1\0!colorscheme catppuccin-mocha\bcmd\bvim\0", "config", "catppuccin") +time([[Config for catppuccin]], false) + +_G._packer.inside_compile = false +if _G._packer.needs_bufread == true then + vim.cmd("doautocmd BufRead") +end +_G._packer.needs_bufread = false + +if should_profile then save_profiles() end + +end) + +if not no_errors then + error_msg = error_msg:gsub('"', '\\"') + vim.api.nvim_command('echohl ErrorMsg | echom "Error in packer_compiled: '..error_msg..'" | echom "Please check your config for correctness" | echohl None') +end