Configuration for my NixOS based systems and Home Manager
Use conform instead of neoformat, conjure vmp plugin, etc.
+32
-9
+5
-1
nvim/init.lua
+5
-1
nvim/init.lua
···
83
83
84
84
-- KEYMAPS
85
85
86
-
local keymap = vim.api.nvim_set_keymap
86
+
local keymap = vim.keymap.set
87
87
local noremap = {noremap = true}
88
88
local silentnoremap = {noremap = true, silent = true}
89
89
-- Easier breaking from edit modes
···
142
142
-- Autoformat!
143
143
keymap("n", "<C-n>", "<cmd>Neoformat<cr>", silentnoremap)
144
144
145
+
local conform = require("conform")
146
+
keymap("n", "<C-n>", conform.format, silentnoremap)
147
+
145
148
-- Python Specific
146
149
vim.g.python3_host_prog = vim.fn.expand("~/.envs/nvim/bin/python3")
147
150
148
151
-- Set up Treesitter
152
+
-- TODO: move this to plugins.lua
149
153
require("nvim-treesitter.configs").setup({
150
154
highlight = {enable = true, disable = {}},
151
155
indent = {enable = true, disable = {}},
+2
-3
nvim/lua/completion.lua
+2
-3
nvim/lua/completion.lua
···
19
19
['<CR>'] = cmp.mapping.confirm({select = true}) -- Accept currently selected item. Set `select` to `false` to only confirm explicitly selected items.
20
20
}),
21
21
sources = cmp.config.sources({
22
-
{name = 'nvim_lsp'},
23
-
{name = 'vsnip'}, -- For vsnip users.
24
-
{name = 'supermaven'}
22
+
{name = 'nvim_lsp'}, {name = 'vsnip'}, -- For vsnip users.
23
+
{name = 'supermaven'}, {name = 'conjure'}
25
24
}, {{name = 'buffer'}})
26
25
})
27
26
require("cmp_git").setup()
+25
-5
nvim/lua/plugins.lua
+25
-5
nvim/lua/plugins.lua
···
64
64
}, -- surround with pairs ))))))
65
65
-- "tpope/vim-surround",
66
66
-- Auto format tool
67
-
{"sbdchd/neoformat", lazy = true, cmd = "Neoformat"},
68
-
-- Distraction free writing: GoYo + Limelight
67
+
{
68
+
"stevearc/conform.nvim",
69
+
lazy = true,
70
+
opt = {
71
+
python = {"isort", "black"},
72
+
lua = {"lua-format"},
73
+
clojure = {"cljfmt"},
74
+
rust = {"rustfmt"},
75
+
haskell = {"ormolu", "stylish-haskell"},
76
+
go = { "goimports", "gofmt"},
77
+
java = {"google-java-format"},
78
+
javascript = {"prettier"},
79
+
html = {"prettier"},
80
+
yaml = {"prettier"},
81
+
sh = {"shfmt"},
82
+
c = {"clang-format"},
83
+
}
84
+
}, -- Distraction free writing: GoYo + Limelight
69
85
{"junegunn/limelight.vim", lazy = true, ft = "markdown"},
70
86
{"junegunn/goyo.vim", lazy = true, ft = "markdown"}, -- Golang plugins
71
87
-- use {"fatih/vim-go", run = ":GoUpdateBinaries", lazy = true, ft = "go"}
···
98
114
vim.o.timeout = true
99
115
vim.o.timeoutlen = 300
100
116
end,
101
-
opgs = {}
117
+
opts = {},
118
+
config = true
102
119
}, -- literally the best plugin ever
103
120
-- Developing my neovim
104
121
{"folke/neodev.nvim", opts = {}}, -- Lithsps
122
+
{"m4xshen/autoclose.nvim"},
105
123
{"guns/vim-sexp", ft = {"hy", "scheme", "clojure"}}, -- ))))))
106
124
{"hiphish/rainbow-delimiters.nvim"},
107
125
-- {"gpanders/nvim-parinfer", ft = {"scheme", "lisp", "fennel", "clojure", "lua"}},
···
117
135
config = function()
118
136
vim.g["conjure#client#scheme#stdio#command"] = "gxi"
119
137
vim.g["conjure#client#scheme#stdio#prompt_pattern"] = "%d*> $?"
120
-
end
121
-
}, {"p1xelHer0/gerbil.nvim", ft = "scheme"}, -- Fennel, Luasthp
138
+
end,
139
+
dependencies = {"PaterJason/cmp-conjure"}
140
+
}, {"PaterJason/cmp-conjure", lazy = true},
141
+
{"p1xelHer0/gerbil.nvim", ft = "scheme"}, -- Fennel, Luasthp
122
142
{"jaawerth/fennel.vim", lazy = true, ft = "fennel"},
123
143
{"rktjmp/hotpot.nvim", lazy = true, ft = "fennel"},
124
144
{"Olical/nfnl", ft = "fennel"}, -- Rust stuff