T31M/ubuntu-fish-dotfiles
0
1
Fork 0
Code Pull Requests Releases Activity

Merge pull request 'chore: cleanup + bugfixes' (#1) from feature/updates-1 into master

Browse Source 
Reviewed-on: T31M/dotfiles#1
This commit is contained in:
T31M
2020-11-05 21:10:02 +01:00
parent 06d7d7801d cace53e9ea
commit 6d7d687d67
6 changed files with 10 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
fish/config.fish
View File

@ -1,11 +1,5 @@
# deno config set -Ux PYENV_ROOT $HOME/.pyenv
set -Ux DENO_INSTALL /home/t31m/.deno set -Ux fish_user_paths $PYENV_ROOT/bin $fish_user_paths
set -Ux PATH $DENO_INSTALL/bin $PATH
# pipx
if test (command -v pipx)
register-python-argcomplete --shell fish pipx | .
end
# pyenv init # pyenv init
if command -v pyenv 1>/dev/null 2>&1 if command -v pyenv 1>/dev/null 2>&1

10
fish/theme-t31m/envAWS.fish
View File

@ -1,4 +1,4 @@
# TWAICE AWS Credential Management for FiSH # AWS Credential Management for FiSH
# TODO change your user # TODO change your user
set AWS_IAM_USER "" set AWS_IAM_USER ""
@ -24,19 +24,19 @@ function envAWS --description 'switch to different aws account environments (-)
switch $argv[1] switch $argv[1]
case dev case dev
echo "switching to /refreshing 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 aws-mfa --assume-role arn:aws:iam::$DEV_ACCOUNT_ID:role/Administrator --duration 43200 --role-session-name $AWS_IAM_USER
getAWSenv getAWSenv
case stg case stg
echo "switching to /refreshing staging" 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 aws-mfa --assume-role arn:aws:iam::$STG_ACCOUNT_ID:role/Administrator --duration 43200 --role-session-name $AWS_IAM_USER
getAWSenv getAWSenv
case prod case prod
echo "switching to /refreshing 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 aws-mfa --assume-role arn:aws:iam::$PROD_ACCOUNT_ID:role/Administrator --duration 3600 --role-session-name $AWS_IAM_USER
getAWSenv getAWSenv
case ops case ops
echo "switching to /refreshing 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 aws-mfa --assume-role arn:aws:iam::$OPS_ACCOUNT_ID:role/Administrator --duration 3600 --role-session-name $AWS_IAM_USER
getAWSenv getAWSenv
case '*' case '*'
echo "Wrong / Invalid Environment provided" echo "Wrong / Invalid Environment provided"

5
fish/theme-t31m/ssm_tunnel.fish
View File

@ -5,11 +5,6 @@ function ssm_tunnel --description 'access private AWS ressources via Bastion Hos
return return
end end
#if [ "$AWS_PROFILE" != "twaice-ops"* ]
# echo "Switch to OPS ENV first"
# return
#end
# Get bastion host ID using it's name # Get bastion host ID using it's name
set INSTANCE_ID (aws ec2 describe-instances \ set INSTANCE_ID (aws ec2 describe-instances \
--filter 'Name=tag:Name,Values=ops-infrastructure-bastion'\ --filter 'Name=tag:Name,Values=ops-infrastructure-bastion'\

2
fish_setup.sh
View File

@ -3,7 +3,7 @@
set -x set -x
# install nvm # install nvm
curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.35.2/install.sh | bash curl -o- https://raw.githubusercontent.com/nvm-sh/nvm/v0.36.0/install.sh | bash
# install pyenv # install pyenv
git clone https://github.com/pyenv/pyenv.git ~/.pyenv git clone https://github.com/pyenv/pyenv.git ~/.pyenv

5
main.sh
View File

@ -21,9 +21,4 @@ chmod +x /usr/local/bin/docker-compose
usermod -aG docker t31m usermod -aG docker t31m
curl -sL -o ~/usr/local/bin/conky-x86_64.AppImage \
$(curl -sL https://api.github.com/repos/brndnmtthws/conky/releases/latest | \
jq --raw-output '.assets[0] | .browser_download_url')
chmod +x /usr/local/bin/conky-x86_64.AppImage
echo "Initial Setup Complete. Please run fish_setup.sh for env setup" echo "Initial Setup Complete. Please run fish_setup.sh for env setup"