diff --git a/home/bin/sc b/home/bin/sc index 96220b9..0939987 100755 --- a/home/bin/sc +++ b/home/bin/sc @@ -15,7 +15,7 @@ upload() { url() { # Given a target name, echo the expected URL of the uploaded screenshot - echo "https://tyrel.pw/s/$1" + echo "https://tyrel.bike/s/$1" } ### (End) @@ -88,7 +88,8 @@ clipboard " " # Upload it url=$(url "${filename}") echo "Uploading: $url" -upload "${tmppath}" "${filename}" && rm "${tmppath}" || fail 3 "failed to upload ${tmppath}" + +upload "${tmppath}" "${filename}" || fail 3 "failed to upload ${tmppath}" # Copy to clipboard clipboard "${url}" diff --git a/home/config/nvim/lua/settings_after.lua b/home/config/nvim/lua/settings_after.lua index bffe1e8..442a692 100644 --- a/home/config/nvim/lua/settings_after.lua +++ b/home/config/nvim/lua/settings_after.lua @@ -44,7 +44,7 @@ vim.cmd 'colorscheme bamboo' vim.g.floaterm_keymap_toggle = '' vim.g.floaterm_width = 0.9 vim.g.floaterm_height = 0.9 -vim.g.floaterm_shell = "/bin/bash" +vim.g.floaterm_shell = "/bin/zsh" vim.g.rustfmt_autosave = 1 vim.g.rust_use_custom_ctags_defs = 1 diff --git a/home/config/wezterm/wezterm.lua b/home/config/wezterm/wezterm.lua index c5f7186..949a0cd 100644 --- a/home/config/wezterm/wezterm.lua +++ b/home/config/wezterm/wezterm.lua @@ -77,9 +77,47 @@ config.keys = { args = { 'nvim', wezterm.home_dir .. '/.config/wezterm/wezterm.lua' }, }, }, + { + key = '|', + mods = 'CTRL|SHIFT|ALT', + action = wezterm.action.SplitHorizontal { }, + }, + { + key = '_', + mods = 'CTRL|SHIFT|ALT', + action = wezterm.action.SplitVertical { }, + }, } +function tab_title(tab_info) + local title = tab_info.tab_title + -- if the tab title is explicitly set, take that + if title and #title > 0 then + return title + end + -- Otherwise, use the title from the active pane + -- in that tab + return tab_info.active_pane.title +end + + +wezterm.on( + 'format-tab-title', + function(tab, tabs, panes, config, hover, max_width) + local title = tab_title(tab) + if tab.is_active then + return { + { Background = { Color = 'purple' } }, + { Text = ' ' .. title .. ' ' }, + } + end + return title + end +) + -- and finally, return the configuration to wezterm return config + + diff --git a/home/p10k.zsh b/home/p10k.zsh index 6dada35..038faed 100644 --- a/home/p10k.zsh +++ b/home/p10k.zsh @@ -1669,7 +1669,8 @@ # - verbose: Enable instant prompt and print a warning when detecting console output during # zsh initialization. Choose this if you've never tried instant prompt, haven't # seen the warning, or if you are unsure what this all means. - typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose + #typeset -g POWERLEVEL9K_INSTANT_PROMPT=verbose + typeset -g POWERLEVEL9K_INSTANT_PROMPT=quiet # Hot reload allows you to change POWERLEVEL9K options after Powerlevel10k has been initialized. # For example, you can type POWERLEVEL9K_BACKGROUND=red and see your prompt turn red. Hot reload diff --git a/home/shell_aliases b/home/shell_aliases index 6c3149a..4c3dc0e 100644 --- a/home/shell_aliases +++ b/home/shell_aliases @@ -13,3 +13,4 @@ alias tree=tree -I 'node_modules|venv' alias vim=nvim alias vimini="vim ~/.config/nvim/init.vim" alias wx="curl https://wttr.in/Raleigh" +alias tf0="tail -n0 -f" diff --git a/home/zshrc b/home/zshrc index 686cb9a..2b180f9 100644 --- a/home/zshrc +++ b/home/zshrc @@ -1,12 +1,7 @@ autoload -Uz promptinit promptinit prompt adam2 + source ~/.shell_aliases source ~/.shell_funcs - - -export PYENV_ROOT="$HOME/.pyenv" -[[ -d $PYENV_ROOT/bin ]] && export PATH="$PYENV_ROOT/bin:$PATH" -eval "$(pyenv init -)" - source ~/.shell_base