Merge branch 'dev' of ssh://git.lyte.dev:2222/lytedev/dotfiles into dev
This commit is contained in:
commit
c28354db54
|
@ -9,7 +9,6 @@
|
||||||
[ -f "$HOME/.xmodmap" ] && xmodmap "$HOME/.xmodmap"
|
[ -f "$HOME/.xmodmap" ] && xmodmap "$HOME/.xmodmap"
|
||||||
has_command xcape && xcape -e 'Control_L=Escape' &
|
has_command xcape && xcape -e 'Control_L=Escape' &
|
||||||
has_command libinput-gestures-setup && libinput-gestures-setup start
|
has_command libinput-gestures-setup && libinput-gestures-setup start
|
||||||
has_command autocutsel && autocutsel -s PRIMARY &
|
|
||||||
has_command autorandr && autorandr -c
|
has_command autorandr && autorandr -c
|
||||||
has_command redshift && redshift -r -l 39.1:-94.6 -t 6500K:3000K &
|
has_command redshift && redshift -r -l 39.1:-94.6 -t 6500K:3000K &
|
||||||
has_command kdeconnect-indicator && kdeconnect-indicator &
|
has_command kdeconnect-indicator && kdeconnect-indicator &
|
||||||
|
|
|
@ -114,6 +114,9 @@ alias gd "git diff"
|
||||||
alias gds "gd --staged"
|
alias gds "gd --staged"
|
||||||
# alias gdv "git dv" # TODO: what is this?
|
# alias gdv "git dv" # TODO: what is this?
|
||||||
alias gpl "git pull"
|
alias gpl "git pull"
|
||||||
|
alias ga "git add"
|
||||||
|
alias gcm "git commit -m"
|
||||||
|
alias gco "git checkout"
|
||||||
alias gp "git push"
|
alias gp "git push"
|
||||||
alias gpa "git push --all && git push --tags"
|
alias gpa "git push --all && git push --tags"
|
||||||
alias gpt "git push && git push --tags"
|
alias gpt "git push && git push --tags"
|
||||||
|
@ -130,6 +133,11 @@ alias dclf "docker-compose logs --tail=500 -f"
|
||||||
alias ctop "docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock quay.io/vektorlab/ctop:latest"
|
alias ctop "docker run --rm -ti -v /var/run/docker.sock:/var/run/docker.sock quay.io/vektorlab/ctop:latest"
|
||||||
|
|
||||||
# misc aliases
|
# misc aliases
|
||||||
|
function pp
|
||||||
|
while not ping -n 1 -t 5 8.8.8.8
|
||||||
|
sleep 1
|
||||||
|
end
|
||||||
|
end
|
||||||
alias p "ping 8.8.8.8"
|
alias p "ping 8.8.8.8"
|
||||||
alias C "clear && clear"
|
alias C "clear && clear"
|
||||||
alias r "ranger"
|
alias r "ranger"
|
||||||
|
|
|
@ -1,5 +1,7 @@
|
||||||
#!/usr/bin/env bash
|
#!/usr/bin/env bash
|
||||||
|
|
||||||
|
sudo apt install curl gnupg2
|
||||||
|
|
||||||
echo "Setting up yarn source..."
|
echo "Setting up yarn source..."
|
||||||
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
|
curl -sS https://dl.yarnpkg.com/debian/pubkey.gpg | sudo apt-key add -
|
||||||
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
|
echo "deb https://dl.yarnpkg.com/debian/ stable main" | sudo tee /etc/apt/sources.list.d/yarn.list
|
||||||
|
@ -23,7 +25,6 @@ sudo apt install \
|
||||||
neovim vim \
|
neovim vim \
|
||||||
unzip \
|
unzip \
|
||||||
lua5.3 luajit \
|
lua5.3 luajit \
|
||||||
curl \
|
|
||||||
jq \
|
jq \
|
||||||
w3m \
|
w3m \
|
||||||
ranger \
|
ranger \
|
||||||
|
@ -32,5 +33,5 @@ sudo apt install \
|
||||||
fortune \
|
fortune \
|
||||||
nodejs yarn \
|
nodejs yarn \
|
||||||
gawk \
|
gawk \
|
||||||
gnupg2 \
|
netcat \
|
||||||
kitty-terminfo
|
kitty-terminfo
|
||||||
|
|
10
bin/pr-for-commit
Executable file
10
bin/pr-for-commit
Executable file
|
@ -0,0 +1,10 @@
|
||||||
|
#!/usr/bin/env sh
|
||||||
|
|
||||||
|
export GITHUB_UPSTREAM="$(git remote -vv | awk '{$0=$2}')"
|
||||||
|
|
||||||
|
git log --merges --ancestry-path --oneline $1..master \
|
||||||
|
| grep -i 'pull request' \
|
||||||
|
| tail -n1 \
|
||||||
|
| awk '{$0=$5}' \
|
||||||
|
| cut -c2- \
|
||||||
|
| xargs -I % open https://github.com/$GITHUB_UPSTREAM/${PWD##*/}/pull/%
|
|
@ -18,6 +18,7 @@ for f in $files; do
|
||||||
cfn="$rfn"
|
cfn="$rfn"
|
||||||
|
|
||||||
mkdir -p "$d"
|
mkdir -p "$d"
|
||||||
|
# TODO: show at ref if provided
|
||||||
git --no-pager show HEAD:"$f" > "$d/$fn" 2>/dev/null || \
|
git --no-pager show HEAD:"$f" > "$d/$fn" 2>/dev/null || \
|
||||||
echo "<FILE CREATED>" > "$d/$fn"
|
echo "<FILE CREATED>" > "$d/$fn"
|
||||||
cp "$f" "$d/$cfn" 2>/dev/null || echo "<FILE DELETED>" > "$d/$cfn"
|
cp "$f" "$d/$cfn" 2>/dev/null || echo "<FILE DELETED>" > "$d/$cfn"
|
||||||
|
|
Reference in a new issue