Skip to content

Commit ddd9d93

Browse files
jmbuhrjmbuhr
committed
wip
1 parent c030cc5 commit ddd9d93

File tree

10 files changed

+125
-126
lines changed

10 files changed

+125
-126
lines changed

‎ftplugin/quarto.lua

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
vim.b.slime_cell_delimiter = "```"
22
vim.b["quarto_is_r_mode"] = nil
3+
vim.b['reticulate_running'] = false
34

45
-- wrap text, but by word no character
56
-- indent the wrappped line

‎lua/config/global.lua

+1-1
Original file line numberDiff line numberDiff line change
@@ -59,7 +59,7 @@ let g:currentmode={
5959
\ 't' : '%#ModeMsg# TERM ',
6060
\}
6161
]])
62-
vim.opt.statusline = "%{%g:currentmode[mode()]%} %* %t | %y | %* %= c:%c l:%l/%L %p%% 🦦 "
62+
vim.opt.statusline = "%{%g:currentmode[mode()]%} %{%reg_recording()%} %* %t | %y | %* %= c:%c l:%l/%L %p%% 🦦 "
6363

6464
-- hide cmdline when not used
6565
vim.opt.cmdheight = 1

‎lua/config/keymap.lua

+29-44
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,8 @@
11
local wk = require("which-key")
22

3-
vim.b["quarto_is_r_mode"] = nil
4-
vim.b['reticulate_running'] = false
3+
vim.g["quarto_is_r_mode"] = nil
4+
vim.g['reticulate_running'] = false
5+
56

67
P = function(x)
78
print(vim.inspect(x))
@@ -217,75 +218,59 @@ wk.register({
217218
},
218219
f = {
219220
name = "[f]ind (telescope)",
220-
f = { "<cmd>Telescope find_files<cr>", "files" },
221-
h = { "<cmd>Telescope help_tags<cr>", "help" },
222-
k = { "<cmd>Telescope keymaps<cr>", "keymaps" },
223-
r = { "<cmd>Telescope lsp_references<cr>", "references" },
224-
g = { "<cmd>Telescope live_grep<cr>", "grep" },
225-
b = { "<cmd>Telescope current_buffer_fuzzy_find<cr>", "fuzzy" },
226-
m = { "<cmd>Telescope marks<cr>", "marks" },
227-
M = { "<cmd>Telescope man_pages<cr>", "man pages" },
228-
c = { "<cmd>Telescope git_commits<cr>", "git commits" },
229-
s = { "<cmd>Telescope lsp_document_symbols<cr>", "symbols" },
230-
d = { "<cmd>Telescope buffers<cr>", "buffers" },
231-
q = { "<cmd>Telescope quickfix<cr>", "quickfix" },
232-
l = { "<cmd>Telescope loclist<cr>", "loclist" },
233-
j = { "<cmd>Telescope jumplist<cr>", "marks" },
221+
f = { "<cmd>Telescope find_files<cr>", "[f]iles" },
222+
h = { "<cmd>Telescope help_tags<cr>", "[h]elp" },
223+
k = { "<cmd>Telescope keymaps<cr>", "[k]eymaps" },
224+
r = { "<cmd>Telescope lsp_references<cr>", "[r]eferences" },
225+
g = { "<cmd>Telescope live_grep<cr>", "[g]rep" },
226+
b = { "<cmd>Telescope current_buffer_fuzzy_find<cr>", "[b]uffer fuzzy find" },
227+
m = { "<cmd>Telescope marks<cr>", "[m]arks" },
228+
M = { "<cmd>Telescope man_pages<cr>", "[M]an pages" },
229+
c = { "<cmd>Telescope git_commits<cr>", "git [c]ommits" },
230+
s = { "<cmd>Telescope lsp_document_symbols<cr>", "document [s]ymbols" },
231+
['<space>'] = { "<cmd>Telescope buffers<cr>", "[ ] buffers" },
232+
d = { "<cmd>Telescope buffers<cr>", "[d] buffers" },
233+
q = { "<cmd>Telescope quickfix<cr>", "[q]uickfix" },
234+
l = { "<cmd>Telescope loclist<cr>", "[l]oclist" },
235+
j = { "<cmd>Telescope jumplist<cr>", "[j]umplist" },
234236
},
235237
h = {
236-
name = "help/debug/conceal",
238+
name = "[h]elp/debug/conceal",
237239
c = {
238240
name = "conceal",
239241
h = { ":set conceallevel=1<cr>", "hide/conceal" },
240242
s = { ":set conceallevel=0<cr>", "show/unconceal" },
241243
},
242244
t = {
243-
name = "treesitter",
244-
t = { vim.treesitter.inspect_tree, "show tree" },
245-
c = { ":=vim.treesitter.get_captures_at_cursor()<cr>", "show capture" },
246-
n = { ":=vim.treesitter.get_node():type()<cr>", "show node" },
245+
name = "[t]reesitter",
246+
t = { vim.treesitter.inspect_tree, "show [t]ree" },
247+
c = { ":=vim.treesitter.get_captures_at_cursor()<cr>", "show [c]apture" },
248+
n = { ":=vim.treesitter.get_node():type()<cr>", "show [n]ode" },
247249
},
248250
},
249-
s = {
250-
name = "spellcheck",
251-
s = { "<cmd>Telescope spell_suggest<cr>", "spelling" },
252-
["/"] = { "<cmd>setlocal spell!<cr>", "spellcheck" },
253-
n = { "]s", "next" },
254-
p = { "[s", "previous" },
255-
g = { "zg", "good" },
256-
r = { "zg", "rigth" },
257-
w = { "zw", "wrong" },
258-
b = { "zw", "bad" },
259-
["?"] = { "<cmd>Telescope spell_suggest<cr>", "suggest" },
260-
},
261251
g = {
262-
name = "git",
252+
name = "[g]it",
263253
c = { ":GitConflictRefresh<cr>", "conflict" },
264-
g = { ":Neogit<cr>", "neogit" },
265254
s = { ":Gitsigns<cr>", "gitsigns" },
266255
pl = { ":Octo pr list<cr>", "gh pr list" },
267256
pr = { ":Octo review start<cr>", "gh pr review" },
268257
wc = { ":lua require('telescope').extensions.git_worktree.create_git_worktree()<cr>", "worktree create" },
269258
ws = { ":lua require('telescope').extensions.git_worktree.git_worktrees()<cr>", "worktree switch" },
270259
d = {
271-
name = "diff",
260+
name = "[d]iff",
272261
o = { ":DiffviewOpen<cr>", "open" },
273262
c = { ":DiffviewClose<cr>", "close" },
274263
},
275264
b = {
276-
name = "blame",
265+
name = "[b]lame",
277266
b = { ":GitBlameToggle<cr>", "toggle" },
278267
o = { ":GitBlameOpenCommitURL<cr>", "open" },
279268
c = { ":GitBlameCopyCommitURL<cr>", "copy" },
280269
},
281270
},
282-
w = {
283-
name = "write",
284-
w = { ":w<cr>", "write" },
285-
},
286271
x = {
287-
name = "execute",
288-
x = { ":w<cr>:source %<cr>", "file" },
272+
name = "e[x]ecute",
273+
x = { ":w<cr>:source %<cr>", "[x] source file" },
289274
},
290275
}, { mode = "n", prefix = "<leader>" })
291276

@@ -332,6 +317,7 @@ wk.register({
332317
["<m-I>"] = { insert_py_chunk, "python code chunk" },
333318
["]q"] = { ":silent cnext<cr>", "quickfix next" },
334319
["[q"] = { ":silent cprev<cr>", "quickfix prev" },
320+
["z?"] = { ":setlocal spell!<cr>", "toggle spellcheck" },
335321
}, { mode = "n", silent = true })
336322

337323
-- visual mode
@@ -350,7 +336,6 @@ wk.register({
350336

351337
-- insert mode
352338
wk.register({
353-
-- ['<c-e>'] = { "<esc>:FeMaco<cr>i", "edit code" },
354339
["<m-->"] = { " <- ", "assign" },
355340
["<m-m>"] = { " |>", "pipe" },
356341
["<m-i>"] = { insert_r_chunk, "r code chunk" },

‎lua/plugins/colorthemes.lua

+14-4
Original file line numberDiff line numberDiff line change
@@ -1,20 +1,30 @@
11
return {
22
{ "shaunsingh/nord.nvim",
3-
enabled = false
3+
enabled = false,
4+
lazy = false,
5+
priority = 1000,
46
},
57
{ "folke/tokyonight.nvim",
6-
enabled = false
8+
enabled = false,
9+
lazy = false,
10+
priority = 1000,
711
},
812
{ "EdenEast/nightfox.nvim",
9-
enabled = false
13+
enabled = false,
14+
lazy = false,
15+
priority = 1000,
1016
},
1117
{
1218
"catppuccin/nvim",
1319
name = "catppuccin",
20+
lazy = false, -- make sure we load this during startup if it is your main colorscheme
21+
priority = 1000, -- make sure to load this before all the other start plugins
1422
},
1523
{
1624
"olimorris/onedarkpro.nvim",
17-
enabled = false
25+
enabled = false,
26+
lazy = false,
27+
priority = 1000,
1828
},
1929

2030
-- color html colors

‎lua/plugins/debugging.lua

+47-47
Original file line numberDiff line numberDiff line change
@@ -1,50 +1,50 @@
11
return {
2-
{
3-
"nvim-neotest/neotest",
4-
dependencies = { "nvim-neotest/neotest-python" },
5-
config = function()
6-
require("neotest").setup({
7-
adapters = {
8-
require("neotest-python"),
9-
},
10-
})
11-
end,
12-
keys = {
13-
{ "<leader>dtt", ":lua require'neotest'.run.run({strategy = 'dap'})<cr>", desc = "test" },
14-
{ "<leader>dts", ":lua require'neotest'.run.stop()<cr>", desc = "stop test" },
15-
{ "<leader>dta", ":lua require'neotest'.run.attach()<cr>", desc = "attach test" },
16-
{ "<leader>dtf", ":lua require'neotest'.run.run(vim.fn.expand('%'))<cr>", desc = "test file" },
17-
{ "<leader>dts", ":lua require'neotest'.summary.toggle()<cr>", desc = "test summary" },
18-
},
19-
},
2+
{
3+
"nvim-neotest/neotest",
4+
dependencies = { "nvim-neotest/neotest-python" },
5+
config = function()
6+
require("neotest").setup({
7+
adapters = {
8+
require("neotest-python"),
9+
},
10+
})
11+
end,
12+
keys = {
13+
{ "<leader>dtt", ":lua require'neotest'.run.run({strategy = 'dap'})<cr>", desc = "test" },
14+
{ "<leader>dts", ":lua require'neotest'.run.stop()<cr>", desc = "stop test" },
15+
{ "<leader>dta", ":lua require'neotest'.run.attach()<cr>", desc = "attach test" },
16+
{ "<leader>dtf", ":lua require'neotest'.run.run(vim.fn.expand('%'))<cr>", desc = "test file" },
17+
{ "<leader>dts", ":lua require'neotest'.summary.toggle()<cr>", desc = "test summary" },
18+
},
19+
},
2020

21-
-- debug adapter protocol
22-
{
23-
"mfussenegger/nvim-dap",
24-
dependencies = {
25-
{
26-
"rcarriga/nvim-dap-ui",
27-
config = function()
28-
vim.fn.sign_define("DapBreakpoint", { text = "🦦", texthl = "", linehl = "", numhl = "" })
29-
require("dapui").setup()
30-
end,
31-
},
32-
{
33-
"mfussenegger/nvim-dap-python",
34-
config = function()
35-
require("dap-python").setup()
36-
require("dap.ext.vscode").load_launchjs("launch.json")
37-
end,
38-
},
39-
},
40-
keys = {
41-
{ "<leader>db", ":lua require'dap'.toggle_breakpoint()<cr>", desc = "debug breakpoint" },
42-
{ "<leader>dc", ": lua require'dap'.continue()<cr>", desc = "debug" },
43-
{ "<leader>do", ": lua require'dap'.step_over()<cr>", desc = "debug over" },
44-
{ "<leader>dO", ": lua require'dap'.step_out()<cr>", desc = "debug out" },
45-
{ "<leader>di", ": lua require'dap'.step_into()<cr>", desc = "debug into" },
46-
{ "<leader>dr", ": lua require'dap'.repl_open()<cr>", desc = "debug repl" },
47-
{ "<leader>du", ": lua require'dapui'.toggle()<cr>", desc = "debug ui" },
48-
},
49-
},
21+
-- debug adapter protocol
22+
{
23+
"mfussenegger/nvim-dap",
24+
dependencies = {
25+
{
26+
"rcarriga/nvim-dap-ui",
27+
config = function()
28+
vim.fn.sign_define("DapBreakpoint", { text = "🦦", texthl = "", linehl = "", numhl = "" })
29+
require("dapui").setup()
30+
end,
31+
},
32+
{
33+
"mfussenegger/nvim-dap-python",
34+
config = function()
35+
require("dap-python").setup()
36+
require("dap.ext.vscode").load_launchjs("launch.json")
37+
end,
38+
},
39+
},
40+
keys = {
41+
{ "<leader>db", ":lua require'dap'.toggle_breakpoint()<cr>", desc = "debug breakpoint" },
42+
{ "<leader>dc", ": lua require'dap'.continue()<cr>", desc = "debug" },
43+
{ "<leader>do", ": lua require'dap'.step_over()<cr>", desc = "debug over" },
44+
{ "<leader>dO", ": lua require'dap'.step_out()<cr>", desc = "debug out" },
45+
{ "<leader>di", ": lua require'dap'.step_into()<cr>", desc = "debug into" },
46+
{ "<leader>dr", ": lua require'dap'.repl_open()<cr>", desc = "debug repl" },
47+
{ "<leader>du", ": lua require'dapui'.toggle()<cr>", desc = "debug ui" },
48+
},
49+
},
5050
}

‎lua/plugins/dev.lua

+1
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
return {
22

3+
-- profile your config to see what code is executed
34
{'stevearc/profile.nvim',
45
enabled = false,
56
config = function()

‎lua/plugins/editing.lua

+11-24
Original file line numberDiff line numberDiff line change
@@ -1,32 +1,17 @@
11
return {
2-
{
3-
"LunarVim/bigfile.nvim",
4-
init = function()
5-
-- default config
6-
require("bigfile").setup({
7-
filesize = 2, -- size of the file in MiB, the plugin round file sizes to the closest MiB
8-
pattern = { "*" }, -- autocmd pattern
9-
features = { -- features to disable
10-
"indent_blankline",
11-
"illuminate",
12-
"lsp",
13-
"treesitter",
14-
"syntax",
15-
"matchparen",
16-
"vimopts",
17-
"filetype",
18-
},
19-
})
20-
end,
21-
},
22-
{ "tpope/vim-repeat" },
2+
3+
-- disables hungry features for files larget than 2MB
4+
{ "LunarVim/bigfile.nvim" },
5+
6+
7+
-- add/delete/change can be done with the keymaps
8+
-- ys{motion}{char}, ds{char}, and cs{target}{replacement}
239
{
2410
"kylechui/nvim-surround",
2511
event = "VeryLazy",
26-
config = function()
27-
require("nvim-surround").setup()
28-
end,
12+
opts = {},
2913
},
14+
3015
{
3116
"windwp/nvim-autopairs",
3217
config = function()
@@ -42,8 +27,10 @@ return {
4227
branch = "master",
4328
config = true, -- default settings
4429
},
30+
4531
{
4632
"danymat/neogen",
33+
enabled = false,
4734
dependencies = "nvim-treesitter/nvim-treesitter",
4835
config = true,
4936
},

‎lua/plugins/git.lua

+8-1
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,16 @@
1+
-- git plugins
2+
13
return {
2-
-- git and projects
34
{ "sindrets/diffview.nvim" },
5+
6+
-- handy git ui
47
{
58
"NeogitOrg/neogit",
69
lazy = true,
710
cmd = "Neogit",
11+
keys = {
12+
{ "<leader>gg", ":Neogit<cr>", desc = "neo[g]it" },
13+
},
814
config = function()
915
require("neogit").setup({
1016
disable_commit_confirmation = true,
@@ -14,6 +20,7 @@ return {
1420
})
1521
end,
1622
},
23+
1724
{
1825
"lewis6991/gitsigns.nvim",
1926
config = function()

‎lua/plugins/quarto.lua

+9-5
Original file line numberDiff line numberDiff line change
@@ -3,6 +3,11 @@ return {
33
{
44
"quarto-dev/quarto-nvim",
55
dev = false,
6+
opts = {
7+
lspFeatures = {
8+
languages = { "r", "python", "julia", "bash", "lua", "html", "dot", "javascript", "typescript", "ojs" },
9+
},
10+
},
611
dependencies = {
712
{
813
"jmbuhr/otter.nvim",
@@ -26,11 +31,6 @@ return {
2631
},
2732
},
2833
},
29-
opts = {
30-
lspFeatures = {
31-
languages = { "r", "python", "julia", "bash", "lua", "html", "dot", "javascript", "typescript", "ojs" },
32-
},
33-
},
3434
},
3535

3636
{
@@ -39,7 +39,11 @@ return {
3939
branch = "master",
4040
run = ":TSUpdate",
4141
config = function()
42+
43+
---@diagnostic disable-next-line: missing-fields
4244
require("nvim-treesitter.configs").setup({
45+
-- Autoinstall languages that are not installed
46+
auto_install = true,
4347
ensure_installed = {
4448
"r",
4549
"python",

0 commit comments

Comments
 (0)