NotAShelf/nvf
1
0
Fork 0
mirror of https://github.com/NotAShelf/nvf.git synced 2024-11-26 15:06:45 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions 1

dev: cleanup

Browse source
This commit is contained in:
raf 2023-07-30 16:00:18 +03:00
parent c766e8cf27
commit 7f7926fbbb
No known key found for this signature in database
GPG key ID: 02D1DD3FA08B6B29
2 changed files with 186 additions and 181 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

80
modules/filetree/nvimtree/config.nix
View file

@ -24,47 +24,9 @@ in {
];
vim.luaConfigRC.nvimtreelua = nvim.dag.entryAnywhere ''
${
lib.optionalString (cfg.openOnSetup) ''
-- Open on startup has been deprecated
-- see https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup
-- use a nix eval to dynamically insert the open on startup function
local function open_nvim_tree(data)
local IGNORED_FT = {
"markdown",
}
-- buffer is a real file on the disk
local real_file = vim.fn.filereadable(data.file) == 1
-- buffer is a [No Name]
local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
-- &ft
local filetype = vim.bo[data.buf].ft
-- only files please
if not real_file and not no_name then
return
end
-- skip ignored filetypes
if vim.tbl_contains(IGNORED_FT, filetype) then
return
end
-- open the tree but don't focus it
require("nvim-tree.api").tree.toggle({ focus = false })
end
-- function to automatically open the tree on VimEnter
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
''
}
${
lib.optionalString (cfg.disableNetrw) ''
-- disable netrew completely
vim.g.loaded_netrw = 1
vim.g.loaded_netrwPlugin = 1
''
@ -301,6 +263,46 @@ in {
},
},
})
-- autostart behaviour
${
lib.optionalString (cfg.openOnSetup) ''
-- Open on startup has been deprecated
-- see https://github.com/nvim-tree/nvim-tree.lua/wiki/Open-At-Startup
-- use a nix eval to dynamically insert the open on startup function
local function open_nvim_tree(data)
local IGNORED_FT = {
"markdown",
}
-- buffer is a real file on the disk
local real_file = vim.fn.filereadable(data.file) == 1
-- buffer is a [No Name]
local no_name = data.file == "" and vim.bo[data.buf].buftype == ""
-- &ft
local filetype = vim.bo[data.buf].ft
-- only files please
if not real_file and not no_name then
return
end
-- skip ignored filetypes
if vim.tbl_contains(IGNORED_FT, filetype) then
return
end
-- open the tree but don't focus it
require("nvim-tree.api").tree.toggle({ focus = false })
end
-- function to automatically open the tree on VimEnter
vim.api.nvim_create_autocmd({ "VimEnter" }, { callback = open_nvim_tree })
''
}
'';
};
}

5
modules/filetree/nvimtree/nvimtree.nix
View file

@ -260,10 +260,12 @@ with builtins; {
severity = mkOption {
description = "Severity for which the diagnostics will be displayed. See `:help diagnostic-severity`";
default = {
min = "HINT";
max = "ERROR";
};
type = types.submodule {
options = {
min = mkOption {
@ -306,7 +308,7 @@ with builtins; {
'';
};
timeOut = mkOption {
timeout = mkOption {
type = types.int;
default = 400;
description = ''
@ -472,6 +474,7 @@ with builtins; {
float = mkOption {
description = "Configuration options for floating window.";
default = {
enable = false;
quitOnFocusLoss = true;