merge
This commit is contained in:
commit
27ecf3f740
6 changed files with 73 additions and 182 deletions
|
@ -37,6 +37,7 @@ function u
|
||||||
sudo pacman -Syu $argv
|
sudo pacman -Syu $argv
|
||||||
end
|
end
|
||||||
|
|
||||||
set PATH /home/afonso/.rustup/toolchains/nightly-x86_64-unknown-linux-gnu/bin $PATH
|
|
||||||
set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/afonso/.ghcup/bin $PATH # ghcup-env
|
set -q GHCUP_INSTALL_BASE_PREFIX[1]; or set GHCUP_INSTALL_BASE_PREFIX $HOME ; set -gx PATH $HOME/.cabal/bin /home/afonso/.ghcup/bin $PATH # ghcup-env
|
||||||
set PATH $HOME/.local/bin $HOME/.cargo/bin $HOME/.local/bin $PATH
|
fish_add_path /home/afonso/.rustup/toolchains/stable-x86_64-unknown-linux-gnu/bin
|
||||||
|
fish_add_path $HOME/.local/bin
|
||||||
|
fish_add_path $HOME/.cargo/bin
|
||||||
|
|
|
@ -1,134 +0,0 @@
|
||||||
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 = {
|
|
||||||
["<C-k>"] = cmp.mapping.select_prev_item(),
|
|
||||||
["<C-j>"] = cmp.mapping.select_next_item(),
|
|
||||||
["<C-b>"] = cmp.mapping(cmp.mapping.scroll_docs(-1), { "i", "c" }),
|
|
||||||
["<C-f>"] = cmp.mapping(cmp.mapping.scroll_docs(1), { "i", "c" }),
|
|
||||||
["<C-Space>"] = cmp.mapping(cmp.mapping.complete(), { "i", "c" }),
|
|
||||||
["<C-y>"] = cmp.config.disable, -- Specify `cmp.config.disable` if you want to remove the default `<C-y>` mapping.
|
|
||||||
["<C-e>"] = 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.
|
|
||||||
["<CR>"] = cmp.mapping.confirm { select = true },
|
|
||||||
["<Tab>"] = 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",
|
|
||||||
}),
|
|
||||||
["<S-Tab>"] = 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 = ({
|
|
||||||
nvim_lsp = "(LSP)",
|
|
||||||
luasnip = "(Snippet)",
|
|
||||||
buffer = "(Text)",
|
|
||||||
path = "(Path)",
|
|
||||||
})[entry.source.name]
|
|
||||||
return vim_item
|
|
||||||
end,
|
|
||||||
},
|
|
||||||
sources = {
|
|
||||||
{ name = "nvim_lsp" },
|
|
||||||
{ name = "luasnip" },
|
|
||||||
{ name = "buffer" },
|
|
||||||
{ name = "path" },
|
|
||||||
},
|
|
||||||
confirm_opts = {
|
|
||||||
behavior = cmp.ConfirmBehavior.Replace,
|
|
||||||
select = false,
|
|
||||||
},
|
|
||||||
window = {
|
|
||||||
documentation = cmp.config.window.bordered(),
|
|
||||||
completion = cmp.config.window.bordered({
|
|
||||||
winhighlight = "Normal:Pmenu,FloatBorder:Pmenu,CursorLine:PmenuSel,Search:None"
|
|
||||||
})
|
|
||||||
|
|
||||||
},
|
|
||||||
experimental = {
|
|
||||||
ghost_text = false,
|
|
||||||
native_menu = false,
|
|
||||||
},
|
|
||||||
}
|
|
||||||
|
|
6
.config/nvim/lua/plugins/coq.lua
Normal file
6
.config/nvim/lua/plugins/coq.lua
Normal file
|
@ -0,0 +1,6 @@
|
||||||
|
vim.g.coq_settings = {
|
||||||
|
auto_start = 'shut-up',
|
||||||
|
clients = {
|
||||||
|
tmux = { enabled = false },
|
||||||
|
},
|
||||||
|
}
|
|
@ -28,21 +28,34 @@ local on_attach = function(client, bufnr)
|
||||||
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
vim.keymap.set('n', '<space>rn', vim.lsp.buf.rename, bufopts)
|
||||||
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
vim.keymap.set('n', '<space>ca', vim.lsp.buf.code_action, bufopts)
|
||||||
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
vim.keymap.set('n', 'gr', vim.lsp.buf.references, bufopts)
|
||||||
vim.keymap.set('n', '<space>f', function() vim.lsp.buf.format { async = true } end, bufopts)
|
vim.keymap.set('n', '<space>ge', function () vim.diagnostic.goto_next() end, bufopts)
|
||||||
|
vim.keymap.set('n', '<space>gE', function () vim.diagnostic.goto_prev() end, bufopts)
|
||||||
|
vim.keymap.set('n', '<space>fo', function() vim.lsp.buf.format { async = true } end, bufopts)
|
||||||
|
vim.api.nvim_create_autocmd('BufWritePre', {
|
||||||
|
pattern = '<buffer>',
|
||||||
|
callback = function() vim.lsp.buf.format({ async = true }) end
|
||||||
|
})
|
||||||
end
|
end
|
||||||
|
|
||||||
require('lspconfig')['hls'].setup{
|
local lsp = require "lspconfig"
|
||||||
|
local coq = require "coq"
|
||||||
|
|
||||||
|
lsp['hls'].setup{
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = lsp_flags,
|
flags = lsp_flags,
|
||||||
}
|
}
|
||||||
require('lspconfig')['rust_analyzer'].setup{
|
lsp['rust_analyzer'].setup{}
|
||||||
|
|
||||||
|
lsp.rust_analyzer.setup(
|
||||||
|
coq.lsp_ensure_capabilities{
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = lsp_flags,
|
flags = lsp_flags,
|
||||||
-- Server-specific settings...
|
-- Server-specific settings...
|
||||||
settings = {
|
settings = {
|
||||||
["rust-analyzer"] = {}
|
["rust-analyzer"] = {}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
)
|
||||||
require('lspconfig')['texlab'].setup{
|
require('lspconfig')['texlab'].setup{
|
||||||
on_attach = on_attach,
|
on_attach = on_attach,
|
||||||
flags = lsp_flags,
|
flags = lsp_flags,
|
||||||
|
|
|
@ -29,26 +29,31 @@ local plugins = packer.startup({function(use)
|
||||||
end
|
end
|
||||||
}
|
}
|
||||||
|
|
||||||
use { "hrsh7th/nvim-cmp",
|
use {"ms-jpq/coq_nvim",
|
||||||
requires = {
|
branch = 'coq',
|
||||||
'hrsh7th/cmp-nvim-lsp', -- lsp
|
config = function ()
|
||||||
'hrsh7th/cmp-buffer', --buffer completions
|
vim.g.coq_settings = { auto_start = 'shut-up'}
|
||||||
'hrsh7th/cmp-path', --path completions
|
|
||||||
'hrsh7th/cmp-cmdline' --cmdline completions
|
|
||||||
},
|
|
||||||
config = function()
|
|
||||||
require "plugins.cmp"
|
|
||||||
end
|
end
|
||||||
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
use {"ms-jpq/coq_nvim",
|
||||||
|
branch = 'artifacts',
|
||||||
|
}
|
||||||
|
|
||||||
use {'stevearc/dressing.nvim'} -- Rename variable pop up
|
use {'stevearc/dressing.nvim'} -- Rename variable pop up
|
||||||
|
|
||||||
|
use {"windwp/nvim-autopairs",
|
||||||
use { "L3MON4D3/LuaSnip",
|
config = function() require("nvim-autopairs").setup {} end
|
||||||
requires = {
|
|
||||||
"rafamadriz/friendly-snippets",
|
|
||||||
"saadparwaiz1/cmp_luasnip"
|
|
||||||
},
|
|
||||||
}
|
}
|
||||||
|
|
||||||
|
|
||||||
|
---- use { "L3MON4D3/LuaSnip",
|
||||||
|
-- requires = {
|
||||||
|
-- "rafamadriz/friendly-snippets",
|
||||||
|
---- "saadparwaiz1/cmp_luasnip"
|
||||||
|
-- },
|
||||||
|
-- }
|
||||||
use { "williamboman/mason.nvim",
|
use { "williamboman/mason.nvim",
|
||||||
config = function ()
|
config = function ()
|
||||||
require "plugins.mason"
|
require "plugins.mason"
|
||||||
|
|
|
@ -32,7 +32,7 @@
|
||||||
import System.Exit
|
import System.Exit
|
||||||
import XMonad.Util.SpawnOnce
|
import XMonad.Util.SpawnOnce
|
||||||
import XMonad.Layout.Spacing
|
import XMonad.Layout.Spacing
|
||||||
--import XMonad.Layout.Fullscreen
|
import XMonad.Hooks.WindowSwallowing
|
||||||
import qualified XMonad.StackSet as W
|
import qualified XMonad.StackSet as W
|
||||||
import qualified Data.Map as M
|
import qualified Data.Map as M
|
||||||
\end{code}
|
\end{code}
|
||||||
|
@ -322,7 +322,7 @@ Percent of screen to increment by when resizing panes
|
||||||
-- keys = myKeys,
|
-- keys = myKeys,
|
||||||
layoutHook = spacingWithEdge 10 $ myLayout,
|
layoutHook = spacingWithEdge 10 $ myLayout,
|
||||||
manageHook = manageSpawn <+> myManageHook <+> manageHook def,
|
manageHook = manageSpawn <+> myManageHook <+> manageHook def,
|
||||||
handleEventHook = myEventHook <+> fullscreenEventHook,
|
handleEventHook = myEventHook <+> fullscreenEventHook <+> swallowEventHook (className=?"Alacritty") (return True) ,
|
||||||
startupHook = myStartupHook}
|
startupHook = myStartupHook}
|
||||||
\end{code}
|
\end{code}
|
||||||
|
|
||||||
|
|
Loading…
Reference in a new issue