Skip to content

Conversation

@TonyWu20
Copy link
Owner

ayamir and others added 30 commits January 15, 2025 14:35
* feat: use edgy.nvim to define window layout.

* perf: remove toggleterm workaround.

* fix: set aerial layout with edgy.

* refactor: use trouble to provide outline, remove aerial.

* style: eliminate duplicated code.

* fix: toggle edgy left.

* style: fix code style, use za to fold.
This is basically a follow-up for ayamir#1363! I combined builtin & plugin keymaps,
cleaned up some comments (lol "suckless"), and made `ui.lua` export-ready

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Follow-up for ayamir#1395 to apply the same structure & comment tweaks to other defs
too

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
This commit is a follow-up fix for ayamir#1369, simplifying the change to a single
line.

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
* Revert "fix: merge user customized config with predefined. (ayamir#1376)"

This reverts commit 42ce15d.

* fix(lsp): only merge configs when absolutely needed

This commit is a follow-up fix for ayamir#1376 to delay merging user & default configs
as much as we can to avoid extra overhead

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
…1402)

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Signed-off-by: ayamir <lgt986452565@gmail.com>
Co-authored-by: ayamir <lgt986452565@gmail.com>
* chore(keymap.live-grep): simplify

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* style: add comment for telescope.

Signed-off-by: ayamir <lgt986452565@gmail.com>

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Signed-off-by: ayamir <lgt986452565@gmail.com>
Co-authored-by: ayamir <lgt986452565@gmail.com>
…1405)

* fix(gitsigns): update keymaps

* fix(keymap): move  keymaps to
Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
This commit basically does some cleanup to ayamir#1393:
1. Replaced fixed width/height values w relative dimensions.
2. Removed unnecessary keymaps that were not linked to any other config
   components, allowing users more flexibility to customize their key mappings.

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
This commit is a follow-up fix for ayamir#1405:
- `stage_hunk` now toggles between staging and unstaging a hunk (keymap
  description updated).
- Changed the callback for `text_object` to `select_hunk`:
```
> git log --grep text_object
commit e22e37897ac328d3f7e00e354852b6c9ffdd1e5d
Author: Lewis Russell <lewis6991@gmail.com>
Date:   Thu Mar 25 14:47:33 2021 +0000

    Rename text_object() -> select_hunk()
```

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
* fix(keymap.helpers): improve `_toggle*` helper functions

This commit refined the two `_toggle*` functions to cut down redundancy,
reworded msgs, and made sure 0/1 are not used in `_toggle_diagnostic` bc it's
bug-prone.

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>

* refactor: change keymaps.

---------

Signed-off-by: Jint-lzxy <50296129+Jint-lzxy@users.noreply.github.com>
Co-authored-by: ayamir <lgt986452565@gmail.com>
)

* feat(grug-far): replace `nvim-spectre` with `grug-far.nvim`

* chore(keymap.editor): replace `nvim-spectre` with `grug-far.nvim`.

* chore(grug-far): enable integration in catppuccin

Signed-off-by: Charles Chiu <charleschiu@hey.com>

---------

Signed-off-by: Charles Chiu <charleschiu@hey.com>
Co-authored-by: ayamir <lgt986452565@gmail.com>
This PR reverts commit a1c76b2.

The main rationale behind this is IMO the current implementation of this
function has several limitations that need to be addressed:

1. It works with only a single file, which is not typical for most use cases
2. It only supports gcc as the compiler, whereas other compilers (most notably
   clang, xlc, cl.exe and friends) are not supported
3. There's no way to control compile and/or build flags
4. File type detection is too restrictive and doesn't cover all cases (using
   vim's ftplugins may be more effective)
and
5. Violating any of these assumptions results in errors, rendering this keymap
   completely ineffective

If you want to utilize this function, please refer to the previous impl and add it on your own. (ayamir@a1c76b2)

Co-authored-by: ayamir <lgt986452565@gmail.com>
@TonyWu20 TonyWu20 merged commit e79cfb1 into main Feb 16, 2025
3 of 5 checks passed
Sign up for free to join this conversation on GitHub. Already have an account? Sign in to comment

Labels

None yet

Projects

None yet

Development

Successfully merging this pull request may close these issues.

6 participants