Compare commits

...

4 Commits

View File

@@ -1,4 +1,4 @@
# SPDX-FileCopyrightText: 2019-2022, 2025 Kris Lamoureux <kris@lamoureux.io> # SPDX-FileCopyrightText: 2019-2022, 2025-2026 Kris Lamoureux <kris@lamoureux.io>
# SPDX-License-Identifier: 0BSD # SPDX-License-Identifier: 0BSD
# shellcheck shell=bash # shellcheck shell=bash
@@ -11,8 +11,13 @@ alias 'otheralias'='vim ~/.other_aliases && . ~/.bash_aliases'
alias 'viewalias'='view ~/.bash_aliases' alias 'viewalias'='view ~/.bash_aliases'
alias 'refreshalias'='source ~/.bash_aliases' alias 'refreshalias'='source ~/.bash_aliases'
# File management
alias put='mv --update=none-fail --verbose'
alias copy='cp --update=none-fail --verbose'
alias mv='mv -i'
# SSH management # SSH management
alias 'fssh'='ssh-add && ssh -A' alias 'fssh'='ssh-add && ssh -A -S none'
alias 'editssh'='vim ~/.ssh/config' alias 'editssh'='vim ~/.ssh/config'
# Edit hosts file # Edit hosts file
@@ -77,15 +82,15 @@ alias 'signhist'='git rebase --exec "git commit -S --amend --no-edit -n"'
alias 'signhistnew'='git rebase --exec "git commit -S --amend --date '\''`date -R`'\'' --no-edit -n"' alias 'signhistnew'='git rebase --exec "git commit -S --amend --date '\''`date -R`'\'' --no-edit -n"'
function gd() { function gd() {
git diff HEAD~$1 git diff "HEAD~$1"
} }
function rebase() { function rebase() {
git rebase -i HEAD~$1 git rebase -i "HEAD~$1"
} }
function delcommit() { function delcommit() {
git reset --hard HEAD~$1 git reset --hard "HEAD~$1"
} }
# Docker shortcuts # Docker shortcuts
@@ -103,9 +108,11 @@ alias 'socks'='screen -dm ssh -D 1337 -q -C -N'
# sshuttle proxy # sshuttle proxy
#e.g. alias 'proxyhome'='proxy user hostdomain:22 192.168.1.0/24' #e.g. alias 'proxyhome'='proxy user hostdomain:22 192.168.1.0/24'
function proxy() { function proxy() {
screen -dm sshuttle -v -r $1@$2 -x $2 ${@:2}; screen -r; screen -dm sshuttle -v -r "$1@$2" -x "$2" "${@:2}"
screen -r
} }
if [ -f ~/.other_aliases ]; then if [ -f ~/.other_aliases ]; then
# shellcheck disable=SC1090
source ~/.other_aliases source ~/.other_aliases
fi fi