From 93aad7b0dadf4a0573cc5e17316af0af471334b3 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 30 Jul 2023 12:11:47 +0300 Subject: [PATCH 1/3] dev: disable session manager to avoid filetree conflicts --- configuration.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/configuration.nix b/configuration.nix index 1438b002..f94ab02c 100644 --- a/configuration.nix +++ b/configuration.nix @@ -210,7 +210,7 @@ inputs: let }; vim.session = { - nvim-session-manager.enable = isMaximal; + nvim-session-manager.enable = false; }; vim.gestures = { From 77223a22351e2478dddb3a85bb57401beebbbf74 Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 30 Jul 2023 12:12:07 +0300 Subject: [PATCH 2/3] style: formatting with alejandra --- modules/filetree/nvimtree/config.nix | 22 +++++++++++----------- 1 file changed, 11 insertions(+), 11 deletions(-) diff --git a/modules/filetree/nvimtree/config.nix b/modules/filetree/nvimtree/config.nix index 29d9f2e4..e1d1a627 100644 --- a/modules/filetree/nvimtree/config.nix +++ b/modules/filetree/nvimtree/config.nix @@ -74,7 +74,7 @@ in { disable_netrw = ${boolToString cfg.disableNetrw}, hijack_netrw = ${boolToString cfg.hijackNetrw}, auto_reload_on_write = ${boolToString cfg.autoreloadOnWrite}, - + sort = { sorter = "${cfg.sort.sorter}", folders_first = ${boolToString cfg.sort.foldersFirst}, @@ -87,7 +87,7 @@ in { sync_root_with_cwd = ${boolToString cfg.syncRootWithCwd}, reload_on_bufenter = ${boolToString cfg.reloadOnBufEnter}, respect_buf_cwd = ${boolToString cfg.respectBufCwd}, - + hijack_directories = { enable = ${boolToString cfg.hijackDirectories.enable}, auto_open = ${boolToString cfg.hijackDirectories.autoOpen}, @@ -140,7 +140,7 @@ in { }, select_prompts = ${boolToString cfg.selectPrompts}, - + view = { width = ${nvim.lua.expToLua cfg.view.width}, centralize_selection = ${boolToString cfg.view.centralizeSelection}, @@ -180,7 +180,7 @@ in { modified_placement = "${cfg.renderer.icons.modifiedPlacement}", padding = "${cfg.renderer.icons.padding}", symlink_arrow = "${cfg.renderer.icons.symlinkArrow}", - + show = { git = ${boolToString cfg.renderer.icons.show.git}, folder = ${boolToString cfg.renderer.icons.show.folder}, @@ -188,12 +188,12 @@ in { file = ${boolToString cfg.renderer.icons.show.file}, modified = ${boolToString cfg.renderer.icons.show.modified}, }, - + glyphs = { default = "${cfg.renderer.icons.glyphs.default}", symlink = "${cfg.renderer.icons.glyphs.symlink}", modified = "${cfg.renderer.icons.glyphs.modified}", - + folder = { default = "${cfg.renderer.icons.glyphs.folder.default}", open = "${cfg.renderer.icons.glyphs.folder.open}", @@ -241,11 +241,11 @@ in { max_folder_discovery = ${toString cfg.actions.expandAll.maxFolderDiscovery}, exclude = ${nvim.lua.listToLuaTable cfg.actions.expandAll.exclude}, }, - + file_popup = { open_win_config = ${nvim.lua.expToLua cfg.actions.filePopup.openWinConfig}, }, - + open_file = { quit_on_open = ${boolToString cfg.actions.openFile.quitOnOpen}, eject = ${boolToString cfg.actions.openFile.eject}, @@ -260,17 +260,17 @@ in { }, }, }, - + remove_file = { close_window = ${boolToString cfg.actions.removeFile.closeWindow}, }, }, - + live_filter = { prefix = "${cfg.liveFilter.prefix}", always_show_folders = ${boolToString cfg.liveFilter.alwaysShowFolders}, }, - + tab = { sync = { open = ${boolToString cfg.tab.sync.open}, From c42e53a61b8f8afe71b867fe1f3b1966dc6a19bc Mon Sep 17 00:00:00 2001 From: NotAShelf Date: Sun, 30 Jul 2023 12:12:24 +0300 Subject: [PATCH 3/3] dev: use literalExpression for examples --- modules/filetree/nvimtree/nvimtree.nix | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/modules/filetree/nvimtree/nvimtree.nix b/modules/filetree/nvimtree/nvimtree.nix index ea98f285..f6d9c607 100644 --- a/modules/filetree/nvimtree/nvimtree.nix +++ b/modules/filetree/nvimtree/nvimtree.nix @@ -973,7 +973,7 @@ with builtins; { The picker may create a new window. ''; - example = mkLiteralExample '' + example = literalExpression '' -- with s1n7ax/nvim-window-picker plugin require('window-picker').pick_window, '';