From 1151b2e5efd7dea44f0b807e76e1e4ac70e35a61 Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Fri, 2 Sep 2022 09:49:35 +0200 Subject: [PATCH 1/2] flake: bump inputs --- flake.lock | 18 +++++++++--------- 1 file changed, 9 insertions(+), 9 deletions(-) diff --git a/flake.lock b/flake.lock index 4c4d554..430a448 100644 --- a/flake.lock +++ b/flake.lock @@ -7,11 +7,11 @@ ] }, "locked": { - "lastModified": 1652712410, - "narHash": "sha256-hMJ2TqLt0DleEnQFGUHK9sV2aAzJPU8pZeiZoqRozbE=", + "lastModified": 1662046976, + "narHash": "sha256-BrTReGRhkVm/Kmmf4zQrL+oYWy0sds/BDBgXNX1CL3c=", "owner": "ryantm", "repo": "agenix", - "rev": "7e5e58b98c3dcbf497543ff6f22591552ebfe65b", + "rev": "9f136ecfa5bf954538aed3245e4408cf87c85097", "type": "github" }, "original": { @@ -63,11 +63,11 @@ }, "nixpkgs": { "locked": { - "lastModified": 1661720780, - "narHash": "sha256-AJNGyaB2eKZAYaPNjBZOzap87yL+F9ZLaFzzMkvega0=", + "lastModified": 1662019588, + "narHash": "sha256-oPEjHKGGVbBXqwwL+UjsveJzghWiWV0n9ogo1X6l4cw=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "a63021a330d8d33d862a8e29924b42d73037dd37", + "rev": "2da64a81275b68fdad38af669afeda43d401e94b", "type": "github" }, "original": { @@ -79,11 +79,11 @@ }, "nur": { "locked": { - "lastModified": 1661952120, - "narHash": "sha256-JwpT04L0mbLAKxTplG++RCHJgdXXHEQcGFihQqV/VF8=", + "lastModified": 1662103084, + "narHash": "sha256-zE6ftit1nllgrXJ3hnt/h/Ev+JsjkJQLKAgO5M31R5s=", "owner": "nix-community", "repo": "NUR", - "rev": "7dd0008c061609bc4dc5f2a0336f13082a35e00a", + "rev": "65fef905eaad9a585a3841103ed3f45608a50c56", "type": "github" }, "original": { From b582aff8669065cf7be5d7edbd5b1b47734cdf3a Mon Sep 17 00:00:00 2001 From: Bruno BELANYI Date: Wed, 31 Aug 2022 15:50:22 +0200 Subject: [PATCH 2/2] home: vim: migrate to 'nvim-surround' It's potentially more customizable, and integrates with tree-sitter. It also allows for buffer/filetype specific pairs. --- home/vim/default.nix | 2 +- home/vim/plugin/settings/surround.vim | 5 +++++ 2 files changed, 6 insertions(+), 1 deletion(-) create mode 100644 home/vim/plugin/settings/surround.vim diff --git a/home/vim/default.nix b/home/vim/default.nix index e803d00..2f17890 100644 --- a/home/vim/default.nix +++ b/home/vim/default.nix @@ -42,7 +42,6 @@ in vim-git # Sane git syntax files vim-repeat # Enanche '.' for plugins vim-rsi # Readline mappings - vim-surround # Deal with pairs vim-unimpaired # Some ex command mappings vim-vinegar # Better netrw @@ -83,6 +82,7 @@ in # UX improvements dressing-nvim # Integrate native UI hooks with Telescope etc... gitsigns-nvim # Fast git UI integration + nvim-surround # Deal with pairs, now in Lua telescope-fzf-native-nvim # Use 'fzf' fuzzy matching algorithm telescope-lsp-handlers-nvim # Use 'telescope' for various LSP actions telescope-nvim # Fuzzy finder interface diff --git a/home/vim/plugin/settings/surround.vim b/home/vim/plugin/settings/surround.vim new file mode 100644 index 0000000..e5eb81b --- /dev/null +++ b/home/vim/plugin/settings/surround.vim @@ -0,0 +1,5 @@ +lua << EOF +require("nvim-surround").setup({ + -- No configuration at the moment +}) +EOF