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