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

update

Browse source 
merge
This commit is contained in:
Soliprem 2024-09-27 10:09:43 +02:00
parent 083a5172cb
commit f1c8a486bd
3 changed files with 1984 additions and 2019 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3981
flake.lock generated
View file

File diff suppressed because it is too large Load diff

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

@ -5,7 +5,6 @@
}: 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;
@ -27,33 +26,13 @@ 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)
''; '';
}; };
}; };

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

@ -66,7 +66,6 @@ in {
options.vim.lsp = { options.vim.lsp = {
otter = { otter = {
enable = mkEnableOption "Otter LSP Injector"; enable = mkEnableOption "Otter LSP Injector";
mappings = { mappings = {
toggle = mkMappingOption "Activate LSP on Cursor Position [otter]" "<leader>oa"; toggle = mkMappingOption "Activate LSP on Cursor Position [otter]" "<leader>oa";
>>>>>>> d61aba1 (created otter file) >>>>>>> d61aba1 (created otter file)