From 2cd75934ac0ef6602f7ef4a37a9e3045f93b3f53 Mon Sep 17 00:00:00 2001 From: Marcus Noble Date: Sun, 27 Jun 2021 17:27:40 +0100 Subject: [PATCH] Updated installed cli tools and aliases --- .dotfiles/aliases | 30 ++++++++++++++++++++++++++---- .dotfiles/environment | 2 +- .gitconfig | 15 +++++++++++++++ .k9s/config.yml | 26 +++++++++++++------------- Makefile | 26 ++++++++++++++++++++++++-- 5 files changed, 79 insertions(+), 20 deletions(-) diff --git a/.dotfiles/aliases b/.dotfiles/aliases index 26ee17a..c625b19 100644 --- a/.dotfiles/aliases +++ b/.dotfiles/aliases @@ -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 -alias grep='grep --color=auto' -alias watch='watch ' alias cat=' bat ' alias curl='curlie' -alias tmp='cd $(mktemp -d)' 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() { DEPTH=$(echo $1 | grep "^[0-9]*$") if [ "$DEPTH" = "" ]; then @@ -15,7 +38,6 @@ lt() { 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 doggo='docker run --rm -it ghcr.io/mr-karan/doggo:latest' git-clone() { git clone $1 diff --git a/.dotfiles/environment b/.dotfiles/environment index d883fde..9fe7437 100644 --- a/.dotfiles/environment +++ b/.dotfiles/environment @@ -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 VISUAL='code' diff --git a/.gitconfig b/.gitconfig index 3ad20ae..7c48055 100644 --- a/.gitconfig +++ b/.gitconfig @@ -42,6 +42,21 @@ [diff] 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"] insteadOf = https://github.com [url "ssh://git@gitlab.et-scm.com/"] diff --git a/.k9s/config.yml b/.k9s/config.yml index f1d5116..6026aff 100644 --- a/.k9s/config.yml +++ b/.k9s/config.yml @@ -13,24 +13,24 @@ k9s: fullScreenLogs: false textWrap: false showTime: false - currentContext: admin@clusterfun-scaleway - currentCluster: clusterfun-scaleway + currentContext: microk8s + currentCluster: microk8s-cluster clusters: clusterfun-scaleway: namespace: - active: nextcloud + active: git-sync favorites: - - cv - - logging - - node-red - - gitea - all + - git-sync - kube-system - - nextcloud - - chat - - default + - opengraph + - workadventure + - blog + - monitoring + - inlets + - dashboard view: - active: pod + active: po featureGates: nodeShell: false shellPod: @@ -44,14 +44,14 @@ k9s: namespace: active: "" favorites: + - monitoring - ingress - kube-system - argocd - - logging - all - default view: - active: pod + active: po featureGates: nodeShell: false shellPod: diff --git a/Makefile b/Makefile index 00c9c94..a30d051 100644 --- a/Makefile +++ b/Makefile @@ -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)"; \ [ -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 rust > /dev/null || brew install rust; \ which fzf > /dev/null || brew install fzf; \ which bat > /dev/null || brew install bat; \ 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 progress > /dev/null || brew install progress; \ 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 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 rust > /dev/null || brew upgrade rust; \ which fzf > /dev/null && brew upgrade fzf; \ which bat > /dev/null && brew upgrade bat; \ 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 progress > /dev/null && brew upgrade progress; \ 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 dotfiles: ## Installs the dotfiles.