Skip to content

Commit

Permalink
updates
Browse files Browse the repository at this point in the history
- change up fish theme prompt
- don't use osx keychain for GitHub creds helper
- Shopify: add another kubeconfig file
- Shopify: update how repo's are fetched
  • Loading branch information
Nilay-Shah committed Apr 24, 2021
1 parent 044ac0c commit bc32433
Show file tree
Hide file tree
Showing 3 changed files with 36 additions and 4 deletions.
2 changes: 2 additions & 0 deletions .bash_profile
Original file line number Diff line number Diff line change
Expand Up @@ -49,3 +49,5 @@ PATH=$PATH:~/usr/local/bin
export PATH

if [ -e /Users/nilay/.nix-profile/etc/profile.d/nix.sh ]; then . /Users/nilay/.nix-profile/etc/profile.d/nix.sh; fi # added by Nix installer

complete -C /usr/local/bin/vault vault
28 changes: 26 additions & 2 deletions .config/fish/config.fish
Original file line number Diff line number Diff line change
Expand Up @@ -23,6 +23,30 @@ set SPACEFISH_JOBS_SHOW false
set SPACEFISH_EXIT_CODE_SHOW true


# enable the "Tomorrow Night" color theme
set fish_color_autosuggestion 969896
set fish_color_cwd_root red
set fish_color_host normal
set fish_color_quote b9ca4a
set fish_color_user brgreen
set fish_color_cancel -r
set fish_color_end c397d8
set fish_color_match --background=brblue
set fish_color_redirection 70c0b1
set fish_color_valid_path --underline
set fish_color_command c397d8
set fish_color_error d54e53
set fish_color_normal normal
set fish_color_search_match 'bryellow' '--background=brblack'
set fish_color_comment e7c547
set fish_color_escape 00a6b2
set fish_color_operator 00a6b2
set fish_color_selection 'white' '--bold' '--background=brblack'
set fish_color_cwd green
set fish_color_history_current --bold
set fish_color_param 7aa6da
set fish_color_status red

# install fisher
if not functions -q fisher
set -q XDG_CONFIG_HOME; or set XDG_CONFIG_HOME ~/.config
Expand All @@ -47,9 +71,9 @@ set -x PATH $PATH $GOPATH/bin

# kube
if set -q KUBECONFIG[1]
set -x KUBECONFIG "$KUBECONFIG:/Users/nilay/.kube/config:/Users/nilay/.kube/config.shopify.cloudplatform"
set -x KUBECONFIG "$KUBECONFIG:/Users/nilay/.kube/config:/Users/nilay/.kube/config.shopify.cloudplatform:/Users/nilay/.kube/config.shopify.production-registry"
else
set -x KUBECONFIG "/Users/nilay/.kube/config:/Users/nilay/.kube/config.shopify.cloudplatform"
set -x KUBECONFIG "/Users/nilay/.kube/config:/Users/nilay/.kube/config.shopify.cloudplatform:/Users/nilay/.kube/config.shopify.production-registry"
end
# ---Shopify Specific---

Expand Down
10 changes: 8 additions & 2 deletions .gitconfig
Original file line number Diff line number Diff line change
Expand Up @@ -16,9 +16,15 @@
algorithm = patience
[protocol]
version = 2
[credential]
helper = osxkeychain
[core]
commitGraph = true
[gc]
writeCommitGraph = true
[url "https://github.com/Shopify/"]
insteadOf = [email protected]:Shopify/
insteadOf = [email protected]:shopify/
insteadOf = ssh://[email protected]/Shopify/
insteadOf = ssh://[email protected]/shopify/
[credential]
helper =
helper = store --file /opt/dev/var/private/git_credential_store

0 comments on commit bc32433

Please sign in to comment.