Commit graph

1559 commits

Author SHA1 Message Date
96aa7aec83 git: Use nvimdiff1 as the merge tool
The feature provided by the vim-diffconflicts plugin seems to have been
merged upstream. Use of nvimdiff1 should now suffice.

See https://www.eseth.org/2020/mergetools.html

There also seems to be a new proposal adding layout support which will
be interesting once merged.
https://lore.kernel.org/all/20220327112307.151044-1-greenfoo@u92.eu/
2022-05-04 10:59:39 +05:30
16c4e4ee27 git: ignore: Ignore any private notes we use 2022-05-04 10:59:39 +05:30
c878a7b0be git: Use zealous diff3 style of merge conflict presentation
This is only available from git 2.35. A description of how this works is
in the original commit.
4496526f80
2022-05-03 18:31:36 +05:30
a5861f627d tmux: Drop copycat
Native regex searches are supported since 3.1. And we have never used
the predefined searches feature supported by copycat.
2022-05-03 18:31:36 +05:30
6382bcebbf tmux: Set options for fuzzback 2022-05-03 18:31:36 +05:30
7653a07fda mimeapps: Add mimeapp list for default applications 2022-05-03 17:02:41 +05:30
86a89f99ab nvim: after/plugin/fugitive: Add mapping for git grep
The rebase abort mapping is not really required as fugitive already
provides the `ra` mapping when in git status window to abort rebase.
Use the `gr` mapping for git grep and `gR` for rebasing to origin.
2022-05-02 12:38:25 +05:30
211cd39138 nvim: plugins/lsp: Drop nvim-lsp-ts-utils
The plugin is in maintenance mode and typescript.nvim does not support
inlay hints. We already use eslint language server and extra commands
provided by lsp-ts-utils/typescript.nvim is something we have never
used. Just drop it.
2022-05-02 10:34:44 +05:30
59b1696ffa nvim: lsp: Refactor setting up of autocmd for code lens & document highlight 2022-05-02 09:33:38 +05:30
fdc17306b7 nvim: lsp: Refactor setting up of key mappings 2022-05-02 09:33:38 +05:30
59c9556325 nvim: lsp: Sync with upstream
vim.lsp.buf.formatting function is deprecated and now replaces all the
below three functions with vim.lsp.buf.format.

- vim.lsp.buf.formatting
- vim.lsp.buf.formatting_sync
- vim.lsp.buf.formatting_seq_sync

client.resolved_capabilities is no longer used. One must now access
client.server_capabilities which matches the same structure as the
protocol.

https://microsoft.github.io/language-server-protocol/specification

See neovim commit c618b31.
2022-05-01 19:50:07 +05:30
6d9a0d22c4 foot: Do not hide mouse when typing 2022-05-01 11:39:55 +05:30
68afa288f6 arch-packages: Update package list 2022-04-29 16:54:11 +05:30
679daf809a nvim: after/ftplugin/dirvish: Set bufhidden to hide
With commit 7e41cd7 entering in dirvish does not work if bufhidden is
not hide or empty. Set it to hide and using BS which is mapped to C-^
in our key mappings, we can go back to the previous buffer.
2022-04-28 15:20:44 +05:30
081f31aada nvim: plugins: Drop toggleterm
Now that we use tmux all the time this is not so useful.
2022-04-25 20:20:30 +05:30
ac31d2cc5e tmux: session-setup: Load scratch session first
Since we connect to the scratch session by default, load it first.
2022-04-25 14:29:27 +05:30
306bd4b597 nvim: Enable linting for fish 2022-04-25 08:42:33 +05:30
3e9ed93517 nvim: yolokai: Sync with upstream
Sync with upstream to use the new nvim_set_hl API. The white color was
actually wrong, so fix it.
2022-04-21 20:32:40 +05:30
bc55909a12 nvim: yolokai: Add recently introduced hl-CurSearch 2022-04-21 20:31:41 +05:30
cc2fcffc56 nvim: after/plugin/snipcomp: Sync with upstream 2022-04-19 20:08:18 +05:30
686fec51d6 nvim: Use the new API for setting keymap 2022-04-16 14:27:22 +05:30
8d118381d8 foot: Increase max-shm-pool-size-mb to allowed maximum 2022-04-16 14:27:22 +05:30
0afe1044c1 fish: functions/tsd: Add a helper to analyse GStreamer timestamps 2022-04-16 14:27:22 +05:30
800ec4ca64 fish: functions/gts: Add a helper to get column of interest from log files 2022-04-16 14:27:22 +05:30
c936941188 fish: functions/fish_prompt: Update prompt symbol for unknown upstream
Use unicode symbol for replacement character to indicate upstream is
unknown.
2022-04-15 19:17:28 +05:30
2e50036c35 foot: Increase the font size to 11 2022-04-15 19:17:23 +05:30
a4aa6fe892 sway: Add key mapping for alacritty 2022-04-15 17:39:24 +05:30
ef1ed4b7d1 nvim: autocmd: On exit set cursor shape to horizontal & not vertical
We specify an underline cursor shape in terminal settings. This actually
fixes 5c6eebf where we just copied the settings from the referenced
issue but did not actually fix it.
2022-04-15 14:05:14 +05:30
998e22e978 tmux: Drop Tc workaround
See
3e74482d6c
2022-04-15 13:26:40 +05:30
e071172069 nvim: yolokai: Update diagnostic highlight names 2022-04-15 12:09:21 +05:30
5c80b85d69 nvim: plugin/epoch-converter: Fix timestamp conversion helper
The epoch time under cursor may be in milliseconds or seconds. Use
visual selection to select epoch since we won't know which. Else when
the epoch was in milliseconds we would just get wrong results.
2022-04-15 11:09:29 +05:30
7e0060eacb nvim: after/ftplugin/fish: Add a key mapping to format with fish indent 2022-04-14 17:44:48 +05:30
2af3965179 fish: functions/rmdot: Add a helper to delete all dot files 2022-04-14 17:38:14 +05:30
61229a685b foot: Clean settings we do not modify 2022-04-14 16:43:03 +05:30
e6b71916e8 fish: functions/fish_prompt: Drop virtualfish
It increases the load time which is just annoying. Fuck Python
anyways.
2022-04-13 20:41:12 +05:30
8b827b49d2 tmux: Put the window list in relative centre 2022-04-13 20:29:56 +05:30
93110c3445 nvim: keymappings: Add mapping to resize splits 2022-04-12 20:06:51 +05:30
f7ab6b1532 nvim: after/plugin/fugitive: Automatically jump to the blame window
The blame window opens at the bottom of the current window by default.
Jump to it automatically.
2022-04-12 18:27:56 +05:30
0cc31e0c2f git-blame-ignore-revs: Ignore clean up with fish_indent 2022-04-12 18:27:56 +05:30
478fede9e4 fish: Clean up with fish_indent 2022-04-12 18:27:01 +05:30
6a6a8b4d2a git: Global blame settings 2022-04-12 18:26:44 +05:30
9eff2e764a nvim: after/plugin/gitsigns: Blame is not very helpful 2022-04-12 17:34:46 +05:30
fc7d824d99 git: Do not use nvim as pager
For big repositories, using neovim as pager slows down commands like
git log.
2022-04-12 12:31:45 +05:30
c06bee9cb3 fish: Add an alias to transcode mkv to mp4 2022-04-09 13:17:55 +05:30
30245370ca fish: Add helper aliases for ffprobe 2022-04-08 21:20:26 +05:30
21bf71d832 arch-packages: Update package list 2022-04-08 21:20:26 +05:30
d0ddb54ea5 foot: Update font configuration 2022-04-05 19:53:16 +05:30
2985698bbc alacritty: Update configuration
We use kitty color scheme the same way we use for foot. Disable history
and scrollback since we now use tmux everywhere. opacity option has been
moved to window.
2022-04-05 17:41:49 +05:30
75ff0341f6 nvim: plugins: Add vim-dirvish-dovish 2022-04-05 17:41:49 +05:30
8a7567a8b1 Start tmux sessions using systemd
While starting the tmux sessions from fish worked some environment
variables were not getting picked up in tmux session.

For example DISPLAY is set after we log in and the graphical sway
session starts but since tmux sessions were started before that it
would be absent from the tmux session. We may be wrong about the
exact order and reasoning for this but atleast that is the observed
behaviour.

Fix this by defining a sway session target and making the tmux session
service dependent on it.
2022-04-04 18:07:50 +05:30