From bc13bdd6ca7ff3b345394836f225bfb1a24a5662 Mon Sep 17 00:00:00 2001 From: Emil Miler Date: Tue, 1 Nov 2022 17:34:57 +0100 Subject: [PATCH] Upload local files --- init.lua | 4 + lua/callbacks.lua | 10 ++ lua/completion.lua | 127 +++++++++++++++++++++++ lua/config.lua | 41 ++++++++ lua/plugins.lua | 55 ++++++++++ plugin/packer_compiled.lua | 200 +++++++++++++++++++++++++++++++++++++ 6 files changed, 437 insertions(+) create mode 100644 init.lua create mode 100644 lua/callbacks.lua create mode 100644 lua/completion.lua create mode 100644 lua/config.lua create mode 100644 lua/plugins.lua create mode 100644 plugin/packer_compiled.lua diff --git a/init.lua b/init.lua new file mode 100644 index 0000000..df79b58 --- /dev/null +++ b/init.lua @@ -0,0 +1,4 @@ +require("config") +require("plugins") +require("completion") +require("callbacks") diff --git a/lua/callbacks.lua b/lua/callbacks.lua new file mode 100644 index 0000000..8a2de05 --- /dev/null +++ b/lua/callbacks.lua @@ -0,0 +1,10 @@ +goyo_unhide = true +function goyo_toggle() + if goyo_unhide == true then + require('lualine').hide({unhide=false}) + goyo_unhide = false + else + require('lualine').hide({unhide=true}) + goyo_unhide = true + end +end diff --git a/lua/completion.lua b/lua/completion.lua new file mode 100644 index 0000000..43193ba --- /dev/null +++ b/lua/completion.lua @@ -0,0 +1,127 @@ +local cmp_status_ok, cmp = pcall(require, "cmp") +if not cmp_status_ok then + return +end + +local snip_status_ok, luasnip = pcall(require, "luasnip") +if not snip_status_ok then + return +end + +require("luasnip/loaders/from_vscode").lazy_load() + +local check_backspace = function() + local col = vim.fn.col "." - 1 + return col == 0 or vim.fn.getline("."):sub(col, col):match "%s" +end + +--   פּ ﯟ   some other good icons +local kind_icons = { + Text = "", + Method = "m", + Function = "", + Constructor = "", + Field = "", + Variable = "", + Class = "", + Interface = "", + Module = "", + Property = "", + Unit = "", + Value = "", + Enum = "", + Keyword = "", + Snippet = "", + Color = "", + File = "", + Reference = "", + Folder = "", + EnumMember = "", + Constant = "", + Struct = "", + Event = "", + Operator = "", + TypeParameter = "", +} +-- find more here: https://www.nerdfonts.com/cheat-sheet + +cmp.setup { + snippet = { + expand = function(args) + luasnip.lsp_expand(args.body) -- For `luasnip` users. + end, + }, + mapping = { + [""] = cmp.mapping.select_prev_item(), + [""] = cmp.mapping.select_next_item(), + [""] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }), + [""] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }), + [""] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `` mapping. + [""] = cmp.mapping { + i = cmp.mapping.abort(), + c = cmp.mapping.close(), + }, + -- Accept currently selected item. If none selected, `select` first item. + -- Set `select` to `false` to only confirm explicitly selected items. + [""] = cmp.mapping.confirm { select = true }, + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_next_item() + elseif luasnip.expandable() then + luasnip.expand() + elseif luasnip.expand_or_jumpable() then + luasnip.expand_or_jump() + elseif check_backspace() then + fallback() + else + fallback() + end + end, { + "i", + "s", + }), + [""] = cmp.mapping(function(fallback) + if cmp.visible() then + cmp.select_prev_item() + elseif luasnip.jumpable(-1) then + luasnip.jump(-1) + else + fallback() + end + end, { + "i", + "s", + }), + }, + formatting = { + fields = { "kind", "abbr", "menu" }, + format = function(entry, vim_item) + -- Kind icons + vim_item.kind = string.format("%s", kind_icons[vim_item.kind]) + -- vim_item.kind = string.format('%s %s', kind_icons[vim_item.kind], vim_item.kind) -- This concatonates the icons with the name of the item kind + vim_item.menu = ({ + luasnip = "[Snippet]", + buffer = "[Buffer]", + path = "[Path]", + })[entry.source.name] + return vim_item + end, + }, + sources = { + { name = "luasnip" }, + { name = "buffer" }, + { name = "path" }, + }, + confirm_opts = { + behavior = cmp.ConfirmBehavior.Replace, + select = false, + }, + -- documentation = { + -- border = { "╭", "─", "╮", "│", "╯", "─", "╰", "│" }, + -- }, + -- experimental = { + -- ghost_text = false, + -- native_menu = false, + -- }, +} diff --git a/lua/config.lua b/lua/config.lua new file mode 100644 index 0000000..eb9c8f4 --- /dev/null +++ b/lua/config.lua @@ -0,0 +1,41 @@ +vim.o.mouse = 'a' +vim.o.encoding = 'UTF-8' +vim.o.fileencoding = 'UTF-8' +vim.o.number = true +vim.o.relativenumber = true +vim.o.showcmd = true +vim.o.syntax = true + +vim.o.ignorecase = true +vim.o.smartcase = true + +vim.o.cursorline = true +-- bold line number at cursor +vim.cmd [[ highlight CursorLineNr cterm=bold ]] + +vim.o.linebreak = true + +-- special characters +vim.o.list = true +vim.o.listchars = 'tab:→ ,eol:↲,nbsp:␣,trail:•,extends:⟩,precedes:⟨' + +vim.o.tabstop = 4 +vim.o.shiftwidth = 4 +vim.o.expandtab = false +vim.o.smartindent = true + +-- spellcheck (enable with `set spell`) +vim.o.spelllang = 'cs,en_gb' +vim.cmd [[ hi SpellBad cterm=bold ctermbg=red ctermfg=white ]] + +-- cursor padding from top and bottom +vim.o.scrolloff = 5 + +-- better navigation in split windows +vim.keymap.set('n', '', 'h') +vim.keymap.set('n', '', 'j') +vim.keymap.set('n', '', 'k') +vim.keymap.set('n', '', 'l') + +-- colorscheme +vim.cmd [[ color base16-default-dark ]] diff --git a/lua/plugins.lua b/lua/plugins.lua new file mode 100644 index 0000000..bae2ff8 --- /dev/null +++ b/lua/plugins.lua @@ -0,0 +1,55 @@ +return require('packer').startup(function() + -- automatic rebuild on plugins.lua change + vim.cmd([[ + augroup packer_user_config + autocmd! + autocmd BufWritePost plugins.lua source | PackerCompile + augroup end + ]]) + + use 'wbthomason/packer.nvim' + use 'RRethy/nvim-base16' + use 'tpope/vim-commentary' + use { + 'nvim-lualine/lualine.nvim', + requires = { 'kyazdani42/nvim-web-devicons', opt = true }, + config = function() + require('lualine').setup() + vim.o.showmode = false + end + } + use { + 'lewis6991/gitsigns.nvim', + config = function() + require('gitsigns').setup() + end + } + use { + 'junegunn/goyo.vim', + config = function() + vim.keymap.set('n', 'f', ':lua goyo_toggle():Goyo') + end + } + + -- completion + use 'hrsh7th/nvim-cmp' + use 'hrsh7th/cmp-buffer' + use 'hrsh7th/cmp-path' + use 'hrsh7th/cmp-cmdline' + use 'saadparwaiz1/cmp_luasnip' + + -- snippets + use 'L3MON4D3/LuaSnip' + use 'rafamadriz/friendly-snippets' + + -- LSP + use 'neovim/nvim-lspconfig' + use { + 'williamboman/mason.nvim', + config = function() + require('mason').setup() + end + } + use 'williamboman/mason-lspconfig.nvim' + +end) diff --git a/plugin/packer_compiled.lua b/plugin/packer_compiled.lua new file mode 100644 index 0000000..1dfabe0 --- /dev/null +++ b/plugin/packer_compiled.lua @@ -0,0 +1,200 @@ +-- 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 = "/home/em/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?.lua;/home/em/.cache/nvim/packer_hererocks/2.1.0-beta3/share/lua/5.1/?/init.lua;/home/em/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?.lua;/home/em/.cache/nvim/packer_hererocks/2.1.0-beta3/lib/luarocks/rocks-5.1/?/init.lua" +local install_cpath_pattern = "/home/em/.cache/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 = "/home/em/.local/share/nvim/site/pack/packer/start/LuaSnip", + url = "https://github.com/L3MON4D3/LuaSnip" + }, + ["cmp-buffer"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/cmp-buffer", + url = "https://github.com/hrsh7th/cmp-buffer" + }, + ["cmp-cmdline"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/cmp-cmdline", + url = "https://github.com/hrsh7th/cmp-cmdline" + }, + ["cmp-path"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/cmp-path", + url = "https://github.com/hrsh7th/cmp-path" + }, + cmp_luasnip = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/cmp_luasnip", + url = "https://github.com/saadparwaiz1/cmp_luasnip" + }, + ["friendly-snippets"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/friendly-snippets", + url = "https://github.com/rafamadriz/friendly-snippets" + }, + ["gitsigns.nvim"] = { + config = { "\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0" }, + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/gitsigns.nvim", + url = "https://github.com/lewis6991/gitsigns.nvim" + }, + ["goyo.vim"] = { + config = { "\27LJ\2\nb\0\0\5\0\6\0\b6\0\0\0009\0\1\0009\0\2\0'\2\3\0'\3\4\0'\4\5\0B\0\4\1K\0\1\0$:lua goyo_toggle():Goyo\14f\6n\bset\vkeymap\bvim\0" }, + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/goyo.vim", + url = "https://github.com/junegunn/goyo.vim" + }, + ["lualine.nvim"] = { + config = { "\27LJ\2\nT\0\0\3\0\6\0\n6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\3\0009\0\4\0+\1\1\0=\1\5\0K\0\1\0\rshowmode\6o\bvim\nsetup\flualine\frequire\0" }, + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/lualine.nvim", + url = "https://github.com/nvim-lualine/lualine.nvim" + }, + ["mason-lspconfig.nvim"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/mason-lspconfig.nvim", + url = "https://github.com/williamboman/mason-lspconfig.nvim" + }, + ["mason.nvim"] = { + config = { "\27LJ\2\n3\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\nmason\frequire\0" }, + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/mason.nvim", + url = "https://github.com/williamboman/mason.nvim" + }, + ["nvim-base16"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/nvim-base16", + url = "https://github.com/RRethy/nvim-base16" + }, + ["nvim-cmp"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/nvim-cmp", + url = "https://github.com/hrsh7th/nvim-cmp" + }, + ["nvim-lspconfig"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/nvim-lspconfig", + url = "https://github.com/neovim/nvim-lspconfig" + }, + ["nvim-web-devicons"] = { + loaded = false, + needs_bufread = false, + path = "/home/em/.local/share/nvim/site/pack/packer/opt/nvim-web-devicons", + url = "https://github.com/kyazdani42/nvim-web-devicons" + }, + ["packer.nvim"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/packer.nvim", + url = "https://github.com/wbthomason/packer.nvim" + }, + ["vim-commentary"] = { + loaded = true, + path = "/home/em/.local/share/nvim/site/pack/packer/start/vim-commentary", + url = "https://github.com/tpope/vim-commentary" + } +} + +time([[Defining packer_plugins]], false) +-- Config for: lualine.nvim +time([[Config for lualine.nvim]], true) +try_loadstring("\27LJ\2\nT\0\0\3\0\6\0\n6\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\0016\0\3\0009\0\4\0+\1\1\0=\1\5\0K\0\1\0\rshowmode\6o\bvim\nsetup\flualine\frequire\0", "config", "lualine.nvim") +time([[Config for lualine.nvim]], false) +-- Config for: gitsigns.nvim +time([[Config for gitsigns.nvim]], true) +try_loadstring("\27LJ\2\n6\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\rgitsigns\frequire\0", "config", "gitsigns.nvim") +time([[Config for gitsigns.nvim]], false) +-- Config for: goyo.vim +time([[Config for goyo.vim]], true) +try_loadstring("\27LJ\2\nb\0\0\5\0\6\0\b6\0\0\0009\0\1\0009\0\2\0'\2\3\0'\3\4\0'\4\5\0B\0\4\1K\0\1\0$:lua goyo_toggle():Goyo\14f\6n\bset\vkeymap\bvim\0", "config", "goyo.vim") +time([[Config for goyo.vim]], false) +-- Config for: mason.nvim +time([[Config for mason.nvim]], true) +try_loadstring("\27LJ\2\n3\0\0\3\0\3\0\0066\0\0\0'\2\1\0B\0\2\0029\0\2\0B\0\1\1K\0\1\0\nsetup\nmason\frequire\0", "config", "mason.nvim") +time([[Config for mason.nvim]], 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