Skip to content

Commit 40e9f32

Browse files
committed
ocamls
1 parent 286d247 commit 40e9f32

32 files changed

+419
-406
lines changed
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
setlocal shiftwidth=1
2+
setlocal lisp

xdg_config/nvim/after/plugin/colorscheme.lua

Lines changed: 6 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -16,6 +16,8 @@ local Group = require("colorbuddy.group").Group
1616
local g = require("colorbuddy.group").groups
1717
local s = require("colorbuddy.style").styles
1818

19+
Group.new("@variable", c.superwhite, nil)
20+
1921
Group.new("GoTestSuccess", c.green, nil, s.bold)
2022
Group.new("GoTestFail", c.red, nil, s.bold)
2123

@@ -54,3 +56,7 @@ Group.new("InjectedLanguage", nil, g.Normal.bg:dark())
5456

5557
Group.new("LspParameter", nil, nil, s.italic)
5658
Group.new("LspDeprecated", nil, nil, s.strikethrough)
59+
Group.new("@function.bracket", g.Normal, g.Normal)
60+
61+
-- Group.new("@function.call.lua"
62+
vim.cmd [[highlight link @function.call.lua LuaFunctionCall]]

xdg_config/nvim/after/plugin/completion.lua

Lines changed: 21 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -25,7 +25,12 @@ if not ok then
2525
return
2626
end
2727

28-
lspkind.init()
28+
lspkind.init {
29+
symbol_map = {
30+
Copilot = "",
31+
},
32+
}
33+
vim.api.nvim_set_hl(0, "CmpItemKindCopilot", { fg = "#6CC644" })
2934

3035
local cmp = require "cmp"
3136

@@ -43,6 +48,13 @@ cmp.setup {
4348
},
4449
{ "i", "c" }
4550
),
51+
["<M-y>"] = cmp.mapping(
52+
cmp.mapping.confirm {
53+
behavior = cmp.ConfirmBehavior.Replace,
54+
select = false,
55+
},
56+
{ "i", "c" }
57+
),
4658

4759
["<c-space>"] = cmp.mapping {
4860
i = cmp.mapping.complete(),
@@ -72,7 +84,7 @@ cmp.setup {
7284
-- Testing
7385
["<c-q>"] = cmp.mapping.confirm {
7486
behavior = cmp.ConfirmBehavior.Replace,
75-
select = true,
87+
select = false,
7688
},
7789

7890
-- If you want tab completion :'(
@@ -101,17 +113,17 @@ cmp.setup {
101113
-- priority
102114
-- max_item_count
103115
-- (more?)
104-
sources = {
105-
{ name = "gh_issues" },
106-
107-
-- Youtube: Could enable this only for lua, but nvim_lua handles that already.
116+
sources = cmp.config.sources({
108117
{ name = "nvim_lua" },
109-
110118
{ name = "nvim_lsp" },
111-
{ name = "path" },
112119
{ name = "luasnip" },
120+
{ name = "copilot" },
121+
}, {
122+
{ name = "path" },
113123
{ name = "buffer", keyword_length = 5 },
114-
},
124+
}, {
125+
{ name = "gh_issues" },
126+
}),
115127

116128
sorting = {
117129
-- TODO: Would be cool to add stuff like "See variable names before method names" in rust, or something like that.

xdg_config/nvim/after/plugin/dap.lua

Lines changed: 4 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -613,13 +613,7 @@ dap.listeners.before.event_exited["dapui_config"] = function()
613613
dap_ui.close()
614614
end
615615

616-
--[[
617-
nnoremap <silent> <F10> :lua require'dap'.step_over()<CR>
618-
nnoremap <silent> <F12> :lua require'dap'.step_out()<CR>
619-
nnoremap <silent> <leader>B :lua require'dap'.set_breakpoint(vim.fn.input('Breakpoint condition: '))<CR>
620-
nnoremap <silent> <leader>lp :lua require'dap'.set_breakpoint(nil, nil, vim.fn.input('Log point message: '))<CR>
621-
nnoremap <silent> <leader>dl :lua require'dap'.repl.run_last()<CR>
622-
--]]
623-
624-
-- vim.cmd [[nmap <silent> <space>db <Plug>VimspectorToggleBreakpoint]]
625-
-- vim.cmd [[nmap <space>ds <Plug>VimscectorContinue]]
616+
local ok, dap_go = pcall(require, "dap-go")
617+
if ok then
618+
dap_go.setup()
619+
end
Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,16 @@
1+
vim.api.nvim_create_autocmd("TermOpen", {
2+
callback = function()
3+
vim.cmd.set "filetype=term"
4+
end,
5+
})
6+
17
vim.filetype.add {
28
extension = {
39
fnl = "fennel",
10+
wiki = "markdown",
11+
},
12+
filename = {
13+
["go.sum"] = "gosum",
14+
["go.mod"] = "gomod",
415
},
516
}
Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
require("hotpot").setup()

xdg_config/nvim/after/plugin/luasnip.lua

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ local types = require "luasnip.util.types"
1010
ls.config.set_config {
1111
-- This tells LuaSnip to remember to keep around the last snippet.
1212
-- You can jump back into it even if you move outside of the selection
13-
history = true,
13+
history = false,
1414

1515
-- This one is cool cause if you have dynamic snippets, it updates as you type!
1616
updateevents = "TextChanged,TextChangedI",

xdg_config/nvim/after/plugin/notify.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,5 +14,9 @@ local log = require("plenary.log").new {
1414

1515
vim.notify = function(msg, level, opts)
1616
log.info(msg, level, opts)
17+
if string.find(msg, "method .* is not supported") then
18+
return
19+
end
20+
1721
require "notify"(msg, level, opts)
1822
end
Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
-- TODO:
2+
-- vim.opt.rtp:append "/home/tjdevries/.opam/default/share/ocp-indent/vim"

xdg_config/nvim/after/plugin/sourcegraph.lua

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,3 +1,7 @@
1+
if not pcall(require, "sg") then
2+
return
3+
end
4+
15
if vim.g.dbs == nil then
26
vim.g.dbs = vim.empty_dict()
37
end

0 commit comments

Comments
 (0)