Several updates, enable treesitter

This commit is contained in:
Fabian Becker 2021-05-26 16:06:30 +02:00
parent 515a0416d4
commit a5a1424be0
6 changed files with 31 additions and 11 deletions

View File

@ -6,7 +6,7 @@ O = {
clipboard = unnamedplus,
incsearch = true,
termguicolors = true,
colorscheme = 'moonlight',
colorscheme = 'monokai',
hidden_files = true,
wrap_lines = false,
number = true,

View File

@ -124,7 +124,7 @@ return require("packer").startup(
use {'challenger-deep-theme/vim', as='challenger-deep' }
use {'dracula/vim', as='dracula' }
use {'shaunsingh/moonlight.nvim', as='moonlight'}
use {'tanvirtin/monokai.nvim'}
use {'arcticicestudio/nord-vim'}
require_plugin('julia-vim')

View File

@ -1,3 +1,5 @@
vim.cmd([[
let g:sneak#label = 1
let g:sneak#prompt = '🔎'
let g:sneak#s_next = 1
]])

View File

@ -6,9 +6,9 @@ require('telescope').setup {
defaults = {
find_command = {'rg', '--no-heading', '--with-filename', '--line-number', '--column', '--smart-case'},
prompt_position = "bottom",
-- prompt_prefix = " ",
--prompt_prefix = " ",
prompt_prefix = "",
selection_caret = " ",
selection_caret = "",
entry_prefix = " ",
initial_mode = "insert",
selection_strategy = "reset",

View File

@ -0,0 +1,19 @@
require('nvim-treesitter.configs').setup({
ensure_installed = { "python", "go", "julia", "elixir", "rust", "gomod", "json", "lua", "ruby", "yaml" },
ignore_install = { "haskell" },
highlight = {
enable = true
},
indent = {
enable = true
},
incremental_selection = {
enable = true,
keymaps = {
init_selection = "gnn",
node_incremental = "grn",
scope_incremental = "grc",
node_decremental = "grm",
},
},
})

View File

@ -71,13 +71,12 @@ local mappings = {
},
g = {
name = "+Git",
j = {"<cmd>NextHunk<cr>", "Next Hunk"},
k = {"<cmd>PrevHunk<cr>", "Prev Hunk"},
p = {"<cmd>PreviewHunk<cr>", "Preview Hunk"},
r = {"<cmd>ResetHunk<cr>", "Reset Hunk"},
R = {"<cmd>ResetBuffer<cr>", "Reset Buffer"},
s = {"<cmd>StageHunk<cr>", "Stage Hunk"},
u = {"<cmd>UndoStageHunk<cr>", "Undo Stage Hunk"},
j = {"<cmd>GitGutterNextHunk<cr>", "Next Hunk"},
k = {"<cmd>GitGutterPrevHunk<cr>", "Prev Hunk"},
p = {"<cmd>GitGutterPreviewHunk<cr>", "Preview Hunk"},
r = {"<cmd>GitGutterResetHunk<cr>", "Reset Hunk"},
s = {"<cmd>GitGutterStageHunk<cr>", "Stage Hunk"},
u = {"<cmd>GitGutterUndoHunk<cr>", "Undo Stage Hunk"},
o = {"<cmd>Telescope git_status<cr>", "Open changed file"},
b = {"<cmd>Telescope git_branches<cr>", "Checkout branch"},
c = {"<cmd>Telescope git_commits<cr>", "Checkout commit"},