mirror of
				https://github.com/NotAShelf/nvf.git
				synced 2025-10-31 02:52:37 +00:00 
			
		
		
		
	Merge branch 'main' into neogit-init
This commit is contained in:
		
				commit
				
					
						af87edae84
					
				
			
		
					 69 changed files with 74 additions and 263 deletions
				
			
		|  | @ -15,6 +15,7 @@ isMaximal: { | |||
| 
 | ||||
|     spellcheck = { | ||||
|       enable = true; | ||||
|       programmingWordlist.enable = isMaximal; | ||||
|     }; | ||||
| 
 | ||||
|     lsp = { | ||||
|  |  | |||
|  | @ -438,4 +438,6 @@ | |||
| - Add [solarized.nvim] theme with support for multiple variants | ||||
| - Add [smart-splits.nvim] for navigating between Neovim windows and terminal multiplexer panes. | ||||
|   Available at `vim.utility.smart-splits`. | ||||
| - Restore vim-dirtytalk plugin and fix ordering with spellcheck in generated config. | ||||
| - Fix lualine separator options | ||||
| - Add [neogit], an interactive and powerful Git interface for Neovim, inspired by Magit | ||||
|  |  | |||
							
								
								
									
										21
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							
							
						
						
									
										21
									
								
								flake.lock
									
										
									
										generated
									
									
									
								
							|  | @ -51,26 +51,6 @@ | |||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nil": { | ||||
|       "inputs": { | ||||
|         "nixpkgs": [ | ||||
|           "nixpkgs" | ||||
|         ] | ||||
|       }, | ||||
|       "locked": { | ||||
|         "lastModified": 1750047244, | ||||
|         "narHash": "sha256-vluLARrk4485npdyHOj8XKr0yk6H22pNf+KVRNL+i/Y=", | ||||
|         "owner": "oxalica", | ||||
|         "repo": "nil", | ||||
|         "rev": "870a4b1b5f12004832206703ac15aa85c42c247b", | ||||
|         "type": "github" | ||||
|       }, | ||||
|       "original": { | ||||
|         "owner": "oxalica", | ||||
|         "repo": "nil", | ||||
|         "type": "github" | ||||
|       } | ||||
|     }, | ||||
|     "nixpkgs": { | ||||
|       "locked": { | ||||
|         "lastModified": 1750215678, | ||||
|  | @ -107,7 +87,6 @@ | |||
|         "flake-parts": "flake-parts", | ||||
|         "flake-utils": "flake-utils", | ||||
|         "mnw": "mnw", | ||||
|         "nil": "nil", | ||||
|         "nixpkgs": "nixpkgs", | ||||
|         "systems": "systems_2" | ||||
|       } | ||||
|  |  | |||
|  | @ -82,12 +82,5 @@ | |||
| 
 | ||||
|     # Alternate neovim-wrapper | ||||
|     mnw.url = "github:Gerg-L/mnw"; | ||||
| 
 | ||||
|     ## Language servers (use master instead of nixpkgs) | ||||
|     # Nix LSP | ||||
|     nil = { | ||||
|       url = "github:oxalica/nil"; | ||||
|       inputs.nixpkgs.follows = "nixpkgs"; | ||||
|     }; | ||||
|   }; | ||||
| } | ||||
|  |  | |||
|  | @ -10,7 +10,7 @@ | |||
|       default = self'.devShells.lsp; | ||||
|       nvim-nix = pkgs.mkShellNoCC {packages = [config.packages.nix];}; | ||||
|       lsp = pkgs.mkShellNoCC { | ||||
|         packages = with pkgs; [inputs'.nil.packages.default statix deadnix alejandra npins]; | ||||
|         packages = with pkgs; [nil statix deadnix alejandra npins]; | ||||
|       }; | ||||
|     }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -2,7 +2,7 @@ | |||
| {lib}: let | ||||
|   inherit (builtins) hasAttr head throw typeOf isList isAttrs isBool isInt isString isPath isFloat toJSON; | ||||
|   inherit (lib.attrsets) mapAttrsToList filterAttrs; | ||||
|   inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters concatLines; | ||||
|   inherit (lib.strings) concatStringsSep concatMapStringsSep stringToCharacters; | ||||
|   inherit (lib.trivial) boolToString warn; | ||||
| in rec { | ||||
|   # Convert a null value to lua's nil | ||||
|  |  | |||
|  | @ -1,10 +1,6 @@ | |||
| # Convenience function that returns the given Nixpkgs standard library | ||||
| # extended with our functions using `lib.extend`. | ||||
| { | ||||
|   inputs, | ||||
|   self, | ||||
|   ... | ||||
| } @ args: | ||||
| {inputs, ...} @ args: | ||||
| inputs.nixpkgs.lib.extend (self: super: { | ||||
|   # WARNING: New functions should not be added here, but to files | ||||
|   # imported by `./default.nix` under their own categories. If your | ||||
|  |  | |||
|  | @ -38,7 +38,7 @@ | |||
|       "runner" | ||||
|       "session" | ||||
|       "snippets" | ||||
|       # "spellcheck" # FIXME: see neovim/init/spellcheck.nix | ||||
|       "spellcheck" | ||||
|       "statusline" | ||||
|       "tabline" | ||||
|       "terminal" | ||||
|  |  | |||
|  | @ -6,7 +6,7 @@ | |||
| }: let | ||||
|   inherit (lib.modules) mkIf; | ||||
|   inherit (lib.options) mkOption mkEnableOption mkPackageOption; | ||||
|   inherit (lib.types) nullOr either str listOf submodule; | ||||
|   inherit (lib.types) str submodule; | ||||
|   inherit (lib.attrsets) mapAttrs mapAttrsToList filterAttrs; | ||||
|   cfg = config.vim.clipboard; | ||||
| in { | ||||
|  |  | |||
|  | @ -57,14 +57,21 @@ | |||
|       signs = mkOption { | ||||
|         type = diagnosticType; | ||||
|         default = false; | ||||
|         example = { | ||||
|           signs.text = { | ||||
|             "vim.diagnostic.severity.ERROR" = " "; | ||||
|             "vim.diagnostic.severity.WARN" = " "; | ||||
|           }; | ||||
|         }; | ||||
|         example = literalExpression '' | ||||
|           signs.text = lib.generators.mkLuaInline ''' | ||||
|             { | ||||
|               [vim.diagnostic.severity.ERROR] = " ", | ||||
|               [vim.diagnostic.severity.WARN] = " ", | ||||
|             } | ||||
|           '''; | ||||
|         ''; | ||||
|         description = '' | ||||
|           Use signs for diagnostics. See {command}`:help diagnostic-signs`. | ||||
| 
 | ||||
|           :::{.note} | ||||
|           The code presented in that example section uses Lua expressions as object keys which | ||||
|           only translate well if you use `lib.generators.mkLuaInline` as in the example. | ||||
|           ::: | ||||
|         ''; | ||||
|       }; | ||||
| 
 | ||||
|  |  | |||
|  | @ -94,6 +94,8 @@ in { | |||
|       Enabling this option will unconditionally set | ||||
|       {option}`vim.spellcheck.enable` to true as vim-dirtytalk | ||||
|       depends on spellchecking having been set up. | ||||
| 
 | ||||
|       Run {command}`:DirtytalkUpdate` on first use to download the spellfile. | ||||
|       ::: | ||||
|     ''; | ||||
|   }; | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.modules) mkMerge; | ||||
|   inherit (lib.trivial) pipe; | ||||
|   inherit (lib.attrsets) mapAttrsToList; | ||||
|   inherit (lib.lists) flatten; | ||||
|  |  | |||
|  | @ -5,7 +5,6 @@ | |||
| }: let | ||||
|   inherit (builtins) toJSON; | ||||
|   inherit (lib.modules) mkIf; | ||||
|   inherit (lib.strings) optionalString; | ||||
| 
 | ||||
|   cfg = config.vim.assistant.copilot; | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,7 +1,6 @@ | |||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption mkOption literalMD; | ||||
|   inherit (lib.types) bool listOf str either attrsOf submodule enum anything int nullOr; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption luaInline pluginType; | ||||
|   inherit (lib.nvim.binds) mkMappingOption; | ||||
|   inherit (lib.nvim.config) mkBool; | ||||
|  |  | |||
|  | @ -3,11 +3,10 @@ | |||
|   config, | ||||
|   ... | ||||
| }: let | ||||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.modules) mkIf; | ||||
|   inherit (lib.strings) optionalString; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.lua) toLuaObject; | ||||
|   inherit (lib.nvim.attrsets) mapListToAttrs; | ||||
|   inherit (builtins) attrNames typeOf tryEval concatStringsSep; | ||||
| 
 | ||||
|   borders = config.vim.ui.borders.plugins.nvim-cmp; | ||||
|  |  | |||
|  | @ -3,7 +3,7 @@ | |||
|   config, | ||||
|   ... | ||||
| }: let | ||||
|   inherit (lib.options) mkEnableOption mkOption literalExpression literalMD; | ||||
|   inherit (lib.options) mkEnableOption mkOption literalMD; | ||||
|   inherit (lib.types) str attrsOf nullOr either listOf; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.binds) mkMappingOption; | ||||
|  |  | |||
|  | @ -4,7 +4,6 @@ | |||
|   ... | ||||
| }: let | ||||
|   inherit (lib.modules) mkIf; | ||||
|   inherit (lib.nvim.dag) entryAnywhere; | ||||
|   inherit (lib.nvim.lua) toLuaObject; | ||||
| 
 | ||||
|   cfg = config.vim.dashboard.alpha; | ||||
|  |  | |||
|  | @ -10,7 +10,6 @@ | |||
|   inherit (lib.lists) isList; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.types) enum either listOf package str; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.lua) expToLua; | ||||
|   inherit (lib.nvim.types) mkGrammarOption diagnostics; | ||||
| 
 | ||||
|  |  | |||
|  | @ -66,7 +66,7 @@ in { | |||
| 
 | ||||
|       package = mkOption { | ||||
|         description = "bash-language-server package, or the command to run as a list of strings"; | ||||
|         example = literalExpression ''[lib.getExe pkgs.nodePackages.bash-language-server "start"]''; | ||||
|         example = literalExpression ''[lib.getExe pkgs.bash-language-server "start"]''; | ||||
|         type = either package (listOf str); | ||||
|         default = pkgs.bash-language-server; | ||||
|       }; | ||||
|  |  | |||
|  | @ -6,7 +6,6 @@ | |||
| }: let | ||||
|   inherit (builtins) attrNames; | ||||
|   inherit (lib.options) mkEnableOption mkOption; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.lists) isList; | ||||
|   inherit (lib.types) enum either listOf package str; | ||||
|  |  | |||
|  | @ -2,7 +2,6 @@ | |||
|   config, | ||||
|   pkgs, | ||||
|   lib, | ||||
|   inputs, | ||||
|   ... | ||||
| }: let | ||||
|   inherit (builtins) attrNames; | ||||
|  | @ -28,7 +27,7 @@ | |||
|     else ''{"${package}/bin/${defaultCmd}"}''; | ||||
|   servers = { | ||||
|     nil = { | ||||
|       package = inputs.nil.packages.${pkgs.stdenv.system}.nil; | ||||
|       package = pkgs.nil; | ||||
|       internalFormatter = true; | ||||
|       lspConfig = '' | ||||
|         lspconfig.nil_ls.setup{ | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.lists) isList; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.types) enum either listOf package str; | ||||
|   inherit (lib.nvim.lua) expToLua; | ||||
|   inherit (lib.nvim.types) mkGrammarOption diagnostics; | ||||
|  | @ -19,7 +18,7 @@ | |||
|   defaultServer = "svelte"; | ||||
|   servers = { | ||||
|     svelte = { | ||||
|       package = pkgs.nodePackages.svelte-language-server; | ||||
|       package = pkgs.svelte-language-server; | ||||
|       lspConfig = '' | ||||
|         lspconfig.svelte.setup { | ||||
|           capabilities = capabilities; | ||||
|  |  | |||
|  | @ -9,7 +9,6 @@ | |||
|   inherit (lib.modules) mkIf mkMerge; | ||||
|   inherit (lib.lists) isList; | ||||
|   inherit (lib.meta) getExe; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.types) enum either listOf package str bool; | ||||
|   inherit (lib.nvim.lua) expToLua toLuaObject; | ||||
|   inherit (lib.nvim.types) mkGrammarOption diagnostics mkPluginSetupOption; | ||||
|  |  | |||
|  | @ -28,7 +28,7 @@ | |||
|   defaultServer = "yaml-language-server"; | ||||
|   servers = { | ||||
|     yaml-language-server = { | ||||
|       package = pkgs.nodePackages.yaml-language-server; | ||||
|       package = pkgs.yaml-language-server; | ||||
|       lspConfig = '' | ||||
| 
 | ||||
| 
 | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
| in { | ||||
|   options.vim.mini.colors = { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
| in { | ||||
|   options.vim.mini.extra = { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,10 +1,5 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption mkOption; | ||||
|   inherit (lib.strings) hasPrefix; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
|   inherit (lib.nvim.types) hexColor; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
|  | @ -17,7 +17,7 @@ in { | |||
|       # like to append programming to spelllangs as soon as | ||||
|       # possible while the plugin is enabled and the state | ||||
|       # directory can be found. | ||||
|       pluginRC.vim-dirtytalk = entryAfter ["spellcheck"] '' | ||||
|       luaConfigRC.vim-dirtytalk = entryAfter ["spellcheck"] '' | ||||
|         -- If Neovim can find (or access) the state directory | ||||
|         -- then append "programming" wordlist from vim-dirtytalk | ||||
|         -- to spelllang table. If path cannot be found, display | ||||
|  |  | |||
|  | @ -63,8 +63,8 @@ in { | |||
|           options = { | ||||
|             icons_enabled = mkDefault cfg.icons.enable; | ||||
|             theme = mkDefault cfg.theme; | ||||
|             component_separators = mkDefault [cfg.componentSeparator.left cfg.componentSeparator.right]; | ||||
|             section_separators = mkDefault [cfg.sectionSeparator.left cfg.sectionSeparator.right]; | ||||
|             component_separators = mkDefault cfg.componentSeparator; | ||||
|             section_separators = mkDefault cfg.sectionSeparator; | ||||
|             globalstatus = mkDefault cfg.globalStatus; | ||||
|             refresh = mkDefault cfg.refresh; | ||||
|             always_divide_middle = mkDefault cfg.alwaysDivideMiddle; | ||||
|  |  | |||
|  | @ -1,6 +1,6 @@ | |||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkOption mkEnableOption; | ||||
|   inherit (lib.types) enum str bool; | ||||
|   inherit (lib.types) enum str; | ||||
|   inherit (lib.generators) mkLuaInline; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption luaInline; | ||||
| in { | ||||
|  |  | |||
|  | @ -5,8 +5,6 @@ | |||
| }: let | ||||
|   inherit (lib.modules) mkIf; | ||||
|   inherit (lib.nvim.binds) mkKeymap; | ||||
|   inherit (lib.nvim.lua) toLuaObject; | ||||
|   inherit (lib.nvim.dag) entryAnywhere; | ||||
| 
 | ||||
|   cfg = config.vim.utility.motion.flash-nvim; | ||||
| in { | ||||
|  |  | |||
|  | @ -1,5 +1,4 @@ | |||
| { | ||||
|   pkgs, | ||||
|   config, | ||||
|   options, | ||||
|   lib, | ||||
|  |  | |||
|  | @ -1,7 +1,7 @@ | |||
| {lib, ...}: let | ||||
|   inherit (lib.modules) mkRemovedOptionModule; | ||||
|   inherit (lib.options) mkOption mkEnableOption; | ||||
|   inherit (lib.types) submodule attrs attrsOf; | ||||
|   inherit (lib.types) attrs; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|   imports = [ | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.modules) mkRenamedOptionModule; | ||||
|   inherit (lib.options) mkOption mkEnableOption literalExpression; | ||||
|   inherit (lib.types) nullOr attrsOf attrs enum; | ||||
|  |  | |||
|  | @ -1,8 +1,4 @@ | |||
| { | ||||
|   config, | ||||
|   lib, | ||||
|   ... | ||||
| }: let | ||||
| {lib, ...}: let | ||||
|   inherit (lib.options) mkEnableOption; | ||||
|   inherit (lib.nvim.types) mkPluginSetupOption; | ||||
| in { | ||||
|  |  | |||
		Loading…
	
	Add table
		Add a link
		
	
		Reference in a new issue