feat: lots of changes, wrote own fish theme

This commit is contained in:
2020-02-22 21:32:57 +01:00
parent aedaa6ec48
commit a4208ebff2
11 changed files with 383 additions and 2 deletions

6
fish/config.fish Normal file
View File

@ -0,0 +1,6 @@
set -gx PYENV_ROOT $HOME/.pyenv
set -gx PATH ~/bin ~/.local/bin $PYENV_ROOT/bin $PATH
#pyenv config
status --is-interactive; and pyenv init - | source
status --is-interactive; and pyenv virtualenv-init - | source

3
fish/fishfile Normal file
View File

@ -0,0 +1,3 @@
FabioAntunes/fish-nvm
edc/bass
jethrokuan/fzf

3
fish/theme-t31m/cdk.fish Normal file
View File

@ -0,0 +1,3 @@
function cdk -d "execute aws cdk" -w cdk
__nvm_run "cdk" $argv
end

View File

@ -0,0 +1,67 @@
# TWAICE AWS Credential Management for FiSH
# TODO change your user
set AWS_IAM_USER ""
# TODO setup your aws-mfa credential keys in the credentials file
# AWS Account details
set DEV_ACCOUNT_ID ""
set STG_ACCOUNT_ID ""
set PROD_ACCOUNT_ID ""
set OPS_ACCOUNT_ID ""
export AWS_REGION=eu-west-1
export AWS_DEFAULT_REGION=eu-west-1
function envAWS --description 'switch to different aws account environments (-) with MFA'
if test (count $argv) -lt 1
echo "Provide an AWS Environment: dev, staging, prod, ops"
return
end
switch $argv[1]
case dev
echo "switching to /refreshing dev"
aws-mfa --assume-role arn:aws:iam::$DEV_ACCOUNT_ID:role/Administrators --duration 43200 --role-session-name $AWS_IAM_USER
getAWSenv
case stg
echo "switching to /refreshing staging"
aws-mfa --assume-role arn:aws:iam::$STG_ACCOUNT_ID:role/Administrators --duration 43200 --role-session-name $AWS_IAM_USER
getAWSenv
case prod
echo "switching to /refreshing prod"
aws-mfa --assume-role arn:aws:iam::$PROD_ACCOUNT_ID:role/Administrators --duration 3600 --role-session-name $AWS_IAM_USER
getAWSenv
case ops
echo "switching to /refreshing ops"
aws-mfa --assume-role arn:aws:iam::$OPS_ACCOUNT_ID:role/Administrators --duration 3600 --role-session-name $AWS_IAM_USER
getAWSenv
case '*'
echo "Wrong / Invalid Environment provided"
return 1
end
end
function getAWSenv --description 'verify and set environment'
set aws_account_id (aws sts get-caller-identity | jq -r '.Account')
if not test -n "$aws_account_id"
echo "aws sts could not get identify. Are you logged in ?"
set -ge env # clear env
return 1
end
if [ $aws_account_id = $DEV_ACCOUNT_ID ]
set -g env dev
else if [ $aws_account_id = $STG_ACCOUNT_ID]
set -g env stg
else if [ $aws_account_id = $PROD_ACCOUNT_ID]
set -g env prod
else if [ $aws_account_id = $OPS_ACCOUNT_ID]
set -g env ops
else
set -ge env
return 1
end
end

View File

@ -0,0 +1,63 @@
function fish_prompt
set -l symbol "λ "
set -l code $status
if test -n "$ssh_client"
set -l host (hostname -s)
set -l who (whoami)
echo -n -s (red)"("(cyan)"$who"(red)":"(cyan)"$host"(red)") "(off)
end
if git::is_repo
set -l branch (git::branch_name ^/dev/null)
set -l ref (git show-ref --head --abbrev | awk '{print substr($0,0,7)}' | sed -n 1p)
if git::is_stashed
echo -n -s (white)"^"(off)
end
echo -n -s (red)"("(off)
if git::is_dirty
printf (white)"*"(off)
end
if command git symbolic-ref HEAD > /dev/null ^/dev/null
if git::is_staged
printf (cyan)"$branch"(off)
else
printf (yellow)"$branch"(off)
end
else
printf (dim)"$ref"(off)
end
for remote in (git remote)
set -l behind_count (echo (command git rev-list $branch..$remote/$branch ^/dev/null | wc -l | tr -d " "))
set -l ahead_count (echo (command git rev-list $remote/$branch..$branch ^/dev/null | wc -l | tr -d " "))
if test $ahead_count -ne 0; or test $behind_count -ne 0; and test (git remote | wc -l) -gt 1
echo -n -s " "(orange)$remote(off)
end
if test $ahead_count -ne 0
echo -n -s (white)" +"$ahead_count(off)
end
if test $behind_count -ne 0
echo -n -s (white)" -"$behind_count(off)
end
end
echo -n -s (red)")"(off)
end
set t31m_custom (t31m_prompt)
if test "$code" = 0
echo -n -s "$t31m_custom"(red)"$symbol"(off)
else
echo -n -s (dim)"$symbol"(off)
end
end

View File

@ -0,0 +1,143 @@
# Colors
function orange
set_color -o ee5819
end
function yellow
set_color -o b58900
end
function red
set_color -o d30102
end
function cyan
set_color -o 2aa198
end
function white
set_color -o fdf6e3
end
function dim
set_color -o 4f4f4f
end
function off
set_color -o normal
end
# Git
function git::is_repo
test -d .git; or command git rev-parse --git-dir >/dev/null ^/dev/null
end
function git::ahead -a ahead behind diverged none
not git::is_repo; and return
set -l commit_count (command git rev-list --count --left-right "@{upstream}...HEAD" ^/dev/null)
switch "$commit_count"
case ""
# no upstream
case "0"\t"0"
test -n "$none"; and echo "$none"; or echo ""
case "*"\t"0"
test -n "$behind"; and echo "$behind"; or echo "-"
case "0"\t"*"
test -n "$ahead"; and echo "$ahead"; or echo "+"
case "*"
test -n "$diverged"; and echo "$diverged"; or echo "±"
end
end
function git::branch_name
git::is_repo; and begin
command git symbolic-ref --short HEAD ^/dev/null;
or command git show-ref --head -s --abbrev | head -n1 ^/dev/null
end
end
function git::is_dirty
git::is_repo; and not command git diff --no-ext-diff --quiet --exit-code
end
function git::is_staged
git::is_repo; and begin
not command git diff --cached --no-ext-diff --quiet --exit-code
end
end
function git::is_stashed
git::is_repo; and begin
command git rev-parse --verify --quiet refs/stash >/dev/null
end
end
function git::is_touched
git::is_repo; and begin
test -n (echo (command git status --porcelain))
end
end
function git::untracked
git::is_repo; and begin
command git ls-files --other --exclude-standard
end
end
# Kubernetes
function k8s::current_context
command kubectl config current-context
end
function k8s::current_namespace
command kubectl config view --minify -o jsonpath='{.contexts[0].context.namespace}'
end
# Terraform
# Test whether this is a terraform directory by finding .tf files
function terraform::directory
command find . -name '*.tf' >/dev/null ^/dev/null -maxdepth 0
end
function terraform::workspace
terraform::directory; and begin
test -e .terraform/environment
end
end
function fish_right_prompt
if test "$theme_complete_path" = "yes"
set cwd (prompt_pwd)
else
set cwd (basename (prompt_pwd))
if git::is_repo
set root_folder (command git rev-parse --show-toplevel ^/dev/null)
set parent_root_folder (dirname $root_folder)
set cwd (echo $PWD | sed -e "s|$parent_root_folder/||")
end
end
command -sq kubectl; and k8s::current_context >/dev/null 2>/dev/null; and begin
set -l k8s_namespace (k8s::current_namespace)
if test -z "$k8s_namespace"
printf (yellow)"("(dim)(k8s::current_context)(yellow)") "(off)
else
printf (yellow)"("(dim)(k8s::current_context)"/$k8s_namespace"(yellow)") "(off)
end
end
if terraform::workspace
set terraform_workspace_name (command cat .terraform/environment)
printf (yellow)"("(dim)$terraform_workspace_name(yellow)") "(off)
end
printf (yellow)"("(dim)$cwd(yellow)") "(off)
printf (dim)(date +%H(yellow):(dim)%M(yellow):(dim)%S)(off)
end

View File

@ -0,0 +1,3 @@
function fish_title
echo "$PWD | $_" | sed "s|$HOME|~|g"
end

View File

@ -0,0 +1,20 @@
# by T31M
function prompt::awsenv
if test -n "$env"
echo -n -s "[aws=$env]"
end
end
function prompt::pyenv
if test -n "$PYENV_VERSION"
echo -n -s "[$PYENV_VERSION]"
end
end
function t31m_prompt
set awsenv (prompt::awsenv)
set pyenv (prompt::pyenv)
echo -n -s (red)"$awsenv"(cyan)"$pyenv"
end