Updated installed cli tools and aliases

This commit is contained in:
Marcus Noble 2021-06-27 17:27:40 +01:00
parent a6b8d2b29e
commit 2cd75934ac
5 changed files with 79 additions and 20 deletions

View File

@ -1,10 +1,33 @@
# Rename existing tools
alias _cat=`which cat`
alias _curl=`which curl`
alias _ls="/bin/ls"
alias _grep="/bin/grep"
alias _diff=`which diff`
alias _du=`which du`
alias _df=`which df`
alias _find=`which find`
alias _top=`which top`
alias _ps="/bin/ps"
alias _dig=`which dig`
# Aliases # Aliases
alias grep='grep --color=auto'
alias watch='watch '
alias cat=' bat ' alias cat=' bat '
alias curl='curlie' alias curl='curlie'
alias tmp='cd $(mktemp -d)'
alias ls=' exa --group-directories-first --icons --header --git --ignore-glob=.git' alias ls=' exa --group-directories-first --icons --header --git --ignore-glob=.git'
alias grep='rg'
alias diff='delta'
alias du='dust'
alias df='duf -hide special'
alias find='fd'
alias bandwhich='sudo bandwhich'
alias top='btm'
alias ps='procs'
alias dig='dog'
alias machine-info='macchina -t Boron --bar'
alias watch='watch '
alias tmp='cd $(mktemp -d)'
lt() { lt() {
DEPTH=$(echo $1 | grep "^[0-9]*$") DEPTH=$(echo $1 | grep "^[0-9]*$")
if [ "$DEPTH" = "" ]; then if [ "$DEPTH" = "" ]; then
@ -15,7 +38,6 @@ lt() {
ls -l --tree -L $DEPTH -I ".git|cache|log|logs|node_modules|vendor" $@ ls -l --tree -L $DEPTH -I ".git|cache|log|logs|node_modules|vendor" $@
} }
alias aws='docker run --rm -ti -v ~/.aws:/root/.aws -v $(pwd):/aws -e AWS_PROFILE -e AWS_DEFAULT_REGION -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY amazon/aws-cli' alias aws='docker run --rm -ti -v ~/.aws:/root/.aws -v $(pwd):/aws -e AWS_PROFILE -e AWS_DEFAULT_REGION -e AWS_REGION -e AWS_ACCESS_KEY_ID -e AWS_SECRET_ACCESS_KEY amazon/aws-cli'
alias doggo='docker run --rm -it ghcr.io/mr-karan/doggo:latest'
git-clone() { git-clone() {
git clone $1 git clone $1

View File

@ -1,4 +1,4 @@
export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$HOME/goworkspace/bin" export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin:$HOME/goworkspace/bin:$HOME/.cargo/bin"
export EDITOR='vim' export EDITOR='vim'
export VISUAL='code' export VISUAL='code'

View File

@ -42,6 +42,21 @@
[diff] [diff]
compactionHeuristic = true compactionHeuristic = true
[pager]
diff = delta
log = delta
reflog = delta
show = delta
[delta]
plus-style = "syntax #012800"
minus-style = "syntax #340001"
syntax-theme = Monokai Extended
navigate = true
[interactive]
diffFilter = delta --color-only
[url "ssh://git@github.com"] [url "ssh://git@github.com"]
insteadOf = https://github.com insteadOf = https://github.com
[url "ssh://git@gitlab.et-scm.com/"] [url "ssh://git@gitlab.et-scm.com/"]

View File

@ -13,24 +13,24 @@ k9s:
fullScreenLogs: false fullScreenLogs: false
textWrap: false textWrap: false
showTime: false showTime: false
currentContext: admin@clusterfun-scaleway currentContext: microk8s
currentCluster: clusterfun-scaleway currentCluster: microk8s-cluster
clusters: clusters:
clusterfun-scaleway: clusterfun-scaleway:
namespace: namespace:
active: nextcloud active: git-sync
favorites: favorites:
- cv
- logging
- node-red
- gitea
- all - all
- git-sync
- kube-system - kube-system
- nextcloud - opengraph
- chat - workadventure
- default - blog
- monitoring
- inlets
- dashboard
view: view:
active: pod active: po
featureGates: featureGates:
nodeShell: false nodeShell: false
shellPod: shellPod:
@ -44,14 +44,14 @@ k9s:
namespace: namespace:
active: "" active: ""
favorites: favorites:
- monitoring
- ingress - ingress
- kube-system - kube-system
- argocd - argocd
- logging
- all - all
- default - default
view: view:
active: pod active: po
featureGates: featureGates:
nodeShell: false nodeShell: false
shellPod: shellPod:

View File

@ -8,6 +8,7 @@ pre-reqs: ## Install all required binaries.
which brew > /dev/null || bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"; \ which brew > /dev/null || bash -c "$(curl -fsSL https://raw.githubusercontent.com/Homebrew/install/master/install.sh)"; \
[ -d ~/.oh-my-zsh ] || sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"; \ [ -d ~/.oh-my-zsh ] || sh -c "$(curl -fsSL https://raw.github.com/ohmyzsh/ohmyzsh/master/tools/install.sh)"; \
brew list --cask homebrew/cask-fonts/font-open-dyslexic-nerd-font > /dev/null || brew install homebrew/cask-fonts/font-open-dyslexic-nerd-font; \ brew list --cask homebrew/cask-fonts/font-open-dyslexic-nerd-font > /dev/null || brew install homebrew/cask-fonts/font-open-dyslexic-nerd-font; \
brew list rust > /dev/null || brew install rust; \
which fzf > /dev/null || brew install fzf; \ which fzf > /dev/null || brew install fzf; \
which bat > /dev/null || brew install bat; \ which bat > /dev/null || brew install bat; \
which curlie > /dev/null || brew install rs/tap/curlie; \ which curlie > /dev/null || brew install rs/tap/curlie; \
@ -23,11 +24,22 @@ pre-reqs: ## Install all required binaries.
which tldr > /dev/null || brew install tldr; \ which tldr > /dev/null || brew install tldr; \
which progress > /dev/null || brew install progress; \ which progress > /dev/null || brew install progress; \
which htop > /dev/null || brew install htop; \ which htop > /dev/null || brew install htop; \
which starship > /dev/null || brew install starship which starship > /dev/null || brew install starship; \
which macchina > /dev/null || cargo install macchina; \
which rg > /dev/null || brew install ripgrep; \
which delta > /dev/null || brew install git-delta; \
which dust > /dev/null || brew install dust; \
which duf > /dev/null || brew install duf; \
which fd > /dev/null || brew install fd; \
which bandwhich > /dev/null || brew install bandwhich; \
which btm > /dev/null || cargo install bottom; \
which procs > /dev/null || brew install procs; \
which dog > /dev/null || brew install dog
.PHONY: upgrade .PHONY: upgrade
upgrade: ## Upgrade all required binaries. upgrade: ## Upgrade all required binaries.
brew list --cask homebrew/cask-fonts/font-open-dyslexic-nerd-font > /dev/null && brew upgrade homebrew/cask-fonts/font-open-dyslexic-nerd-font; \ brew list --cask homebrew/cask-fonts/font-open-dyslexic-nerd-font > /dev/null && brew upgrade homebrew/cask-fonts/font-open-dyslexic-nerd-font; \
brew list rust > /dev/null || brew upgrade rust; \
which fzf > /dev/null && brew upgrade fzf; \ which fzf > /dev/null && brew upgrade fzf; \
which bat > /dev/null && brew upgrade bat; \ which bat > /dev/null && brew upgrade bat; \
which curlie > /dev/null && brew upgrade rs/tap/curlie; \ which curlie > /dev/null && brew upgrade rs/tap/curlie; \
@ -43,7 +55,17 @@ upgrade: ## Upgrade all required binaries.
which tldr > /dev/null && brew upgrade tldr; \ which tldr > /dev/null && brew upgrade tldr; \
which progress > /dev/null && brew upgrade progress; \ which progress > /dev/null && brew upgrade progress; \
which htop > /dev/null && brew upgrade htop; \ which htop > /dev/null && brew upgrade htop; \
which starship > /dev/null && brew upgrade starship which starship > /dev/null && brew upgrade starship; \
which macchina > /dev/null && cargo install macchina; \
which rg > /dev/null && brew upgrade ripgrep; \
which delta > /dev/null && brew upgrade git-delta; \
which dust > /dev/null && brew upgrade dust; \
which duf > /dev/null && brew upgrade duf; \
which fd > /dev/null && brew upgrade fd; \
which bandwhich > /dev/null && brew upgrade bandwhich; \
which btm > /dev/null && cargo install bottom; \
which procs > /dev/null && brew upgrade procs; \
which dog > /dev/null && brew upgrade dog
.PHONY: dotfiles .PHONY: dotfiles
dotfiles: ## Installs the dotfiles. dotfiles: ## Installs the dotfiles.