big changes
This commit is contained in:
mjhika
parent
d0d4aedacb
commit
2a8e0e6b82
11
init.lua
11
init.lua
|
|
@ -2,7 +2,7 @@
|
|||
-- See `:help mapleader`
|
||||
-- NOTE: Must happen before plugins are required (otherwise wrong leader will be used)
|
||||
vim.g.mapleader = ' '
|
||||
vim.g.maplocalleader = ';'
|
||||
vim.g.maplocalleader = '\\'
|
||||
|
||||
-- Install package manager
|
||||
-- https://github.com/folke/lazy.nvim
|
||||
|
|
@ -79,7 +79,6 @@ vim.wo.signcolumn = 'yes'
|
|||
|
||||
-- Decrease update time
|
||||
vim.o.updatetime = 250
|
||||
vim.o.timeoutlen = 300
|
||||
|
||||
-- Set completeopt to have a better completion experience
|
||||
vim.o.completeopt = 'menuone,noselect'
|
||||
|
|
@ -106,6 +105,7 @@ vim.cmd([[ nnoremap <silent> <expr> <CR> {-> v:hlsearch ? "<cmd>nohl\<CR>" : "\<
|
|||
-- Keymaps for better default experience
|
||||
-- See `:help vim.keymap.set()`
|
||||
vim.keymap.set({ 'n', 'v' }, '<Space>', '<Nop>', { silent = true })
|
||||
vim.keymap.set({ 'n', 'v' }, '\\', '<Nop>', { silent = true })
|
||||
|
||||
-- Remap for dealing with word wrap
|
||||
vim.keymap.set('n', 'k', "v:count == 0 ? 'gk' : 'k'", { expr = true, silent = true })
|
||||
|
|
@ -130,6 +130,7 @@ local telscopeb = require('telescope.builtin')
|
|||
telscope.setup {
|
||||
defaults = {
|
||||
file_ignore_patterns = {
|
||||
"%.git",
|
||||
"node_modules",
|
||||
"%.idea",
|
||||
"project/target", --https://www.lua.org/pil/20.2.html
|
||||
|
|
@ -159,6 +160,12 @@ vim.keymap.set('n', '<leader>/', function()
|
|||
})
|
||||
end, { desc = '[/] Fuzzily search in current buffer' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fF', function()
|
||||
telscopeb.find_files({
|
||||
no_ignore = true
|
||||
})
|
||||
end, { desc = '[S]earch [F]iles (no ignore)' })
|
||||
|
||||
vim.keymap.set('n', '<leader>fi', telscopeb.git_files, { desc = 'Search [G]it [F]iles' })
|
||||
vim.keymap.set('n', '<leader>ff', telscopeb.find_files, { desc = '[S]earch [F]iles' })
|
||||
vim.keymap.set('n', '<leader>fh', telscopeb.help_tags, { desc = '[S]earch [H]elp' })
|
||||
|
|
|
|||
|
|
@ -12,23 +12,27 @@
|
|||
"friendly-snippets": { "branch": "main", "commit": "b8fae73a479ae0a1c54f5c98fa687ae8a0addc53" },
|
||||
"gitsigns.nvim": { "branch": "main", "commit": "2c2463dbd82eddd7dbab881c3a62cfbfbe3c67ae" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "12e92044d313c54c438bd786d11684c88f6f78cd" },
|
||||
"javap-vim": { "branch": "master", "commit": "0d2af4e6eb675bd38a169050b1daa79847cb0146" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "aedcd79811d491b60d0a6577a9c1701063c2a609" },
|
||||
"lspkind.nvim": { "branch": "master", "commit": "1735dd5a5054c1fb7feaf8e8658dbab925f4f0cf" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "7d131a8d3ba5016229e8a1d08bf8782acea98852" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "2b3d247fce06f53934174f5dfe0362c42d65c00c" },
|
||||
"mason-lspconfig.nvim": { "branch": "main", "commit": "0954d7730e749d606ddf8d7ae8846848be435d53" },
|
||||
"mason.nvim": { "branch": "main", "commit": "c43eeb5614a09dc17c03a7fb49de2e05de203924" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "2793ba3127c2c93ee486b9072a3ef129eeb950cc" },
|
||||
"neodev.nvim": { "branch": "main", "commit": "0ee95ecefc8ea45898a0383364f736e098c8703f" },
|
||||
"nvim-autopairs": { "branch": "master", "commit": "096d0baecc34f6c5d8a6dd25851e9d5ad338209b" },
|
||||
"nvim-cmp": { "branch": "main", "commit": "04e0ca376d6abdbfc8b52180f8ea236cbfddf782" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "9a6279953c82d01b58825a46ede032ab246a5983" },
|
||||
"nvim-lspconfig": { "branch": "master", "commit": "1bc83418927003552505ec66fa5d6cffae953f6a" },
|
||||
"nvim-metals": { "branch": "main", "commit": "d90ea43ded7ec651606b0a533ae9740083436e58" },
|
||||
"nvim-paredit": { "branch": "master", "commit": "d9bc8d34d440b4daa56aa16cc440b674facd8f89" },
|
||||
"nvim-paredit-fennel": { "branch": "master", "commit": "33380e743109c89fae6823cea4b9f81e635dbeff" },
|
||||
"nvim-paredit-scheme": { "branch": "master", "commit": "3e5838290dd57116457e4b11eb6ba21e83b260a4" },
|
||||
"nvim-parinfer": { "branch": "master", "commit": "5ca09287ab3f4144f78ff7977fabc27466f71044" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "4fbf150a1621d52f17b099506e1a32f107079210" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "8edd5a6d96936bdff23333d3bc177481388839e5" },
|
||||
"nvim-treesitter": { "branch": "master", "commit": "cbf0dfd92f3149a378164ab781d0b0a13da5b04a" },
|
||||
"nvim-treesitter-textobjects": { "branch": "master", "commit": "dd0b2036c3a27cb6e6486f8bd24188c6ca43af0b" },
|
||||
"plenary.nvim": { "branch": "master", "commit": "4f71c0c4a196ceb656c824a70792f3df3ce6bb6d" },
|
||||
"telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" },
|
||||
"telescope.nvim": { "branch": "0.1.x", "commit": "d90956833d7c27e73c621a61f20b29fdb7122709" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "e7bf502a6ae492f42a91d231864e25630286319b" },
|
||||
"vim-fugitive": { "branch": "master", "commit": "fab00f7c0f3a08e860e39c7adeb8fbe849921a98" },
|
||||
"vim-go": { "branch": "master", "commit": "18171a41a18dfc59fb0475a00d5c1e9ddb3d22d4" },
|
||||
"vim-rhubarb": { "branch": "master", "commit": "ee69335de176d9325267b0fd2597a22901d927b1" },
|
||||
"vim-shot-f": { "branch": "master", "commit": "eea71d2a1038aa87fe175de9150b39dc155e5e7f" },
|
||||
|
|
|
|||
|
|
@ -1,22 +1,37 @@
|
|||
local lisp_dialects = { "clojure", "fennel", "scheme", "lisp" }
|
||||
|
||||
return {
|
||||
-- perhaps replace parinfer with guns/vim-sexp and tpope/vim-sexp-mappings-for-regular-people
|
||||
{
|
||||
"gpanders/nvim-parinfer",
|
||||
ft = lisp_dialects,
|
||||
ft = "lisp",
|
||||
init = function()
|
||||
vim.g.parinfer_force_balance = true
|
||||
vim.g.parinfer_comment_chars = ";;"
|
||||
end,
|
||||
},
|
||||
-- {
|
||||
-- "julienvincent/nvim-paredit",
|
||||
-- ft = lisp_dialects,
|
||||
-- config = function()
|
||||
-- require("nvim-paredit").setup()
|
||||
-- end
|
||||
-- },
|
||||
{
|
||||
"julienvincent/nvim-paredit",
|
||||
ft = { "clojure", "fennel", "scheme" },
|
||||
config = function()
|
||||
require("nvim-paredit").setup()
|
||||
end
|
||||
},
|
||||
{
|
||||
"julienvincent/nvim-paredit-fennel",
|
||||
dependencies = { "julienvincent/nvim-paredit" },
|
||||
ft = { "fennel" },
|
||||
config = function()
|
||||
require("nvim-paredit-fennel").setup()
|
||||
end
|
||||
},
|
||||
{
|
||||
"ekaitz-zarraga/nvim-paredit-scheme",
|
||||
dependencies = { "julienvincent/nvim-paredit" },
|
||||
ft = { "scheme" },
|
||||
config = function()
|
||||
require("nvim-paredit-scheme").setup(require("nvim-paredit"))
|
||||
end
|
||||
},
|
||||
{
|
||||
"Olical/conjure",
|
||||
ft = lisp_dialects,
|
||||
|
|
|
|||
|
|
@ -1,2 +1,10 @@
|
|||
-- Useful plugin to show you pending keybinds.
|
||||
return { 'folke/which-key.nvim', opts = {} }
|
||||
return {
|
||||
'folke/which-key.nvim',
|
||||
event = "VeryLazy",
|
||||
init = function()
|
||||
vim.o.timeout = true
|
||||
vim.o.timeoutlen = 300
|
||||
end,
|
||||
opts = {},
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue