mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 19:12:38 +00:00 
			
		
		
		
	Merge branch 'main' into fix-haskell
This commit is contained in:
		
				commit
				
					
						8c66f10550
					
				
			
		
					 1 changed files with 15 additions and 33 deletions
				
			
		|  | @ -4,51 +4,33 @@ | |||
|   ... | ||||
| }: let | ||||
|   inherit (lib.modules) mkIf; | ||||
|   inherit (lib.nvim.dag) entryAnywhere; | ||||
|   inherit (lib.nvim.lua) toLuaObject; | ||||
| 
 | ||||
|   cfg = config.vim.utility.surround; | ||||
|   mkLznKey = mode: key: { | ||||
|     inherit key mode; | ||||
|     inherit mode key; | ||||
|   }; | ||||
| in { | ||||
|   config = mkIf cfg.enable { | ||||
|     vim = { | ||||
|       startPlugins = ["nvim-surround"]; | ||||
|       pluginRC.surround = entryAnywhere "require('nvim-surround').setup(${toLuaObject cfg.setupOpts})"; | ||||
| 
 | ||||
|       lazy.plugins.nvim-surround = { | ||||
|         package = "nvim-surround"; | ||||
| 
 | ||||
|         setupModule = "nvim-surround"; | ||||
|         inherit (cfg) setupOpts; | ||||
| 
 | ||||
|         keys = | ||||
|           [ | ||||
|             (mkLznKey ["i"] cfg.setupOpts.keymaps.insert) | ||||
|             (mkLznKey ["i"] cfg.setupOpts.keymaps.insert_line) | ||||
|             (mkLznKey ["x"] cfg.setupOpts.keymaps.visual) | ||||
|             (mkLznKey ["x"] cfg.setupOpts.keymaps.visual_line) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.normal) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_line) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.normal_cur_line) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.delete) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.change) | ||||
|             (mkLznKey ["n"] cfg.setupOpts.keymaps.change_line) | ||||
|           ] | ||||
|           ++ map (mkLznKey ["n" "i" "v"]) [ | ||||
|             "<Plug>(nvim-surround-insert)" | ||||
|             "<Plug>(nvim-surround-insert-line)" | ||||
|             "<Plug>(nvim-surround-normal)" | ||||
|             "<Plug>(nvim-surround-normal-cur)" | ||||
|             "<Plug>(nvim-surround-normal-line)" | ||||
|             "<Plug>(nvim-surround-normal-cur-line)" | ||||
|             "<Plug>(nvim-surround-visual)" | ||||
|             "<Plug>(nvim-surround-visual-line)" | ||||
|             "<Plug>(nvim-surround-delete)" | ||||
|             "<Plug>(nvim-surround-change)" | ||||
|             "<Plug>(nvim-surround-change-line)" | ||||
|           ]; | ||||
|         keys = [ | ||||
|           (mkLznKey "i" cfg.setupOpts.keymaps.insert) | ||||
|           (mkLznKey "i" cfg.setupOpts.keymaps.insert_line) | ||||
|           (mkLznKey "x" cfg.setupOpts.keymaps.visual) | ||||
|           (mkLznKey "x" cfg.setupOpts.keymaps.visual_line) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.normal) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.normal_cur) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.normal_line) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.normal_cur_line) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.delete) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.change) | ||||
|           (mkLznKey "n" cfg.setupOpts.keymaps.change_line) | ||||
|         ]; | ||||
|       }; | ||||
|     }; | ||||
|   }; | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue
	
	 GitHub
					GitHub