Merge branch 'dev' into mercury
nvim: add colors + icons to nvim-cmp trim down colorscheme dwm: add screenshot script mail: change Centrale name to "Smecta"
This commit is contained in:
commit
8fbbc291ab
|
@ -1,6 +1,6 @@
|
||||||
# vim: filetype=neomuttrc
|
# vim: filetype=neomuttrc
|
||||||
# muttrc file for account david.julien@centrale-marseille.fr
|
# muttrc file for account david.julien@centrale-marseille.fr
|
||||||
set realname = "David JULIEN"
|
set realname = "Smecta"
|
||||||
set from = "david.julien@centrale-marseille.fr"
|
set from = "david.julien@centrale-marseille.fr"
|
||||||
set sendmail = "msmtp -a david.julien@centrale-marseille.fr"
|
set sendmail = "msmtp -a david.julien@centrale-marseille.fr"
|
||||||
alias me david.julien <david.julien@centrale-marseille.fr>
|
alias me david.julien <david.julien@centrale-marseille.fr>
|
||||||
|
|
|
@ -17,6 +17,35 @@ end
|
||||||
-- If you want insert `(` after select function or method item
|
-- If you want insert `(` after select function or method item
|
||||||
cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
|
cmp.event:on( 'confirm_done', cmp_autopairs.on_confirm_done({ map_char = { tex = '' } }))
|
||||||
|
|
||||||
|
-- Custom item icons
|
||||||
|
local icons = {
|
||||||
|
Class = "",
|
||||||
|
Color = "",
|
||||||
|
Constant = "µ",
|
||||||
|
Constructor = "",
|
||||||
|
Enum = "",
|
||||||
|
EnumMember = "",
|
||||||
|
Event = "",
|
||||||
|
Field = "",
|
||||||
|
File = "",
|
||||||
|
Folder = "",
|
||||||
|
Function = "",
|
||||||
|
Keyword = "",
|
||||||
|
Interface = "",
|
||||||
|
Method = "",
|
||||||
|
Module = "",
|
||||||
|
Operator = "",
|
||||||
|
Property = "",
|
||||||
|
Reference = "",
|
||||||
|
Snippet = "",
|
||||||
|
Struct = "",
|
||||||
|
Text = "",
|
||||||
|
TypeParameter = "",
|
||||||
|
Unit = "",
|
||||||
|
Value = "",
|
||||||
|
Variable = "",
|
||||||
|
}
|
||||||
|
|
||||||
cmp.setup {
|
cmp.setup {
|
||||||
completion = {
|
completion = {
|
||||||
autocomplete = false
|
autocomplete = false
|
||||||
|
@ -33,6 +62,8 @@ cmp.setup {
|
||||||
},
|
},
|
||||||
formatting = {
|
formatting = {
|
||||||
format = function(entry, vim_item)
|
format = function(entry, vim_item)
|
||||||
|
vim_item.kind = string.format("%s %s", icons[vim_item.kind],
|
||||||
|
vim_item.kind)
|
||||||
vim_item.menu = ({
|
vim_item.menu = ({
|
||||||
nvim_lsp = "[lsp]",
|
nvim_lsp = "[lsp]",
|
||||||
nvim_lua = "[nvim]",
|
nvim_lua = "[nvim]",
|
||||||
|
@ -79,5 +110,8 @@ cmp.setup {
|
||||||
fallback()
|
fallback()
|
||||||
end
|
end
|
||||||
end, { "i", "s" }),
|
end, { "i", "s" }),
|
||||||
}
|
},
|
||||||
|
view = {
|
||||||
|
entries = {name = 'custom', selection_order = 'near_cursor' }
|
||||||
|
},
|
||||||
}
|
}
|
||||||
|
|
|
@ -3,8 +3,6 @@
|
||||||
-- License : GPLv3
|
-- License : GPLv3
|
||||||
-- Description : neovim lsp config file
|
-- Description : neovim lsp config file
|
||||||
|
|
||||||
local M = {}
|
|
||||||
|
|
||||||
vim.fn.sign_define(
|
vim.fn.sign_define(
|
||||||
"DiagnosticSignError",
|
"DiagnosticSignError",
|
||||||
{
|
{
|
||||||
|
@ -37,41 +35,3 @@ vim.fn.sign_define(
|
||||||
numhl = "DiagnosticSignInfo"
|
numhl = "DiagnosticSignInfo"
|
||||||
}
|
}
|
||||||
)
|
)
|
||||||
|
|
||||||
M.icons = {
|
|
||||||
Class = " ",
|
|
||||||
Color = " ",
|
|
||||||
Constant = " µ ",
|
|
||||||
Constructor = " ",
|
|
||||||
Enum = " ",
|
|
||||||
EnumMember = " ",
|
|
||||||
Event = " ",
|
|
||||||
Field = " ",
|
|
||||||
File = " ",
|
|
||||||
Folder = " ",
|
|
||||||
Function = " ",
|
|
||||||
Keyword = " ",
|
|
||||||
Interface = " ",
|
|
||||||
Method = " ",
|
|
||||||
Module = " ",
|
|
||||||
Operator = " ",
|
|
||||||
Property = " ",
|
|
||||||
Reference = " ",
|
|
||||||
Snippet = " ",
|
|
||||||
Struct = " ",
|
|
||||||
Text = " ",
|
|
||||||
TypeParameter = " ",
|
|
||||||
Unit = " ",
|
|
||||||
Value = " ",
|
|
||||||
Variable = " ",
|
|
||||||
}
|
|
||||||
|
|
||||||
|
|
||||||
function M.setup()
|
|
||||||
local kinds = vim.lsp.protocol.CompletionItemKind
|
|
||||||
for i, kind in ipairs(kinds) do
|
|
||||||
kinds[i] = M.icons[kind] or kind
|
|
||||||
end
|
|
||||||
end
|
|
||||||
|
|
||||||
return M
|
|
||||||
|
|
|
@ -74,10 +74,12 @@ end
|
||||||
-- Returns a snippet_node wrapped around an insert_node whose initial
|
-- Returns a snippet_node wrapped around an insert_node whose initial
|
||||||
-- text value is set to the current date in the desired format.
|
-- text value is set to the current date in the desired format.
|
||||||
local function date_input(fmt)
|
local function date_input(fmt)
|
||||||
local fmt = fmt or "%Y-%m-%d"
|
local format = fmt or "%Y-%m-%d"
|
||||||
return sn(nil, i(1, os.date(fmt)))
|
return sn(nil, i(1, os.date(format)))
|
||||||
end
|
end
|
||||||
|
|
||||||
|
local copy = utils.copy
|
||||||
|
|
||||||
-- snippets are added via ls.add_snippets(filetype, snippets[, opts]), where
|
-- snippets are added via ls.add_snippets(filetype, snippets[, opts]), where
|
||||||
-- opts may specify the `type` of the snippets ("snippets" or "autosnippets",
|
-- opts may specify the `type` of the snippets ("snippets" or "autosnippets",
|
||||||
-- for snippets that should expand directly after the trigger is typed).
|
-- for snippets that should expand directly after the trigger is typed).
|
||||||
|
|
|
@ -58,7 +58,7 @@ return require("packer").startup(function()
|
||||||
requires = {
|
requires = {
|
||||||
"neovim/nvim-lspconfig",
|
"neovim/nvim-lspconfig",
|
||||||
config = function()
|
config = function()
|
||||||
require("plugin.lsp_config").setup() end
|
require("plugin.lsp_config") end
|
||||||
},
|
},
|
||||||
config = function() require("plugin.lsp_installer") end
|
config = function() require("plugin.lsp_installer") end
|
||||||
}
|
}
|
||||||
|
|
|
@ -48,6 +48,9 @@ super + shift + Return
|
||||||
super + d
|
super + d
|
||||||
dmenu_run -p "run:"
|
dmenu_run -p "run:"
|
||||||
|
|
||||||
|
super + p
|
||||||
|
screenshot
|
||||||
|
|
||||||
super + shift + {w,z}
|
super + shift + {w,z}
|
||||||
$BROWSER
|
$BROWSER
|
||||||
|
|
||||||
|
|
|
@ -0,0 +1,10 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
if [ "-w" = "$1" ]; then
|
||||||
|
scrot -e 'xclip -selection clipboard -t image/png -i $f && rm $f'
|
||||||
|
else
|
||||||
|
if [ ! "" = "$1" ]; then
|
||||||
|
dunstify -u "normal" " Wrong parameter. No screenshot taken" && exit 1
|
||||||
|
else
|
||||||
|
scrot -s -e 'xclip -selection clipboard -t image/png -i $f && rm $f'
|
||||||
|
fi
|
||||||
|
fi
|
|
@ -1 +1 @@
|
||||||
Subproject commit 9b46e0fa3d2bfca3b376961d822eb5d965da48ed
|
Subproject commit 41edd2a8502cc6d3be9ad18387e8b3c67d2dd4c3
|
Reference in New Issue