Commit graph

422 commits

Author SHA1 Message Date
534eebb89e nvim: Remove mergetool and switch to DiffConflicts for git merge
Also add the conflict-marker plugin. This should also be useful
for doing rebases and resolving conflicts. Might drop one later
if one of them serves all the purposes in all cases.

While at it, add unimpaired style bindings for moving between
tabs. This is required since :DiffConflictsShowHistory opens
a new tab and default tab navigation bindings gt/gT at least
are binded to something else in python.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-03 21:35:28 +05:30
b42d4cc7a7 nvim: Add function to easily work with jump list & access change list
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-03 11:26:47 +05:30
33148207ec nvim: Switch to jellybeans colorscheme
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-02 18:47:05 +05:30
a2228c077b nvim: ftplugin: purescript: Set textwidth and wrapmargin to 0
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-02 12:22:02 +05:30
47106487ac nvim: Discard GGrep
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-02 11:42:04 +05:30
f57a5fffc0 nvim: Switch to showing the full file path in statusline
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-01 17:57:21 +05:30
b57e4bdceb nvim: Fix netrw buffers staying open after usage of vinegar
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-05-01 12:52:04 +05:30
55d3655ffe nvim: ftplugin: haskell: Enable classic highlighting for Haskell
Gives color separation in molokai between "instance" and "Typeclass Type".

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-30 10:29:24 +05:30
95a31ad348 nvim: Switch to vanilla molokai
Better contrast and darker colors.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-28 17:02:54 +05:30
a05099b6bb nvim: Fix mapping for diff section jumps
Do not conflict with paragraph motion mapping.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-28 10:20:35 +05:30
caf6f81318 nvim: Disable shada
We do not want project specific or project local information to be
available among various neovim instances. It should either be managed
by sessions or should not be stored on neovim exit.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-28 09:51:26 +05:30
470cd043d5 nvim: Add QFEnter plugin
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-26 18:29:55 +05:30
f56bb8c5fb nvim: Drop vim-fugitive and move to gina
vim-fugitive from Tpope is synchronous on neovim. It is
asynchronous on vim when vim-dispatch is available but for
neovim it will always be synchronous. Gina is asynchronous
by default and does not freeze on large repos like fugitive
does. So drop fugitive, other plugins and settings dependent
on it.

While at it, also add some more good things from git gutter
and some shortcuts.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-26 18:29:07 +05:30
d879a43b48 nvim: statusline: Add a hunk summary to the status line
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-24 20:35:31 +05:30
40bc178d32 nvim: Switch back to sonokai
We switched away from Sonokai due to high load times in 20ms or more but
there isn't a monokai variant which is better than this. Gruvbox got
annoying after a while. A darker contrast would have been preferred but
no other fits the bill.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-24 15:50:53 +05:30
f6c8b8d8fa nvim: Fix color scheme setting point
It seems since we are using hard coded colors, so we do not need the
auto command at all. Getting rid of it gives the right results.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-23 10:17:54 +05:30
321213894b nvim: Add a key binding to save files with sudo
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-23 09:37:02 +05:30
8af9c11813 nvim: Drop dependency on vim-airline
Use a custom status line and buftabline.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-23 09:33:30 +05:30
c880a370d4 nvim: Drop unneeded plugins & use incsearch for automatic nohlsearch
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-22 09:09:06 +05:30
42fcd983ad nvim: Disable auto completion by default
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-21 16:14:33 +05:30
a368dd07fc nvim: Drop any jump plugin
Since we already use vim grepper this plugin does not provide much.
Drop it.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-21 16:14:26 +05:30
643cdfef11 nvim: Some minor cleanups, additions and refactor
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-21 16:14:15 +05:30
19be5a4442 nvim: Switch to gruvbox8 theme
This theme is quite fast to load though slightly less nicer than
sonokai, the sonokai theme can take 20-30ms during load. Load times for
gruvbox8 seem to be around 2-2.5ms.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-18 18:32:33 +05:30
7eeb5cf7ea git: Use a global gitignore
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-16 10:26:58 +05:30
932e3ffc42 nvim: LSP cleanup and refactor
LSP does not work all the time. Either client breaks, server breaks or
it does not work because of the project structure. Removing LSP for the
umpteenth time.

asyncomplete does not seem to work at all for tags. For example, in the
gst-build directory the generated tags file can be 200MB+ in size. Even
with the file size limit set to unlimited it does not seem to give any
tag suggestions at all. Same is the case for Haskell.

Mucomplete can be slow in such cases where tag file is very large or
search space is extensively large and being synchronous this is to be
expected. To alleviate this, it is necessary to have a minimum prefix
length of 2 and perhaps trigger completion only when required. However,
this was still not good enough.

We are back to deoplete with custom source configuration. It is pretty
clear vimscript solutions are not up to the mark. Enable python provider
and also reintroduce language specific solutions like racer and jedi.

Refactor out language/file type specific settings. init.vim should only
have global keybindings, plugins and plugin settings. Also some other
minor cleanups, additions and rearrangements.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-15 09:27:36 +05:30
68c61a7a1c nvim: Add quickui for quickfix preview
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-12 15:38:39 +05:30
0438c0a032 nvim: Update vim plug
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-12 15:37:29 +05:30
ff46041c41 nvim: Add fzf quickfix
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-08 10:22:30 +05:30
91248a4822 nvim: Remove plugins endwise, mundo and crates
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-08 09:35:40 +05:30
c7afc36466 nvim: Add vim fetch
Enable to process line and column jump specifications in file paths as found
in stack traces and similar output

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-06 21:28:31 +05:30
efbde43c1e nvim: Add vim any fold
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-06 21:28:24 +05:30
cc0f55cec3 nvim: Set shortcuts for setting fold methods
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-06 21:28:10 +05:30
537f3021a4 nvim: Add vim exchange
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-06 14:09:13 +05:30
5f0dbec511 nvim: Add a shortcut for invoking haskdogs
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-06 10:56:30 +05:30
6297e35f45 nvim: Add bindings for preview tags
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-06 10:08:03 +05:30
c775c0b4e8 nvim: Remove auto resize plugins
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-05 15:30:47 +05:30
cccce84de4 nvim: Do not append results in vim grepper
This setting results in the quickfix list having the same result
multiple times if by mistake we run the same search again.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-04 13:04:13 +05:30
559013e491 nvim: Reintroduce key binding for buffer switching using :b
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-04 09:25:49 +05:30
26457a128e nvim: Lens should be disabled for buftypes & not filetypes
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-04 09:21:26 +05:30
d123b038b3 nvim: Remove custom floating window function
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-03 16:32:59 +05:30
bc64f3240f nvim: Add plugin to load diffs in quickfix list
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-03 12:39:24 +05:30
ac50a4efc1 fish: Add git aliases
Stolen from
https://github.com/sorin-ionescu/prezto/blob/master/modules/git/alias.zsh

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-03 11:55:08 +05:30
7e2ed37f66 nvim: Add vim-grepper and vim-qlist
While we have fzf, for situations where we want to search and load
results in quickfix or location list vim-grepper should come in handy.
vim-qlist enchances ]i/I related bindings for search to load then in
quickfix list.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-04-02 20:23:06 +05:30
d9c9780223 nvim: Use window number information for window navigation
Airline section y is used for file encoding and file format. We do not
need this information in status line. Use it to show window number. Use
window numbers for navigation. See :h CTRL-W_W and :h winnr() for more
information.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-30 15:57:58 +05:30
e5399b0c02 nvim: Increase height of floating window
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-30 13:10:27 +05:30
8b23f5c564 tmux: Update tmux plugins
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-30 11:00:44 +05:30
bacae0a23d nvim: Use ag as any jump preferred search engine
While I would ideally like to use rg, it seems any jump does or cannot
use rg for some reasons for certain languages like Haskell. This can be
seen from the language map in any jump repo. So set preferred engine as
ag for now.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-28 10:25:23 +05:30
dd103824bb tmux: Remove tmux fingers
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-25 19:06:21 +05:30
b58fae6784 nvim: Add some miscellaneous plugins
While at it, remove quick-scope as it doesn't add much of a value when
we already use easymotion. Also do some cleanup.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-21 13:05:12 +05:30
bb77d4748e nvim: Update key bindings
The git gutter fold bindings was slowing down the easymotion h binding.
So change it. Also the any jump binding was slowing down the 'a' append
binding.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-03-20 10:04:06 +05:30