 sam_oneal
|
670f6325a1
|
feat: add merge conflict UI and telescope picker
- Add unclash.nvim for interactive merge conflict resolution
(inline highlighting, action buttons, 3-way merge editor,
snacks picker integration)
- Enable LazyVim telescope extra with fzf-native for fuzzy finding
|
2026-09-10 11:12:36 -06:00 |
|
|
sam_oneal
|
5656c2d385
|
updated secrets baseline config
|
2026-06-06 15:54:15 -06:00 |
|
|
sam_oneal
|
c0b67ced35
|
switched to opencode; updated keybindings
|
2026-05-29 10:30:58 -06:00 |
|
|
sam_oneal
|
067e36cf2a
|
Switched back to use Ctrl but no Shift this time
|
2026-05-20 12:55:13 -06:00 |
|
|
sam_oneal
|
831cdc8210
|
Switched to using leader instead of Ctrl+Shift
|
2026-05-19 22:28:37 -06:00 |
|
|
sam_oneal
|
4137b7424d
|
refactored plugins and configurations
|
2026-05-19 18:33:44 -06:00 |
|
|
sam_oneal
|
049a10e60e
|
updated some configs
|
2026-05-11 10:37:11 -06:00 |
|
|
sam_oneal
|
bf4008358d
|
added Comment.nvim; testing removing ability to wrap text
|
2026-02-09 01:47:59 -07:00 |
|
|
sam_oneal
|
d05390b2e7
|
Commented out the autocmd for sql files
|
2026-02-05 00:44:41 -07:00 |
|
|
sam_oneal
|
8fbe4074bf
|
updating keybinding for explorer toggle
|
2026-02-02 10:01:02 -07:00 |
|
|
sam_oneal
|
50a8c1fcc7
|
some changes
|
2026-01-24 00:50:45 -07:00 |
|
|
sam_oneal
|
3b41bd1552
|
Added more editor features to support Golang, sql and git
|
2026-01-19 19:31:11 -07:00 |
|
|
sam_oneal
|
a9b956e141
|
added more capabilities to my nvim setup
|
2026-01-19 18:45:00 -07:00 |
|
|
sam_oneal
|
dc98d50a31
|
updated configuration
|
2026-01-12 23:12:11 -07:00 |
|
|
sam_oneal
|
6d79fde026
|
updated configuration
|
2026-01-09 19:27:28 -07:00 |
|
|
sam_oneal
|
5192d8c9e1
|
all initial files from lazyvim
|
2026-01-09 12:46:53 -07:00 |
|