Compare commits
No commits in common. "003b9cbe8bc92c1a2ae3aae6489232d5ca75e8a7" and "be29c2f2bd63bac54a0f4a0c4bfeb5b3c0d32412" have entirely different histories.
003b9cbe8b
...
be29c2f2bd
|
@ -1,17 +1,17 @@
|
|||
#!/bin/bash
|
||||
|
||||
heading() {
|
||||
# or "\e" on *nix
|
||||
HEAD="\033[96m\033[1m"
|
||||
DONE="\033[0m"
|
||||
echo -e "${HEAD}${1}${DONE}"
|
||||
# or "\e" on *nix
|
||||
HEAD="\033[96m\033[1m"
|
||||
DONE="\033[0m"
|
||||
echo -e "${HEAD}${1}${DONE}"
|
||||
}
|
||||
|
||||
# 0) find local git repo, or fail now
|
||||
GIT_ROOT=$(git rev-parse --show-toplevel 2>/dev/null)
|
||||
if [[ "$GIT_ROOT" == "" ]]; then
|
||||
echo "! can't find nearby git repository" >&2
|
||||
exit 1
|
||||
echo "! can't find nearby git repository" >&2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
# 1) show git branches
|
||||
|
@ -26,18 +26,18 @@ echo
|
|||
|
||||
# 3) stashed changes
|
||||
if [[ -n $(git stash list) ]]; then
|
||||
heading Stash
|
||||
git stash list | sed "s/^/ /"
|
||||
echo
|
||||
heading Stash
|
||||
git stash list | sed "s/^/ /"
|
||||
echo
|
||||
fi
|
||||
|
||||
# 4) divergence from source
|
||||
UPSTREAM=$(git rev-parse --abbrev-ref --symbolic-full-name @{u} 2>/dev/null)
|
||||
if [[ -n "${UPSTREAM}" ]]; then
|
||||
heading "upstream [${UPSTREAM}] divergence"
|
||||
git diff -r $UPSTREAM --name-only --color | sed "s/^/ /"
|
||||
heading "upstream [${UPSTREAM}] divergence"
|
||||
git diff -r $UPSTREAM --name-only --color | sed "s/^/ /"
|
||||
else
|
||||
heading "WARNING- no upstream configured"
|
||||
heading "WARNING- no upstream configured"
|
||||
fi
|
||||
echo
|
||||
|
||||
|
|
|
@ -7,12 +7,11 @@
|
|||
"cmp-nvim-lua": { "branch": "main", "commit": "f12408bdb54c39c23e67cab726264c10db33ada8" },
|
||||
"cmp-path": { "branch": "main", "commit": "91ff86cd9c29299a64f968ebb45846c485725f23" },
|
||||
"cmp-vsnip": { "branch": "main", "commit": "989a8a73c44e926199bfd05fa7a516d51f2d2752" },
|
||||
"earthly.vim": { "branch": "main", "commit": "66bf86d8292d71e6f2f5e8ea371471c9809efde6" },
|
||||
"fzf": { "branch": "master", "commit": "7320b7df62039c879c4f609bca946ea09b438a98" },
|
||||
"fzf.vim": { "branch": "master", "commit": "1e054c1d075d87903647db9320116d360eb8b024" },
|
||||
"indent-blankline.nvim": { "branch": "master", "commit": "29be0919b91fb59eca9e90690d76014233392bef" },
|
||||
"jellybeans.vim": { "branch": "master", "commit": "ef83bf4dc8b3eacffc97bf5c96ab2581b415c9fa" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "96584866b9c5e998cbae300594d0ccfd0c464627" },
|
||||
"lazy.nvim": { "branch": "main", "commit": "758bb5de98b805acc5eeed8cdc8ac7f0bc4b0b86" },
|
||||
"logstash.vim": { "branch": "master", "commit": "531fe079e8c964d2b5786bcb5871c72f966adc2a" },
|
||||
"lualine-lsp-progress": { "branch": "master", "commit": "56842d097245a08d77912edf5f2a69ba29f275d7" },
|
||||
"lualine.nvim": { "branch": "master", "commit": "2248ef254d0a1488a72041cfb45ca9caada6d994" },
|
||||
|
|
|
@ -217,5 +217,4 @@ return {
|
|||
require('bamboo').load()
|
||||
end,
|
||||
},
|
||||
{ 'earthly/earthly.vim'},
|
||||
}
|
||||
|
|
|
@ -123,7 +123,7 @@ vim.api.nvim_set_keymap("n", "<C-J>", ":bprev<CR>", {silent = true})
|
|||
vim.api.nvim_set_keymap("n", "<C-K>", ":bnext<CR>", {silent = true})
|
||||
vim.api.nvim_set_keymap("n", "<C-o>", ":NERDTreeToggle<CR>", {silent = true})
|
||||
|
||||
vim.api.nvim_set_keymap("n", "<F1>", ":set invrnu<CR>", {silent = true })
|
||||
vim.api.nvim_set_keymap("n", "<F1>", ":set invnumber invrelativenumber<CR>", {silent = true })
|
||||
vim.api.nvim_set_keymap("i", "<F1>", "<Esc>", {silent = true })
|
||||
vim.api.nvim_set_keymap("n", "<F8>", ":Tagbar<CR>", {silent = true })
|
||||
vim.api.nvim_set_keymap("n", "<F9>", ":FloatermToggle<CR>", {silent = true })
|
||||
|
|
|
@ -1,11 +1,8 @@
|
|||
#!/bin/bash
|
||||
function portaldsave() {
|
||||
docker save portald:devel | gzip > portal.tar.gz
|
||||
}
|
||||
|
||||
|
||||
function rl() {
|
||||
for var in "$@"; do
|
||||
for var in "$@"
|
||||
do
|
||||
open -a iTerm ~/rl/$var
|
||||
settitle $var
|
||||
done
|
||||
|
|
|
@ -7,7 +7,8 @@ function pulldep() {
|
|||
}
|
||||
|
||||
function tide() {
|
||||
for var in "$@"; do
|
||||
for var in "$@"
|
||||
do
|
||||
open -a iTerm ~/code/tidelift/$var
|
||||
settitle $var
|
||||
done
|
||||
|
|
|
@ -1,16 +1,8 @@
|
|||
#!/bin/bash
|
||||
|
||||
alias cat='bat'
|
||||
alias cprm='git remote get-url origin | tr -d "\n" | pbcopy'
|
||||
alias dcomp="docker compose"
|
||||
alias docker-compose="docker compose"
|
||||
alias dots='cd ~/code/dotfiles/'
|
||||
alias fuckingip="curl https://wtfismyip.com/json"
|
||||
alias g='git'
|
||||
alias gcd='cd $(git rev-parse --show-toplevel)'
|
||||
alias gp='git push -u'
|
||||
alias ls="eza -lhgxUm --git --time-style long-iso --group-directories-first"
|
||||
alias tree=tree -I 'node_modules|venv'
|
||||
alias vim=nvim
|
||||
alias ls="exa -lhgxUm --git --time-style long-iso --group-directories-first"
|
||||
alias vimini="vim ~/.config/nvim/init.vim"
|
||||
alias wx="curl https://wttr.in/Raleigh"
|
||||
alias vim=nvim
|
||||
|
|
Loading…
Reference in New Issue
Block a user