From 854d4ff92cefa27cd42edb8bed9fbd3026b0f897 Mon Sep 17 00:00:00 2001 From: bcarlin Date: Mon, 28 Mar 2022 18:28:26 +0200 Subject: [PATCH 1/2] fix(nvim): move deprecated options in nvim-tree --- nvim/.config/nvim/init.lua | 2 +- nvim/.config/nvim/lua/plugins/nvimtree.lua | 18 +++++++++++++----- 2 files changed, 14 insertions(+), 6 deletions(-) diff --git a/nvim/.config/nvim/init.lua b/nvim/.config/nvim/init.lua index 3e07c3c..ad7afc2 100644 --- a/nvim/.config/nvim/init.lua +++ b/nvim/.config/nvim/init.lua @@ -1,3 +1,3 @@ require "settings" -require "lsp" require "plugins" +require "lsp" diff --git a/nvim/.config/nvim/lua/plugins/nvimtree.lua b/nvim/.config/nvim/lua/plugins/nvimtree.lua index d071217..74083c6 100644 --- a/nvim/.config/nvim/lua/plugins/nvimtree.lua +++ b/nvim/.config/nvim/lua/plugins/nvimtree.lua @@ -4,15 +4,11 @@ vim.g.nvim_tree_highlight_opened_files = 1 -- 0 by default, will enable folder a vim.g.nvim_tree_root_folder_modifier = ':~' -- This is the default. See :help filename-modifiers for more options vim.g.nvim_tree_add_trailing = 1 -- 0 by default, append a trailing slash to folder names vim.g.nvim_tree_group_empty = 1 -- 0 by default, compact folders that only contain a single folder into one node in the file tree -vim.g.nvim_tree_disable_window_picker = 1 -- 0 by default, will disable the window picker. vim.g.nvim_tree_icon_padding = ' ' -- one space by default, used for rendering the space between the icon and the filename. Use with caution, it could break rendering if you set an empty string depending on your font. vim.g.nvim_tree_symlink_arrow = '->' -- defaults to ' ➛ '. used as a separator between symlinks' source and target. vim.g.nvim_tree_respect_buf_cwd = 1 -- 0 by default, will change cwd of nvim-tree to that of new buffer's when opening nvim-tree. vim.g.nvim_tree_create_in_closed_folder = 0 -- 1 by default, When creating files, sets the path of a file when cursor is on a closed folder to the parent folder when 0, and inside the folder when 1. -vim.g.nvim_tree_window_picker_exclude = { - filetype = { packer, }, - buftype = { terminal }, -} +-- -- Dictionary of buffer option names mapped to a list of option values that -- indicates to the window picker that the buffer's window should not be -- selectable. @@ -101,4 +97,16 @@ require('nvim-tree').setup { hide_root_folder = false, side = 'left', }, + actions = { + open_file = { + window_picker = { + enable = true, + chars = "ABCDEFGHIJKLMNOPQRSTUVWXYZ1234567890", + exclude = { + filetype = { "notify", "packer", "qf", "diff", "fugitive", "fugitiveblame" }, + buftype = { "nofile", "terminal", "help" }, + }, + }, + }, + }, } From 6fed9eff38ae557dee58721df39fb8c42b844afa Mon Sep 17 00:00:00 2001 From: bcarlin Date: Mon, 28 Mar 2022 18:29:10 +0200 Subject: [PATCH 2/2] fix(zsh): better zshrc --- zsh/.zshrc | 17 ++++++++++++++++- 1 file changed, 16 insertions(+), 1 deletion(-) diff --git a/zsh/.zshrc b/zsh/.zshrc index a9a889a..0371fbb 100644 --- a/zsh/.zshrc +++ b/zsh/.zshrc @@ -1,8 +1,23 @@ setopt correctall + autoload -Uz compinit promptinit compinit promptinit +zstyle ':completion:*' menu select PROMPT='%F{yellow}%1~%f %# ' -source /home/bca/.config/broot/launcher/bash/br +EDITOR=nvim +GOPATH=$HOME/.go +export GOPATH EDITOR + +typeset -U PATH path +path=( + "$HOME/.local/bin" + "$HOME/bin" + "$GOPATH/bin" + "$path[@]" +) +export PATH + +alias ll="ls -l"