Merge branch 'master' into laptop

laptop
Elias Almqvist 2 years ago
commit e84fac834e
  1. 6
      nvim/.config/nvim/after/plugin/lsp.lua
  2. 2
      nvim/.config/nvim/after/plugin/presence.lua
  3. 14
      nvim/.config/nvim/lua/evim/packer.lua
  4. 10
      nvim/.config/nvim/plugin/packer_compiled.lua

@ -13,9 +13,9 @@ lsp.ensure_installed({
local cmp = require("cmp") local cmp = require("cmp")
local cmp_select = { behavior = cmp.SelectBehavior.Select } local cmp_select = { behavior = cmp.SelectBehavior.Select }
local cmp_mappings = lsp.defaults.cmp_mappings({ local cmp_mappings = lsp.defaults.cmp_mappings({
["<C-p>"] = cmp.mapping.select_prev_item(cmp_select), ["<C-k>"] = cmp.mapping.select_prev_item(cmp_select),
["<C-n>"] = cmp.mapping.select_next_item(cmp_select), ["<C-j>"] = cmp.mapping.select_next_item(cmp_select),
["<C-y>"] = cmp.mapping.confirm({ select = true }), -- ["<C-y>"] = cmp.mapping.confirm({ select = true }),
["<C-Space>"] = cmp.mapping.complete(), ["<C-Space>"] = cmp.mapping.complete(),
}) })

@ -10,7 +10,7 @@ require("presence").setup({
blacklist = {}, -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches blacklist = {}, -- A list of strings or Lua patterns that disable Rich Presence if the current file name, path, or workspace matches
buttons = false, -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table) buttons = false, -- Configure Rich Presence button(s), either a boolean to enable/disable, a static table (`{{ label = "<label>", url = "<url>" }, ...}`, or a function(buffer: string, repo_url: string|nil): table)
file_assets = {}, -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference) file_assets = {}, -- Custom file asset definitions keyed by file names and extensions (see default config at `lua/presence/file_assets.lua` for reference)
show_time = false, -- Show the timer show_time = true, -- Show the timer
-- Rich Presence text options -- Rich Presence text options
editing_text = "Editing %s", -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string) editing_text = "Editing %s", -- Format string rendered when an editable file is loaded in the buffer (either string or function(filename: string): string)

@ -25,7 +25,7 @@ return require("packer").startup(function(use)
branch = "v2.x", branch = "v2.x",
requires = { requires = {
-- LSP Support -- LSP Support
{ "neovim/nvim-lspconfig" }, -- Required { "neovim/nvim-lspconfig" }, -- Required
{ {
-- Optional -- Optional
"williamboman/mason.nvim", "williamboman/mason.nvim",
@ -33,12 +33,12 @@ return require("packer").startup(function(use)
pcall(vim.cmd, "MasonUpdate") pcall(vim.cmd, "MasonUpdate")
end, end,
}, },
{ "williamboman/mason-lspconfig.nvim" }, -- Optional { "williamboman/mason-lspconfig.nvim" }, -- Optional
-- Autocompletion -- Autocompletion
{ "hrsh7th/nvim-cmp" }, -- Required { "hrsh7th/nvim-cmp" }, -- Required
{ "hrsh7th/cmp-nvim-lsp" }, -- Required { "hrsh7th/cmp-nvim-lsp" }, -- Required
{ "L3MON4D3/LuaSnip" }, -- Required { "L3MON4D3/LuaSnip" }, -- Required
} }
} }
@ -57,4 +57,8 @@ return require("packer").startup(function(use)
require("todo-comments").setup({}) require("todo-comments").setup({})
end end
} }
use {
"windwp/nvim-autopairs",
config = function() require("nvim-autopairs").setup {} end
}
end) end)

@ -120,6 +120,12 @@ _G.packer_plugins = {
path = "/home/elal/.local/share/nvim/site/pack/packer/start/melange-nvim", path = "/home/elal/.local/share/nvim/site/pack/packer/start/melange-nvim",
url = "https://github.com/savq/melange-nvim" url = "https://github.com/savq/melange-nvim"
}, },
["nvim-autopairs"] = {
config = { "\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0" },
loaded = true,
path = "/home/elal/.local/share/nvim/site/pack/packer/start/nvim-autopairs",
url = "https://github.com/windwp/nvim-autopairs"
},
["nvim-cmp"] = { ["nvim-cmp"] = {
loaded = true, loaded = true,
path = "/home/elal/.local/share/nvim/site/pack/packer/start/nvim-cmp", path = "/home/elal/.local/share/nvim/site/pack/packer/start/nvim-cmp",
@ -174,6 +180,10 @@ time([[Defining packer_plugins]], false)
time([[Config for todo-comments.nvim]], true) time([[Config for todo-comments.nvim]], true)
try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim") try_loadstring("\27LJ\2\n?\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\18todo-comments\frequire\0", "config", "todo-comments.nvim")
time([[Config for todo-comments.nvim]], false) time([[Config for todo-comments.nvim]], false)
-- Config for: nvim-autopairs
time([[Config for nvim-autopairs]], true)
try_loadstring("\27LJ\2\n@\0\0\3\0\3\0\a6\0\0\0'\2\1\0B\0\2\0029\0\2\0004\2\0\0B\0\2\1K\0\1\0\nsetup\19nvim-autopairs\frequire\0", "config", "nvim-autopairs")
time([[Config for nvim-autopairs]], false)
-- Config for: Comment.nvim -- Config for: Comment.nvim
time([[Config for Comment.nvim]], true) time([[Config for Comment.nvim]], true)
try_loadstring("\27LJ\2\n5\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\fComment\frequire\0", "config", "Comment.nvim") try_loadstring("\27LJ\2\n5\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\fComment\frequire\0", "config", "Comment.nvim")

Loading…
Cancel
Save