some more cleanup/tweaking

This commit is contained in:
2024-11-07 05:52:14 -05:00
parent 4f70fbce69
commit 5e0d5b1e27
7 changed files with 37 additions and 55 deletions

24
bashrc
View File

@@ -18,7 +18,7 @@
#
export EDITOR='vim'
export LANG=en_US.utf8
export HISTIGNORE="&:[ ]*:ls:ls -a:cd:cd .." # leave commands out of history log
export HISTIGNORE="&:[ ]*:ls:ls -a:cd:cd ..:ll" # leave commands out of history log
export HISTCONTROL='ignoredups'
export HISTSIZE=5000
export HISTFILESIZE=5000
@@ -36,7 +36,7 @@ SSH_ENV="$HOME/.ssh/agent-environment"
start_agent() {
/usr/bin/ssh-agent | sed 's/^echo/#echo/' >"$SSH_ENV"
chmod 600 "$SSH_ENV"
. {$SSH_ENV} >/dev/null
. $SSH_ENV >/dev/null
/usr/bin/ssh-add;
}
@@ -99,19 +99,18 @@ alias ..='echo "cd .."; cd ..'
alias ag='rg' # sorry silver searcher
alias chomd='chmod'
alias curl='curl -A "Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"'
alias externalip='curl -sS https://www.daveeddy.com/ip'
alias externalip='curl -sS https://api.ipify.org'
alias gerp='grep'
alias hl='rg --passthru'
alias ls='ls --color=auto' # ls colored output
alias grep='grep --color=auto' # grep colored output
alias l='ls'
alias ll='ls -lrtha'
alias suod='sudo'
alias gl='git log -p'
alias wget='wget --user-agent="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"'
alias grep='grep --color=auto' # grep colored output
alias hl='rg --passthru'
alias l='ls'
alias ll='ls -lrth'
alias ls='ls --color=auto' # ls colored output
alias suod='sudo'
alias vrd='VAULT_UI=true VAULT_REDIRECT_ADDR=http://127.0.0.1:8200 vault server -log-level=trace -dev -dev-root-token-id=root'
alias wget='wget --user-agent="Mozilla/5.0 (X11; Linux x86_64; rv:60.0) Gecko/20100101 Firefox/81.0"'
# Git Aliases
alias nb='git checkout -b "$USER-$(date +%s)"' # new branch
alias ga='git add . --all'
alias gb='git branch'
alias gc='git clone'
@@ -126,6 +125,7 @@ alias gr='git rev-parse --show-toplevel' # git root
alias gs='git status'
alias gt='git tag'
alias gu='git pull' # gu = git update
alias nb='git checkout -b "$USER-$(date +%s)"' # new branch
# Prompt
# Store `tput` colors for future use to reduce fork+exec
@@ -265,7 +265,7 @@ mkiso() {
mkisofs -V $2 -J -r $1 -o isoimage.iso
}
# Functions below this line come from github.com/bahamas10/dotfiles
# because `master` is sometimes `main` (or others), these must be functions.
gmb() { # git main branch
local main