diff --git a/vim/.vim/lua/plugins/neotree.lua b/vim/.vim/lua/plugins/neotree.lua index efcab4a..894c1bf 100644 --- a/vim/.vim/lua/plugins/neotree.lua +++ b/vim/.vim/lua/plugins/neotree.lua @@ -1,54 +1,52 @@ local use_google = require("utils").use_google return { - -- { - -- "cmdtree", - -- dir = "~/cmdtree", - -- }, - { - "nvim-neo-tree/neo-tree.nvim", - dependencies = { - "nvim-lua/plenary.nvim", - "MunifTanjim/nui.nvim", - -- "~/cmdtree", - }, - cmd = { - "Neotree", - }, - config = function() - require("neo-tree").setup({ - hijack_netrw_behavior = "open_default", - filesystem = { - filtered_items = { - hide_dotfiles = false, - }, - bind_to_cwd = false, - }, - sources = { - "filesystem", - "buffers", - "git_status", - --"cmdtree", - -- ...and any additional source - }, - window = { - mappings = { - ["O"] = "expand_all_nodes", - }, - }, - }) - end, - -- stylua: ignore - keys = { - (function() - if use_google() then - return { "m", ":Neotree float cmdtree", desc = "Open NeoTree CWD float" } - end - -- return { ".", ":Neotree toggle reveal_force_cwd", desc = "Open NeoTree CWD float" } - return { "m", ":Neotree float git_status", desc = "Open NeoTree CWD float" } - end)(), - { "", ":Neotree toggle left dir=%:p:h" }, - { "e", ":Neotree float dir=%:p:h/" }, - }, - }, + -- { + -- "cmdtree", + -- dir = "~/cmdtree", + -- }, + { + "nvim-neo-tree/neo-tree.nvim", + dependencies = { + "nvim-lua/plenary.nvim", + "MunifTanjim/nui.nvim", + -- "~/cmdtree", + }, + cmd = { + "Neotree", + }, + config = function() + require("neo-tree").setup({ + hijack_netrw_behavior = "open_default", + filesystem = { + filtered_items = { + hide_dotfiles = false, + }, + bind_to_cwd = false, + }, + sources = { + "filesystem", + "buffers", + "git_status", + --"cmdtree", + -- ...and any additional source + }, + window = { + mappings = { + ["O"] = "expand_all_nodes", + }, + }, + }) + end, + -- stylua: ignore + keys = { + (function() + if use_google() then + return { "m", ":Neotree float cmdtree", desc = "Open NeoTree CWD float" } + end + return { "m", ":Neotree float git_status", desc = "Open NeoTree CWD float" } + end)(), + { "", ":Neotree toggle left dir=%:p:h" }, + }, + }, } diff --git a/vim/.vim/lua/plugins/telescope.lua b/vim/.vim/lua/plugins/telescope.lua index ef67850..c9709fe 100644 --- a/vim/.vim/lua/plugins/telescope.lua +++ b/vim/.vim/lua/plugins/telescope.lua @@ -28,17 +28,17 @@ local function exe(cmd) return vim.split(vim.fn.system(cmd), "\n") end -function fig_modified() +local function fig_modified() return exe("chg pstatus -ma -n --no-status --template= | sort") end -function fig_all_modified() +local function fig_all_modified() return exe("chg status -ma -n --rev p4base --no-status --template= | sort") end -- stylua: ignore local keys = { - -- { "e", ":lua search_cwd()", desc = "Find Files in Buffer Directory" }, + { "e", ":lua search_cwd()", desc = "Find Files in Buffer Directory" }, { "ts", require('telescope.builtin').live_grep }, { "tb", ":Telescope buffers" }, { "TS", function() require('telescope.builtin').live_grep { default_text = vim.fn.expand("") } end, }, @@ -51,14 +51,13 @@ local keys = { , desc = "Find Dotfiles" }, - { "tc", ":Telescope textcase", desc = "Text case" }, - { "tC", ":CritiqueUnresolvedCommentsTelescope", desc = "Critique unresolved comments" }, - { "tca", ":CritiqueCommentsTelescope", desc = "Critique all comments" }, - { "tg", ":Telescope git_files", desc = "Git Files" }, - { "tk", ":Telescope keymaps", desc = "Keymaps" }, - { "tn", ":Telescope notify", desc = "Notifications" }, - { "tr", ":Telescope resume", desc = "Telescope Resume" }, - { "th", ":lua require('telescope.builtin').help_tags{}", desc = "[T]elescope [H]elp" }, + { "tC", ":Telescope textcase", desc = "Text case" }, + { "tc", ":CritiqueCommentsTelescope", desc = "Critique all comments" }, + { "tg", ":Telescope git_files", desc = "Git Files" }, + { "tk", ":Telescope keymaps", desc = "Keymaps" }, + { "tn", ":Telescope notify", desc = "Notifications" }, + { "tr", ":Telescope resume", desc = "Telescope Resume" }, + { "th", ":lua require('telescope.builtin').help_tags{}", desc = "[T]elescope [H]elp" }, } if use_google() then