diff --git a/.luarc.json b/.luarc.json index d602248..f2fe37f 100644 --- a/.luarc.json +++ b/.luarc.json @@ -76,6 +76,7 @@ "/Users/michael/.local/share/m-housh/lazy/toggleterm.nvim/lua", "/Users/michael/.dotfiles/nvim/m-housh/lua", "/Users/michael/.dotfiles/nvim/m-housh/lua", - "${3rd}/luv/library" + "${3rd}/luv/library", + "${3rd}/luassert/library" ] } \ No newline at end of file diff --git a/nvim/m-housh/lazy-lock.json b/nvim/m-housh/lazy-lock.json index 4a896a3..b9f7c03 100644 --- a/nvim/m-housh/lazy-lock.json +++ b/nvim/m-housh/lazy-lock.json @@ -38,7 +38,6 @@ "telescope-fzf-native.nvim": { "branch": "main", "commit": "6c921ca12321edaa773e324ef64ea301a1d0da62" }, "telescope.nvim": { "branch": "0.1.x", "commit": "54930e1abfc94409e1bb9266e752ef8379008592" }, "toggleterm.nvim": { "branch": "main", "commit": "c80844fd52ba76f48fabf83e2b9f9b93273f418d" }, - "vim-kitty": { "branch": "main", "commit": "891475671feebc4bf0f29f0a0987067913a81686" }, "vim-tmux-navigator": { "branch": "master", "commit": "7db70e08ea03b3e4d91f63713d76134512e28d7e" }, "which-key.nvim": { "branch": "main", "commit": "7ccf476ebe0445a741b64e36c78a682c1c6118b7" }, "wrapping.nvim": { "branch": "master", "commit": "e1ce68aae5ea729fc20e5bc17fb569314f76b9bb" }, diff --git a/scripts/scripts/tmux-sessionator b/scripts/scripts/tmux-sessionator index f01a9bd..990a64e 100755 --- a/scripts/scripts/tmux-sessionator +++ b/scripts/scripts/tmux-sessionator @@ -4,9 +4,23 @@ declare -a findPaths=("$HOME") +function fpath_prepend() { + declare arg + for arg in "$@"; do + test -d $arg || continue + findPaths=("$arg" "$findPaths") + done +} + if [[ $# -eq 1 ]]; then selected=$1 else + + fpath_prepend "$REPOS" \ + "$LOCAL_REPOS" \ + "$GHREPOS" \ + "$GHREPOS" + # Some of my machines, projects is a symlink to $REPOS, so ignore it. # On other machines, it is local versions of projects, so add it. if [[ ! -L "$HOME/projects" ]]; then diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 59aea17..b616d56 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -70,6 +70,7 @@ bind -n M-h previous-window bind -n M-L next-window bind C-l send-keys 'C-l' + bind-key -r f run-shell "tmux neww ~/.local/scripts/tmux-sessionator" bind-key -r C run-shell "tmux neww ~/.local/scripts/tmux-sessionator ~/.dotfiles" bind-key -r S run-shell -b "~/.config/tmux/plugins/tmux-fzf/scripts/session.sh switch" diff --git a/wezterm/wezterm.lua b/wezterm/wezterm.lua index c44a581..6518b91 100644 --- a/wezterm/wezterm.lua +++ b/wezterm/wezterm.lua @@ -7,14 +7,15 @@ end --config.color_scheme = 'rose-pine' config.color_scheme = 'nightfox' + +-- Font config.font = wezterm.font_with_fallback { 'JetBrains Mono', - 'nonicons' + 'Inconsolata Nerd Font Mono', } config.font_size = 16.0 -config.use_fancy_tab_bar = false - +-- Window config.enable_scroll_bar = false config.window_padding = { left = 0, @@ -25,6 +26,10 @@ config.window_padding = { config.window_close_confirmation = 'NeverPrompt' config.window_decorations = 'TITLE' +-- Tab Bar +config.show_tabs_in_tab_bar = true +config.show_new_tab_button_in_tab_bar = false +config.use_fancy_tab_bar = true config.tab_bar_at_bottom = true return config