Update dotfiles

This commit is contained in:
Marcus Noble 2020-09-27 19:58:44 +01:00
parent 93f499d34b
commit 567910bdb6
5 changed files with 51 additions and 34 deletions

View File

@ -1,7 +1,7 @@
prompt_order=["directory","git_branch","git_commit","git_state","git_status","package","golang","nodejs","terraform","memory_usage","aws","kubernetes","cmd_duration","custom","line_break","jobs","battery","time","character"] prompt_order=["directory","git_branch","git_commit","git_state","git_status","package","golang","nodejs","terraform","memory_usage","aws","kubernetes","cmd_duration","custom","line_break","jobs","battery","time","character"]
[character] [character]
symbol = "⚡️ " symbol = " "
error_symbol = "✗ " error_symbol = "✗ "
use_symbol_for_status = true use_symbol_for_status = true
style_success = "yellow" style_success = "yellow"

View File

@ -4,18 +4,15 @@ alias watch='watch '
alias cat=' bat ' alias cat=' bat '
alias curl='curlie' alias curl='curlie'
alias tmp='cd $(mktemp -d)' alias tmp='cd $(mktemp -d)'
alias ls=' exa --group-directories-first --header --git' alias ls=' exa --group-directories-first --icons --header --git --ignore-glob=.git'
lt() { lt() {
DEPTH=$(echo $1 | grep "^[0-9]*$") DEPTH=$(echo $1 | grep "^[0-9]*$")
if [ "$DEPTH" = "" ]; then
if [ "$DEPTH" = "" ]
then
DEPTH=2 DEPTH=2
else else
shift shift
fi fi
ls -l --tree -L $DEPTH -I ".git|cache|log|logs|node_modules|vendor" $@
ls --tree -L $DEPTH -I "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 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 amazon/aws-cli'

View File

@ -3,9 +3,11 @@ export EDITOR='vim'
export VISUAL='code' export VISUAL='code'
# AWS # AWS
export AWS_PROFILE=$(cat ~/.aws/profile) if [ -f ~/.aws/profile ]; then
export AWS_DEFAULT_REGION=eu-west-1 export AWS_PROFILE=$(cat ~/.aws/profile)
export AWS_REGION=eu-west-1 export AWS_DEFAULT_REGION=eu-west-1
export AWS_REGION=eu-west-1
fi
# Node # Node
export NODE_ENV=localhost export NODE_ENV=localhost

24
.zshrc
View File

@ -1,27 +1,3 @@
# pre-reqs
if [ ! -f ~/.shell-prereqs-installed ];
then
echo "Installing prereqs"
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)"
which fzf > /dev/null || brew install fzf
which bat > /dev/null || brew install bat
which curlie > /dev/null | brew install rs/tap/curlie
which exa > /dev/null || brew install exa
which kubectl > /dev/null || brew install kubectl
which tkn > /dev/null || brew install tektoncd/tools/tektoncd-cli
which k9s > /dev/null || brew install k9s
which helm > /dev/null || brew install helm
which go > /dev/null || brew install go
which jq > /dev/null || brew install jq
which kind > /dev/null || brew install kind
which kubectx > /dev/null || brew install kubectx
brew list --cask homebrew/cask-fonts/font-open-dyslexic-nerd-font > /dev/null || brew install homebrew/cask-fonts/font-open-dyslexic-nerd-font
which starship > /dev/null || brew install starship
touch ~/.shell-prereqs-installed
fi
for filename in ~/.dotfiles/*; do for filename in ~/.dotfiles/*; do
source $filename source $filename
done done

42
Makefile Normal file
View File

@ -0,0 +1,42 @@
SHELL := bash
.PHONY: Install
install: pre-reqs dotfiles ## Installs all dotfiles and associated.
.PHONY: pre-reqs
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; \
which fzf > /dev/null || brew install fzf; \
which bat > /dev/null || brew install bat; \
which curlie > /dev/null | brew install rs/tap/curlie; \
which exa > /dev/null || brew install exa; \
which kubectl > /dev/null || brew install kubectl; \
which tkn > /dev/null || brew install tektoncd/tools/tektoncd-cli; \
which k9s > /dev/null || brew install k9s; \
which helm > /dev/null || brew install helm; \
which go > /dev/null || brew install go; \
which jq > /dev/null || brew install jq; \
which kind > /dev/null || brew install kind; \
which kubectx > /dev/null || brew install kubectx; \
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
.PHONY: dotfiles
dotfiles: ## Installs the dotfiles.
for file in $(shell find $(CURDIR) -name ".*" -not -name ".gitignore" -not -name ".git" -not -name ".config" -not -name ".github" -not -name ".*.swp" -not -name ".gnupg"); do \
f=$$(basename $$file); \
ln -sfn $$file $(HOME)/$$f; \
done; \
mkdir -p $(HOME)/.config
for file in $(shell find $(CURDIR)/.config -type f); do \
f=$$(basename $$file); \
ln -sfn $$file $(HOME)/.config/$$f; \
done;
.PHONY: help
help:
@grep -E '^[a-zA-Z_-]+:.*?## .*$$' $(MAKEFILE_LIST) | sort | awk 'BEGIN {FS = ":.*?## "}; {printf "\033[36m%-30s\033[0m %s\n", $$1, $$2}'