NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2025-02-24 12:28:32 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

created otter file

Browse source 
merge
This commit is contained in:
Soliprem 2024-09-27 09:46:30 +02:00
parent ed4a039996
commit 81857e4acf
2 changed files with 33 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

21
modules/plugins/lsp/otter/config.nix
View file

@ -5,6 +5,7 @@
}: let }: let
inherit (lib.modules) mkIf mkMerge; inherit (lib.modules) mkIf mkMerge;
inherit (lib.nvim.dag) entryAnywhere; inherit (lib.nvim.dag) entryAnywhere;
<<<<<<< HEAD
inherit (lib.nvim.lua) toLuaObject; inherit (lib.nvim.lua) toLuaObject;
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding; inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
@ -26,13 +27,33 @@ in {
vim = { vim = {
startPlugins = ["otter-nvim"]; startPlugins = ["otter-nvim"];
=======
inherit (lib.nvim.binds) addDescriptionsToMappings mkSetBinding;
cfg = config.vim.lsp;
self = import ./otter.nix {inherit lib;};
mappingDefinitions = self.options.vim.lsp.otter.mappings;
mappings = addDescriptionsToMappings cfg.otter.mappings mappingDefinitions;
in {
config = mkIf (cfg.enable && cfg.otter.enable) {
vim = {
startPlugins = ["otter"];
>>>>>>> d61aba1 (created otter file)
maps.normal = mkMerge [ maps.normal = mkMerge [
(mkSetBinding mappings.toggle "<cmd>lua require'otter'.activate()<CR>") (mkSetBinding mappings.toggle "<cmd>lua require'otter'.activate()<CR>")
]; ];
<<<<<<< HEAD
pluginRC.otter-nvim = entryAnywhere '' pluginRC.otter-nvim = entryAnywhere ''
-- Enable otter diagnostics viewer -- Enable otter diagnostics viewer
require("otter").setup({${toLuaObject cfg.otter-nvim.setupOpts}}) require("otter").setup({${toLuaObject cfg.otter-nvim.setupOpts}})
=======
pluginRC.otter = entryAnywhere ''
-- Enable otter diagnostics viewer
require("otter").setup {}
>>>>>>> d61aba1 (created otter file)
''; '';
}; };
}; };

12
modules/plugins/lsp/otter/otter.nix
View file

@ -1,4 +1,5 @@
{lib, ...}: let {lib, ...}: let
<<<<<<< HEAD
inherit (lib.options) mkOption mkEnableOption; inherit (lib.options) mkOption mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption; inherit (lib.nvim.binds) mkMappingOption;
inherit (lib.types) bool str listOf; inherit (lib.types) bool str listOf;
@ -58,6 +59,17 @@ in {
(eg. in Org files) When true, otter handles these cases fully. (eg. in Org files) When true, otter handles these cases fully.
''; '';
}; };
=======
inherit (lib.options) mkEnableOption;
inherit (lib.nvim.binds) mkMappingOption;
in {
options.vim.lsp = {
trouble = {
enable = mkEnableOption "Otter LSP Injector";
mappings = {
toggle = mkMappingOption "Activate LSP on Cursor Position [otter]" "<leader>oa";
>>>>>>> d61aba1 (created otter file)
}; };
}; };
}; };