sanchayanmaity/dotfiles
1
0
Fork 0
Code Issues Pull requests Packages Projects Releases Wiki Activity
953 commits 1 branch 0 tags 12 MiB
Lua 47.7%
Shell 21.5%
Vim Script 15%
Python 7.3%
JavaScript 3.9%
Other 4.6%
Go to file
Sanchayan Maity 7767b23f69 nvim: plugins: Drop conflict-marker 
We have been mostly relying on diffconflicts plugin to resolve merge
conflicts. For complex merge conflicts, it becomes difficult to
understand which conflict hunk to pick. The syntax highlighting also
stopped taking effect due to treesitter probably. So just drop this.
Introducing a mapping to jump among conflicts would be helpful.

We let the syntax highlighting entries in our color scheme be, just
in case we decide to revisit this.
2021-05-14 13:13:43 +05:30
alacritty/.config/alacritty alacritty: Use Medium Italic for font style 2021-01-22 11:52:11 +05:30
chrome/.config chrome: Add chrome settings 2021-03-06 12:25:50 +05:30
conky/.config/conky conky: Add a configuration for conky 2020-10-15 20:50:51 +05:30
dunst/.config/dunst dunst: Add a configuration for dunst 2021-02-13 12:05:34 +05:30
dwm dwm: Add scrot script and config we use for dwm 2020-10-30 16:37:06 +05:30
emacs/.config/doom emacs: config.el: Make ranger/deer the default directory handler 2021-05-05 20:58:38 +05:30
environment/.config/environment.d environment: Add systemd's user service environment 2021-03-03 13:07:09 +05:30
fish/.config/fish fish: Delete all guix references 2021-05-02 11:20:01 +05:30
fontconfig/.config/fontconfig fontconfig: Switch to nerd fonts patched JetBrains Mono 2021-01-06 10:36:47 +05:30
git git: Fix merge tool command 2021-04-28 13:29:17 +05:30
gnupg/.gnupg gnupg: Use pinentry-gtk-2 2021-03-13 17:27:28 +05:30
i3/.i3 i3: Drop all gaps related configuration 2021-04-12 11:17:32 +05:30
i3status/.config/i3status i3status: Update configuration 2021-01-01 13:44:45 +05:30
i3status-rust/.config/i3status-rust i3status-rust: Update format string for mem block 2021-05-13 10:14:25 +05:30
imapfilter/.imapfilter imapfilter: Do not move mailing list mails back from Trash 2021-02-19 11:00:35 +05:30
kanshi/.config/kanshi kanshi: Fix profile configuration 2020-11-14 19:28:00 +05:30
kitty/.config/kitty kitty: Change mapping for closing window and tab 2021-05-08 14:39:58 +05:30
lazygit/.config/lazygit lazygit: Fix diff colors 2021-01-28 11:37:08 +05:30
mako/.config/mako mako: Switch to nerd font patched JetBrains Mono 2021-01-02 12:18:55 +05:30
mbsync mbsync: Master slave terminology has been deprecated 2021-03-13 17:22:12 +05:30
mpd/.config/mpd mpd: Add initial configuration for mpd 2020-11-13 11:30:58 +05:30
mpDris2/.config/mpDris2 mpDris2: Add a configuration for mpDris2 2021-03-25 11:10:27 +05:30
msmtp Add support for our now primary fastmail account 2021-02-13 22:42:20 +05:30
mutt/.mutt mutt: Add helper macros for our work account as well 2021-03-18 10:44:26 +05:30
notmuch Add support for our now primary fastmail account 2021-02-13 22:42:20 +05:30
nvim nvim: plugins: Drop conflict-marker 2021-05-14 13:13:43 +05:30
offlineimap Individual configs should still be in directories 2019-12-31 14:38:50 +05:30
picom/.config/picom picom: Disable fading 2021-03-01 20:11:42 +05:30
pycodestyle/.config pycodestyle: Ignore W503 2021-04-29 12:14:34 +05:30
ranger/.config/ranger ranger: Run formatter on these python files 2021-04-19 12:20:00 +05:30
starship/.config starship: Disable aws module 2021-03-06 12:25:50 +05:30
sway/.config/sway sway: Allow searching for $XDG_DATA_HOME/applications & $XDG_DATA_DIRS/applications for desktop files 2021-03-18 11:33:45 +05:30
swaylock/.config/swaylock swaylock: Add configuration for swaylock 2020-11-14 12:10:30 +05:30
tinyirc/.config/tiny tinyirc: Drop guix channel 2021-05-02 11:48:13 +05:30
tmux tmux: Update plugins 2021-04-08 13:30:22 +05:30
vimiv/.config/vimiv Add configuration for vimiv 2020-11-19 17:30:37 +05:30
waybar/.config/waybar waybar: waybar modules require a minimum height of 28 2020-12-15 17:00:55 +05:30
wofi/.config/wofi wofi: Add configuration for wofi required on sway 2020-11-13 20:17:54 +05:30
zathura/.config/zathura zathura: Switch to nerd fonts patched JetBrains Mono 2020-12-29 12:08:27 +05:30
.gitignore gitignore: Ignore nvim undo, shada and swap directories 2021-03-16 12:42:29 +05:30
.gitmodules Revert "tmux: Show battery and timing information in status line" 2020-11-14 12:18:07 +05:30
Makefile Switch to alacritty as default terminal 2020-10-10 18:37:53 +05:30