Commit graph

780 commits

Author SHA1 Message Date
4f6aedb2cd git: Some updates based on delta's README 2020-09-26 10:48:00 +05:30
513c5f4dda git: Use vimdiff3 for merge
Use vimdiff3 instead of vimdiff. Might be better as mentioned below?
7c147b77d3
2020-09-26 10:48:00 +05:30
b092402711 nvim: config: Enable histogram based diffs 2020-09-26 10:48:00 +05:30
ad4d92f619 nvim: Upgrade vim plug 2020-09-26 10:48:00 +05:30
8580e96f1d i3: Do not start manjaro-hello on start up 2020-09-26 10:48:00 +05:30
682c735651 nvim: after: ftplugin: Clean up Haskell 2020-09-24 17:00:06 +05:30
3bc32b2e34 nvim: after: ftplugin: Drop rust
We dropped neomake long back and this should have been dropped with
467a660409.
2020-09-24 16:55:56 +05:30
7e575f9ca4 nvim: after: ftplugin: Drop CPP
The settings done in this file where specific to syntax plugins which we
do not use anymore and should have been dropped with af410754a4.
2020-09-24 16:53:04 +05:30
c25188661b nvim: Add fzf-preview
This plugin provides support for Quickfix and Location list along with
previews. Also, does not do fuzzy match on file names which is useful.
Move some of the commands from fzf to fzf-preview as it provides
previews for those as well.

Using pedit for previews for quickfix list wasn't super comfortable.
Drop it, now that we have quickfix preview with fzf-preview.
2020-09-22 20:33:49 +05:30
78447af8df nvim: after: ftplugin: C: Set makeprg to ninja
For C, we now work on pulseaudio, gstreamer and pipewire projects which
all use meson and ninja, so set makeprg to ninja build command.
2020-09-22 12:58:36 +05:30
ff13f829e5 nvim: plugin_settings: Enable keymappings for scrolling preview window 2020-09-22 11:14:44 +05:30
0a20d1d3e2 nvim: Add scrollbar 2020-09-21 11:33:43 +05:30
61d5759407 git: Set fetch.prune globally
Automatically delete remote tracking local branches that have been
removed from remote. This makes pruning references part of our
normal work flow.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-18 11:32:05 +05:30
d8fc9facec nvim/git: Use vimdiff as merge tool & drop DiffConflicts
The conflict markers plugin is what we have been using all the time and
is useful even without resorting to merge tool. Drop the DiffConflicts
plugin and use vimdiff as the merge tool if at all we need to resort to
a full 3 way merge view.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-17 10:48:11 +05:30
ded93ed2fe nvim: HLS is now supported in nvim-lspconfig
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-16 13:03:41 +05:30
79be97c081 Revert "nvim: Switch to signify"
See open issue
https://github.com/mhinz/vim-signify/issues/345

Makes signify completely unusable if the undo hunks feature is desired.

This reverts commit b25091fae6.
2020-09-14 10:09:47 +05:30
af410754a4 nvim: Add nvim-treesitter
Drop the syntax highlight plugins for the languages for which treesitter
is now enabled.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-11 20:21:35 +05:30
9358922742 nvim: keymappings: Add key mapping for reloading buffer
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-11 20:20:33 +05:30
bfd2e9bd62 nvim: Update syntax highlighting for nvim-treesitter
All the added highlight groups in this commit are not defined upstream
in nvim-highlite. We may change this later.

While at it, remove all 'link' usages.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-10 20:59:26 +05:30
b25091fae6 nvim: Switch to signify
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-09 13:25:52 +05:30
8670913661 nvim: Add support for working with sudo
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-09 13:25:18 +05:30
b006265b14 nvim: Sync with changes to nvim-highlite upstream
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-07 12:13:33 +05:30
d59e74f588 nvim: Add support for LSP in status line
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-02 14:45:27 +05:30
99a858df26 nvim: Upstream nvim-lsp repo got renamed
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-02 13:44:24 +05:30
27d4b8d326 nvim: Update git key bindings
fzf checkout plugin introduced some new functionality. Taking advantage
of that update existing and introduce some new key bindings.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-02 11:21:53 +05:30
c8fe39e73e nvim: plugin_settings: Disable default keymappings for quickr-cscope
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-09-01 11:05:33 +05:30
b4cdd42422 nvim: init.vim: Drop tmux-complete
This does not work anymore. Probably because we dropped python and it
also does not list a source for completion-nvim. However, we can copy
anything from tmux using tmux extracto plugin to the clipboard, so
that is also a solution.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-29 17:00:20 +05:30
ac9d77f59b nvim: Re-introduce floaterm
Commit f977b8a while dropping all python dependencies also dropped
floaterm. However it has a dependency on python based neovim-remote
only if integration with git or floaterm is required from command line
which we do not. So add it back. Using the previous toggle bindings
with this gives a nice floating terminal which can be easily hidden.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-29 17:00:11 +05:30
83a6c276aa nvim: Add buffers as a completion source for completion-nvim
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-27 19:34:32 +05:30
2c4f5ff052 nvim: plugin_settings: Enable floating window for fzf
Commit c70ec87 dropped floating window for fzf due to golden ratio not
playing well with it. Now that we do not use golden ratio mode anymore
enable it back.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-26 20:22:08 +05:30
a3e7f17fa7 nvim: lua: lsp: Add key binding for LSP code action
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-26 12:37:31 +05:30
8128af0f4e nvim: plugin_settings: Set up some more vimtex options
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-25 16:27:28 +05:30
f0d863b863 nvim: init.vim: Drop support for all lisp
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-24 19:07:34 +05:30
1b3feefc4c nvim: Set the default tex flavour
This is required in latest releases. See :help vimtex-tex-flavor.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-08-04 17:40:56 +05:30
4c04c16528 mutt: asymptotic: Fix set from
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-30 16:29:42 +05:30
5b4ed5f9c6 nvim: Sync with changes to nvim-highlite upstream
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-29 13:24:20 +05:30
57b888e2dd nvim: plugin_settings: Drop tags as completion source for Haskell
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-27 18:11:00 +05:30
8e1bea3144 nvim: keymappings: Drop sudo write mapping
This really does not work. Use sudoedit.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-27 11:35:29 +05:30
2de0addc61 Switch to asymptotic
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-23 20:20:48 +05:30
c134bd4326 nvim: after: plugin: fzf: Add key mapping for recently accessed buffers
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-22 14:49:27 +05:30
e097977213 nvim: Upgrade vim-plug
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-21 18:17:07 +05:30
c9e61c35e7 nvim: init.vim: Add vim-wordmotion
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-17 11:54:00 +05:30
0abeb9d927 nvim: Refactor out asyncdo & completion keymappings
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-14 19:15:14 +05:30
94d5c03fd7 nvim: config: Do not highlight the column any more
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-14 19:15:07 +05:30
540a83df81 nvim: keymappings: Update bindings for search and replace
Do this to avoid slowing sneak and ferret a little bit due to 's'
conflict.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-13 11:19:38 +05:30
9fe8808e7e nvim: ftplugin: haskell: Assume hasktags & hlint are available in path
We assume these are installed via nix and available globally. hasktags
and haskdogs do not build with stack on ghc8.8 and hence this switch.
With nix, haskdogs gives an issue due to locale like is also observed
when stack is installed via nix. codex does not seem to generate tags
which work.

Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-11 13:12:39 +05:30
6acaf6ad4b tmux: Update tmux plugins
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-11 10:55:54 +05:30
f124c272c4 nvim: init.vim: Add support for word replacement while preserving case
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-09 20:57:04 +05:30
eb55c80682 Revert "nvim: init.vim: Add ALE for linting"
This reverts commit 286558f5af.
2020-07-09 19:27:47 +05:30
d6e3c1a611 nvim: plugin_settings: Disable diagnostic virtual text
Signed-off-by: Sanchayan Maity <maitysanchayan@gmail.com>
2020-07-08 15:56:43 +05:30