Compare commits
No commits in common. "781edd5bf27e0b8778ed5e72ea584a3e16655800" and "a1b422e29ecc5f678e256a1b9897ccde7af97f40" have entirely different histories.
781edd5bf2
...
a1b422e29e
|
|
@ -26,7 +26,6 @@ zsh/*
|
|||
!tmux
|
||||
tmux/*
|
||||
!tmux/tmux.conf
|
||||
!tmux/tmux-new-project
|
||||
!tmux/tmux-sessionizer
|
||||
!tmux/tmux-ggclone
|
||||
!tmux/tmux-ssher
|
||||
|
|
|
|||
|
|
@ -5,6 +5,8 @@
|
|||
autocrlf = input
|
||||
excludesfile = ~/.config/git/gitignore
|
||||
editor = nvim
|
||||
[init]
|
||||
defaultBranch = master
|
||||
[include]
|
||||
path = ~/.config/git/alias
|
||||
[include]
|
||||
|
|
@ -12,5 +14,3 @@
|
|||
[includeIf "gitdir:~/Desktop/git/git.aflabs.org/"]
|
||||
path = ~/.config/git/aflabs
|
||||
|
||||
[init]
|
||||
defaultBranch = main
|
||||
|
|
|
|||
2
nvim
2
nvim
|
|
@ -1 +1 @@
|
|||
Subproject commit b2fe47460500090114c967da48d617ce84b8b64a
|
||||
Subproject commit b087eaa1ef08ad47fe3ea639151b3ae21d1e61c0
|
||||
|
|
@ -1,7 +1,5 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
source "$XDG_CONFIG_HOME/zsh/scripts.zsh"
|
||||
|
||||
if [[ $# -eq 1 ]]; then
|
||||
selected=$1
|
||||
else
|
||||
|
|
@ -13,4 +11,5 @@ if [[ -z $selected ]]; then
|
|||
fi
|
||||
|
||||
ggman clone "$selected"
|
||||
ggcompile
|
||||
find -L $GGROOT -mindepth 1 -maxdepth 5 -type d -name .git -prune | xargs -n 1 dirname > "$GGROOT/compiled"
|
||||
|
||||
|
|
|
|||
|
|
@ -1,50 +0,0 @@
|
|||
#!/usr/bin/env bash
|
||||
|
||||
if [[ -z ${NAME:+x} ]]; then
|
||||
echo "missing name"
|
||||
sleep 2
|
||||
exit 1
|
||||
fi
|
||||
|
||||
source "$XDG_CONFIG_HOME/zsh/scripts.zsh"
|
||||
|
||||
read -p "name: " project_name
|
||||
|
||||
if [[ -z $project_name ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
if [[ -d "$GGROOT/no-remote/$project_name" ]]; then
|
||||
exit 0
|
||||
fi
|
||||
|
||||
project="$GGROOT/no-remote/$project_name"
|
||||
git init $project
|
||||
echo "# $project_name" >>"$project/README.md"
|
||||
|
||||
gitignore_template=$(
|
||||
find "$GGROOT"/github.com/github/gitignore/*.gitignore -exec basename {} \; \
|
||||
| sed 's/\(.*\)\.gitignore/\1/' \
|
||||
| fzf --cycle --bind 'tab:toggle-up,btab:toggle-down'
|
||||
)
|
||||
|
||||
if ! [[ -z $gitignore_template ]]; then
|
||||
gitignore="$GGROOT/github.com/github/gitignore/$gitignore_template.gitignore"
|
||||
echo "$gitignore"
|
||||
echo "$project/.gitignore"
|
||||
cat "$gitignore" >>"$project/.gitignore"
|
||||
fi
|
||||
|
||||
license_template=$(
|
||||
find "$GGROOT"/git.janezic.dev/janezicmatej/license/*.license -exec basename {} \; \
|
||||
| sed 's/\(.*\)\.license/\1/' \
|
||||
| fzf --cycle --bind 'tab:toggle-up,btab:toggle-down'
|
||||
)
|
||||
|
||||
if ! [[ -z $license_template ]]; then
|
||||
license="$GGROOT/git.janezic.dev/janezicmatej/license/$license_template.license"
|
||||
export YEAR="$(date '+%Y')"
|
||||
envsubst <"$license" >"$project/LICENSE"
|
||||
fi
|
||||
|
||||
ggcompile
|
||||
|
|
@ -37,4 +37,4 @@ bind-key F run-shell "tmux neww ~/.config/tmux/tmux-ssher"
|
|||
bind-key T run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~/temp"
|
||||
bind-key R run-shell "tmux neww ~/.config/tmux/tmux-sessionizer ~"
|
||||
bind-key G run-shell "tmux neww ~/.config/tmux/tmux-ggclone"
|
||||
bind-key N run-shell "tmux neww ~/.config/tmux/tmux-new-project"
|
||||
|
||||
|
|
|
|||
|
|
@ -45,5 +45,3 @@ export GPG_TTY=$TTY
|
|||
export USER_UID=$(id -u)
|
||||
export USER_GID=$(id -g)
|
||||
|
||||
# name
|
||||
export NAME="Matej Janežič"
|
||||
|
|
|
|||
|
|
@ -1,8 +1,9 @@
|
|||
alias s="ssh"
|
||||
alias z="exec zsh"
|
||||
alias t="tmux a || tmux new-session -s $(whoami) -c ~"
|
||||
alias n=nvim_ve
|
||||
# alias vim=nvim_ve
|
||||
alias s="ssh-menu"
|
||||
alias ssh-hosts="grep -P \"^Host ([^*]+)$\" $HOME/.ssh/config | sed 's/Host //'"
|
||||
|
||||
# navigation
|
||||
alias cdgit="cd $GGROOT"
|
||||
|
|
|
|||
175
zsh/scripts.zsh
175
zsh/scripts.zsh
|
|
@ -1,138 +1,125 @@
|
|||
|
||||
function nvim_ve {
|
||||
if [[ -e $VIRTUAL_ENV && -f "$VIRTUAL_ENV/bin/activate" ]]; then
|
||||
source "$VIRTUAL_ENV/bin/activate"
|
||||
command nvim $@
|
||||
deactivate
|
||||
else
|
||||
command nvim $@
|
||||
fi
|
||||
if [[ -e "$VIRTUAL_ENV" && -f "$VIRTUAL_ENV/bin/activate" ]]; then
|
||||
source "$VIRTUAL_ENV/bin/activate"
|
||||
command nvim $@
|
||||
deactivate
|
||||
else
|
||||
command nvim $@
|
||||
fi
|
||||
}
|
||||
|
||||
alias nvim=nvim_ve
|
||||
|
||||
function ffb {
|
||||
if ! [[ -f package.json ]]; then
|
||||
echo "no package.json"
|
||||
return
|
||||
fi
|
||||
if ! [[ -f package.json ]]; then
|
||||
echo "no package.json"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ -f yarn.lock ]]; then
|
||||
PACKAGE_MANAGER=yarn
|
||||
else
|
||||
PACKAGE_MANAGER=npm
|
||||
fi
|
||||
if [[ -f yarn.lock ]]; then
|
||||
PACKAGE_MANAGER=yarn
|
||||
else
|
||||
PACKAGE_MANAGER=npm
|
||||
fi
|
||||
|
||||
if [[ -n $(grep "react-scripts" package.json) ]]; then
|
||||
BROWSER=none FORCE_COLOR=true "$PACKAGE_MANAGER" start | cat
|
||||
fi
|
||||
if [[ -n $(grep "react-scripts" package.json) ]]; then
|
||||
BROWSER=none FORCE_COLOR=true "$PACKAGE_MANAGER" start | cat
|
||||
fi
|
||||
}
|
||||
|
||||
function afm {
|
||||
RES=$(curl -s "https://$1/api/monitoring/requirements")
|
||||
COUNT=$(echo "$RES" | grep -c $2)
|
||||
if [[ $COUNT -ge 0 ]]; then
|
||||
VER=$(echo "$RES" | jq '.[] | select(.name | contains("'"$2"'")).version')
|
||||
# OP=$(echo "$RES" | jq '.[] | select(.name | contains("'"$2"'")).requirement?[0][0]')
|
||||
# echo "$2""$(echo "$OP" | tr -d '"')""$(echo "$VER" | tr -d '"')"
|
||||
echo "${2}==$(echo "$VER" | tr -d '"')"
|
||||
fi
|
||||
RES=$(curl -s "https://$1/api/monitoring/requirements")
|
||||
COUNT=$(echo "$RES" | grep -c $2)
|
||||
if [[ $COUNT -ge 0 ]]; then
|
||||
VER=$(echo "$RES" | jq '.[] | select(.name | contains("'"$2"'")).version')
|
||||
# OP=$(echo "$RES" | jq '.[] | select(.name | contains("'"$2"'")).requirement?[0][0]')
|
||||
# echo "$2""$(echo "$OP" | tr -d '"')""$(echo "$VER" | tr -d '"')"
|
||||
echo "$2""==""$(echo "$VER" | tr -d '"')"
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
function nukepip {
|
||||
pip uninstall $(pip freeze) -y
|
||||
pip install -r $(pyenv root)/default-packages
|
||||
pip uninstall $(pip freeze) -y
|
||||
pip install -r $(pyenv root)/default-packages
|
||||
}
|
||||
|
||||
function pyinit {
|
||||
if [[ -f .python-version ]]; then
|
||||
echo "found .python-version, stopping"
|
||||
return
|
||||
fi
|
||||
if [[ -f .python-version ]]; then
|
||||
echo "found .python-version, stopping"
|
||||
return
|
||||
fi
|
||||
|
||||
DIRNAME=$(basename "$PWD")
|
||||
DIRNAME=$(basename "$PWD")
|
||||
|
||||
if [[ $(pyenv versions | grep -E "/${DIRNAME}$") ]]; then
|
||||
echo "found existing version with this name, setting..."
|
||||
pyenv local "$DIRNAME"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ -z $1 ]]; then
|
||||
echo "no python version provided, defaulting to $(pyenv version-name)"
|
||||
VERSION=$(pyenv version-name)
|
||||
else
|
||||
VERSION=$1
|
||||
fi
|
||||
|
||||
pyenv virtualenv "$VERSION" "$DIRNAME"
|
||||
if [[ $(pyenv versions | grep -E "/${DIRNAME}$") ]]; then
|
||||
echo "found existing version with this name, setting..."
|
||||
pyenv local "$DIRNAME"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ -z $1 ]]; then
|
||||
echo "no python version provided, defaulting to $(pyenv version-name)"
|
||||
VERSION=$(pyenv version-name)
|
||||
else
|
||||
VERSION=$1
|
||||
fi
|
||||
|
||||
pyenv virtualenv "$VERSION" "$DIRNAME"
|
||||
pyenv local "$DIRNAME"
|
||||
|
||||
}
|
||||
|
||||
function lh {
|
||||
if [[ -z $1 ]]; then
|
||||
PORT=8000
|
||||
else
|
||||
PORT=$1
|
||||
fi
|
||||
if [[ -z $1 ]]; then
|
||||
PORT=8000
|
||||
else
|
||||
PORT=$1
|
||||
fi
|
||||
|
||||
open "http://localhost:$PORT"
|
||||
open "http://localhost:$PORT"
|
||||
}
|
||||
|
||||
function dps {
|
||||
if [[ -z $1 ]]; then
|
||||
docker ps --format table'{{ .ID }}\t{{ .Image }}\t{{ .Ports}}\t{{ .Names }}'
|
||||
else
|
||||
docker ps --format table'{{ .ID }}\t{{ .Image }}\t{{ .Ports}}\t{{ .Names }}' | grep $1
|
||||
fi
|
||||
if [[ -z $1 ]]; then
|
||||
docker ps --format table'{{ .ID }}\t{{ .Image }}\t{{ .Ports}}\t{{ .Names }}'
|
||||
else
|
||||
docker ps --format table'{{ .ID }}\t{{ .Image }}\t{{ .Ports}}\t{{ .Names }}' | grep $1
|
||||
fi
|
||||
}
|
||||
|
||||
|
||||
function get_dump {
|
||||
if [[ -z $1 ]]; then
|
||||
echo "provide ssh host"
|
||||
return
|
||||
fi
|
||||
if [[ -z $1 ]]; then
|
||||
echo "provide ssh host"
|
||||
return
|
||||
fi
|
||||
|
||||
if [[ -z $2 ]]; then
|
||||
echo "provide dump destination"
|
||||
return
|
||||
fi
|
||||
if [[ -z $2 ]]; then
|
||||
echo "provide dump destination"
|
||||
return
|
||||
fi
|
||||
|
||||
selected=$(ssh "$1" docker ps --format "{{.Names}}" | fzf)
|
||||
selected=$(ssh "$1" docker ps --format "{{.Names}}" | fzf)
|
||||
|
||||
if [[ -z $selected ]]; then
|
||||
return
|
||||
fi
|
||||
if [[ -z $selected ]]; then
|
||||
return
|
||||
fi
|
||||
|
||||
ssh "$1" docker exec "$selected" pg_dump -U db --format=c db >"$2$(date +'%Y-%m-%dT%H.%M.%S%z')"
|
||||
ssh "$1" docker exec "$selected" pg_dump -U db --format=c db > "$2$(date +'%Y-%m-%dT%H.%M.%S%z')"
|
||||
|
||||
}
|
||||
|
||||
function ggcompile {
|
||||
find -L "$GGROOT" -mindepth 1 -maxdepth 5 -type d -name .git -prune \
|
||||
-exec dirname {} \; >"$GGROOT/compiled"
|
||||
find -L $GGROOT -mindepth 1 -maxdepth 5 -type d -name .git -prune | xargs -n 1 dirname > "$GGROOT/compiled"
|
||||
}
|
||||
|
||||
function tssh {
|
||||
if [[ -z $1 ]]; then
|
||||
echo "provide ssh host"
|
||||
return
|
||||
fi
|
||||
if [[ -z $1 ]]; then
|
||||
echo "provide ssh host"
|
||||
return
|
||||
fi
|
||||
|
||||
ssh -t "$@" "command -v tmux && (tmux a || tmux new-session -s gorazd -c ~) || bash"
|
||||
}
|
||||
|
||||
function ssh-menu {
|
||||
selected=$(
|
||||
grep 'Host .*' ~/.ssh/config \
|
||||
| grep -v '*' \
|
||||
| sed 's/Host \(.*\)/\1/' \
|
||||
| fzf --cycle --bind 'tab:toggle-up,btab:toggle-down'
|
||||
)
|
||||
|
||||
if [[ -z $selected ]]; then
|
||||
return
|
||||
fi
|
||||
|
||||
ssh "$selected"
|
||||
ssh -t "$@" "command -v tmux && (tmux a || tmux new-session -s gorazd -c ~) || bash"
|
||||
}
|
||||
|
|
|
|||
Loading…
Reference in New Issue