diff --git a/.config/nvim/lua/globals.lua b/.config/nvim/lua/globals.lua index 3a9db7f..21653a0 100644 --- a/.config/nvim/lua/globals.lua +++ b/.config/nvim/lua/globals.lua @@ -6,7 +6,7 @@ O = { clipboard = unnamedplus, incsearch = true, termguicolors = true, - colorscheme = 'moonlight', + colorscheme = 'monokai', hidden_files = true, wrap_lines = false, number = true, diff --git a/.config/nvim/lua/plugins.lua b/.config/nvim/lua/plugins.lua index 0afb333..719379e 100644 --- a/.config/nvim/lua/plugins.lua +++ b/.config/nvim/lua/plugins.lua @@ -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') diff --git a/.config/nvim/lua/plugins/sneak.lua b/.config/nvim/lua/plugins/sneak.lua index bd452a1..1a2bdf6 100644 --- a/.config/nvim/lua/plugins/sneak.lua +++ b/.config/nvim/lua/plugins/sneak.lua @@ -1,3 +1,5 @@ vim.cmd([[ let g:sneak#label = 1 + let g:sneak#prompt = '🔎' + let g:sneak#s_next = 1 ]]) diff --git a/.config/nvim/lua/plugins/telescope.lua b/.config/nvim/lua/plugins/telescope.lua index e1ded6c..768e1ff 100644 --- a/.config/nvim/lua/plugins/telescope.lua +++ b/.config/nvim/lua/plugins/telescope.lua @@ -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", diff --git a/.config/nvim/lua/plugins/treesitter.lua b/.config/nvim/lua/plugins/treesitter.lua new file mode 100644 index 0000000..728dafc --- /dev/null +++ b/.config/nvim/lua/plugins/treesitter.lua @@ -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", + }, + }, +}) diff --git a/.config/nvim/lua/plugins/which-key.lua b/.config/nvim/lua/plugins/which-key.lua index f3077b9..006faeb 100644 --- a/.config/nvim/lua/plugins/which-key.lua +++ b/.config/nvim/lua/plugins/which-key.lua @@ -71,13 +71,12 @@ local mappings = { }, g = { name = "+Git", - j = {"NextHunk", "Next Hunk"}, - k = {"PrevHunk", "Prev Hunk"}, - p = {"PreviewHunk", "Preview Hunk"}, - r = {"ResetHunk", "Reset Hunk"}, - R = {"ResetBuffer", "Reset Buffer"}, - s = {"StageHunk", "Stage Hunk"}, - u = {"UndoStageHunk", "Undo Stage Hunk"}, + j = {"GitGutterNextHunk", "Next Hunk"}, + k = {"GitGutterPrevHunk", "Prev Hunk"}, + p = {"GitGutterPreviewHunk", "Preview Hunk"}, + r = {"GitGutterResetHunk", "Reset Hunk"}, + s = {"GitGutterStageHunk", "Stage Hunk"}, + u = {"GitGutterUndoHunk", "Undo Stage Hunk"}, o = {"Telescope git_status", "Open changed file"}, b = {"Telescope git_branches", "Checkout branch"}, c = {"Telescope git_commits", "Checkout commit"},