From 115d38e48ec32f927d16d526b86ef4b811210cb2 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Thu, 18 Apr 2024 22:16:38 +0300 Subject: [PATCH] plugins/filetree: rename module name; default to neo-tree --- configuration.nix | 5 ++--- modules/plugins/filetree/neo-tree/config.nix | 4 ++-- modules/plugins/filetree/neo-tree/neo-tree.nix | 6 ++++-- 3 files changed, 8 insertions(+), 7 deletions(-) diff --git a/configuration.nix b/configuration.nix index 8616bc1..d3fce5e 100644 --- a/configuration.nix +++ b/configuration.nix @@ -132,9 +132,8 @@ inputs: let }; filetree = { - nvimTree = { - enable = true; - }; + nvimTree.enable = false; + neo-tree.enable = true; }; tabline = { diff --git a/modules/plugins/filetree/neo-tree/config.nix b/modules/plugins/filetree/neo-tree/config.nix index ee6b327..dd85287 100644 --- a/modules/plugins/filetree/neo-tree/config.nix +++ b/modules/plugins/filetree/neo-tree/config.nix @@ -5,7 +5,7 @@ }: let inherit (lib.modules) mkIf; inherit (lib.nvim.dag) entryAnywhere; - inherit (lib.toLuaObject) toLuaObject; + inherit (lib.nvim.lua) toLuaObject; cfg = config.vim.filetree.neo-tree; in { @@ -20,7 +20,7 @@ in { "neo-tree-nvim" ]; - luaConfigRc.neo-tree = entryAnywhere '' + luaConfigRC.neo-tree = entryAnywhere '' require("neo-tree").setup(${toLuaObject cfg.setupOpts}) ''; }; diff --git a/modules/plugins/filetree/neo-tree/neo-tree.nix b/modules/plugins/filetree/neo-tree/neo-tree.nix index 75170e9..b1ec260 100644 --- a/modules/plugins/filetree/neo-tree/neo-tree.nix +++ b/modules/plugins/filetree/neo-tree/neo-tree.nix @@ -3,7 +3,7 @@ inherit (lib.options) mkOption mkEnableOption literalExpression; inherit (lib.nvim.types) mkPluginSetupOption; in { - options.vim.filetree.nvimTree = { + options.vim.filetree.neo-tree = { enable = mkEnableOption "filetree via neo-tree.nvim"; # Permalink: @@ -67,6 +67,7 @@ in { This will make the git status check async and will not block the UI. ''; + /* git_status_async_options = mkOption { description = "These options are for people with VERY large git repos"; type = submodule { @@ -94,6 +95,7 @@ in { }; }; }; + */ hide_root_node = mkOption { type = bool; @@ -144,7 +146,7 @@ in { open_files_do_not_replace_types = mkOption { type = listOf str; default = ["terminal" "Trouble" "qf" "edgy"]; - descriptin = '' + description = '' A list of filetypes that should not be replaced when opening a file ''; };