Merge branch 'master' of https://git.capella.pro/capella/dotfiles

dots/.config/fish/fish/config.fish

@@ -1,60 +0,0 @@
-set fish_greeting "Capella"
-
-export PATH="/usr/local/bin:/bin:/usr/sbin:/sbin"
-export PATH="$PATH:$HOME/.node/bin"
-export PATH="$PATH:$HOME/go/bin"
-
-# test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
-# set -g fish_user_paths "/usr/local/sbin" $fish_user_paths
-# set -g fish_user_paths "/usr/local/opt/gnu-getopt/bin" $fish_user_paths
-
-# #if status is-interactive
-# #and not set -q TMUX
-# #    exec tmux
-# #end
-
-
-# # The next line updates PATH for the Google Cloud SDK.
-# if [ -f '/Users/gabrielcapella/.g/google-cloud-sdk/path.fish.inc' ]; . '/Users/gabrielcapella/.g/google-cloud-sdk/path.fish.inc'; end
-# set -g fish_user_paths "/usr/local/opt/openssl@1.1/bin" $fish_user_paths
-
-
-# status --is-interactive; and source (rbenv init -|psub)
-
-
-# # Add environment variable COCOS_CONSOLE_ROOT for cocos2d-x
-# export COCOS_CONSOLE_ROOT="/Users/gabrielcapella/cocos2d-x/tools/cocos2d-console/bin"
-# export PATH="$COCOS_CONSOLE_ROOT:$PATH"
-
-# # Add environment variable COCOS_X_ROOT for cocos2d-x
-# export COCOS_X_ROOT="/Users/gabrielcapella"
-# export PATH="$COCOS_X_ROOT:$PATH"
-
-# # Add environment variable COCOS_TEMPLATES_ROOT for cocos2d-x
-# export COCOS_TEMPLATES_ROOT="/Users/gabrielcapella/cocos2d-x/templates"
-# export PATH="$COCOS_TEMPLATES_ROOT:$PATH"
-
-# # Add environment variable ANDROID_SDK_ROOT for cocos2d-x
-export ANDROID_SDK_ROOT="/Users/gabrielcapella/Library/Android/sdk"
-export PATH="$ANDROID_SDK_ROOT:$PATH"
-export PATH="$ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:$PATH"
-export ANDROID_AVD_HOME="$HOME/.android/"
-
-export PATH="/usr/bin/:$PATH" &
-
-# # Add environment variable NDK_ROOT for cocos2d-x
-# export NDK_ROOT="/Users/gabrielcapella/Library/Android/sdk/ndk-bundle/"
-# export PATH="$NDK_ROOT:$PATH"
-
-# # Add environment variable SDKBOX_HOME for sdkbox installer
-# export SDKBOX_HOME="/Users/gabrielcapella/.sdkbox"
-
-# export PATH="/usr/bin/:$PATH"
-# The next line updates PATH for the Google Cloud SDK.
-if [ -f '/Users/gabrielcapella/.google-cloud-sdk/path.fish.inc' ]; . '/Users/gabrielcapella/.google-cloud-sdk/path.fish.inc'; end
-
-function subl;
-	"/Applications/Sublime Text.app/Contents/SharedSupport/bin/subl" $argv;
-end
-
-alias pb='curl -s --data-binary @- https://p.capella.pro/ | awk \'{ print "https://p.capella.pro/"$0; }\' | tee /tmp/pb | pbcopy && cat /tmp/pb'

dots/.config/fish/fish/config.fish.backup

@@ -1,51 +0,0 @@
-set fish_greeting "Capella"
-alias subl="/Applications/Sublime\ Text.app/Contents/SharedSupport/bin/subl"
-
-export PATH="/usr/local/bin:/usr/bin:/bin:/usr/sbin:/sbin"
-export PATH="$PATH:$HOME/.node/bin"
-export PATH="$PATH:$HOME/go/bin"
-
-test -e {$HOME}/.iterm2_shell_integration.fish ; and source {$HOME}/.iterm2_shell_integration.fish
-# set -g fish_user_paths "/usr/local/sbin" $fish_user_paths
-# set -g fish_user_paths "/usr/local/opt/gnu-getopt/bin" $fish_user_paths
-
-# #if status is-interactive
-# #and not set -q TMUX
-# #    exec tmux
-# #end
-
-
-# # The next line updates PATH for the Google Cloud SDK.
-# if [ -f '/Users/gabrielcapella/.g/google-cloud-sdk/path.fish.inc' ]; . '/Users/gabrielcapella/.g/google-cloud-sdk/path.fish.inc'; end
-# set -g fish_user_paths "/usr/local/opt/openssl@1.1/bin" $fish_user_paths
-
-
-# status --is-interactive; and source (rbenv init -|psub)
-
-
-# # Add environment variable COCOS_CONSOLE_ROOT for cocos2d-x
-# export COCOS_CONSOLE_ROOT="/Users/gabrielcapella/cocos2d-x/tools/cocos2d-console/bin"
-# export PATH="$COCOS_CONSOLE_ROOT:$PATH"
-
-# # Add environment variable COCOS_X_ROOT for cocos2d-x
-# export COCOS_X_ROOT="/Users/gabrielcapella"
-# export PATH="$COCOS_X_ROOT:$PATH"
-
-# # Add environment variable COCOS_TEMPLATES_ROOT for cocos2d-x
-# export COCOS_TEMPLATES_ROOT="/Users/gabrielcapella/cocos2d-x/templates"
-# export PATH="$COCOS_TEMPLATES_ROOT:$PATH"
-
-# # Add environment variable ANDROID_SDK_ROOT for cocos2d-x
-export ANDROID_SDK_ROOT="/Users/gabrielcapella/Library/Android/sdk"
-export PATH="$ANDROID_SDK_ROOT:$PATH"
-export PATH="$ANDROID_SDK_ROOT/tools:$ANDROID_SDK_ROOT/platform-tools:$PATH"
-
-
-# # Add environment variable NDK_ROOT for cocos2d-x
-# export NDK_ROOT="/Users/gabrielcapella/Library/Android/sdk/ndk-bundle/"
-# export PATH="$NDK_ROOT:$PATH"
-
-# # Add environment variable SDKBOX_HOME for sdkbox installer
-# export SDKBOX_HOME="/Users/gabrielcapella/.sdkbox"
-
-# export PATH="/usr/bin/:$PATH"

dots/.config/fish/fish/fish_variables

@@ -1,37 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_classic_git_prompt_initialized:\x1d
-SETUVAR __fish_init_2_39_8:\x1d
-SETUVAR __fish_init_2_3_0:\x1d
-SETUVAR __fish_initialized:3100
-SETUVAR _fish_abbr_l:ls
-SETUVAR fish_color_autosuggestion:555
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:005fd7
-SETUVAR fish_color_comment:990000
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:009900
-SETUVAR fish_color_error:ff0000
-SETUVAR fish_color_escape:bryellow\x1e\x2d\x2dbold
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:bryellow
-SETUVAR fish_color_param:00afff
-SETUVAR fish_color_quote:999900
-SETUVAR fish_color_redirection:00afff
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:Capella
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:\x1d
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SETUVAR fish_user_abbreviations:l\x20ls

dots/.config/fish/fish/fishd.80e650246adb

@@ -1,30 +0,0 @@
-# This file is automatically generated by the fish.
-# Do NOT edit it directly, your changes will be overwritten.
-SET __fish_init_2_39_8:\x1d
-SET __fish_init_2_3_0:\x1d
-SET fish_color_autosuggestion:555\x1ebrblack
-SET fish_color_cancel:\x2dr
-SET fish_color_command:\x2d\x2dbold
-SET fish_color_comment:red
-SET fish_color_cwd:green
-SET fish_color_cwd_root:red
-SET fish_color_end:brmagenta
-SET fish_color_error:brred
-SET fish_color_escape:bryellow\x1e\x2d\x2dbold
-SET fish_color_history_current:\x2d\x2dbold
-SET fish_color_host:normal
-SET fish_color_match:\x2d\x2dbackground\x3dbrblue
-SET fish_color_normal:normal
-SET fish_color_operator:bryellow
-SET fish_color_param:cyan
-SET fish_color_quote:yellow
-SET fish_color_redirection:brblue
-SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SET fish_color_user:brgreen
-SET fish_color_valid_path:\x2d\x2dunderline
-SET fish_key_bindings:fish_default_key_bindings
-SET fish_pager_color_completion:\x1d
-SET fish_pager_color_description:B3A06D\x1eyellow
-SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan

dots/.config/fish/fish/fishd.80e65024db6a

@@ -1,34 +0,0 @@
-# This file is automatically generated by the fish.
-# Do NOT edit it directly, your changes will be overwritten.
-SET __fish_classic_git_prompt_initialized:\x1d
-SET __fish_init_2_39_8:\x1d
-SET __fish_init_2_3_0:\x1d
-SET fish_color_autosuggestion:555
-SET fish_color_cancel:\x2dr
-SET fish_color_command:005fd7
-SET fish_color_comment:990000
-SET fish_color_cwd:green
-SET fish_color_cwd_root:red
-SET fish_color_end:009900
-SET fish_color_error:ff0000
-SET fish_color_escape:bryellow\x1e\x2d\x2dbold
-SET fish_color_history_current:\x2d\x2dbold
-SET fish_color_host:normal
-SET fish_color_match:\x2d\x2dbackground\x3dbrblue
-SET fish_color_normal:normal
-SET fish_color_operator:bryellow
-SET fish_color_param:00afff
-SET fish_color_quote:999900
-SET fish_color_redirection:00afff
-SET fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SET fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SET fish_color_status:red
-SET fish_color_user:brgreen
-SET fish_color_valid_path:\x2d\x2dunderline
-SET fish_greeting:Capella
-SET fish_key_bindings:fish_default_key_bindings
-SET fish_pager_color_completion:\x1d
-SET fish_pager_color_description:B3A06D\x1eyellow
-SET fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SET fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan
-SET fish_user_abbreviations:l\x20ls

dots/.config/fish/fish_variables

@@ -1,32 +0,0 @@
-# This file contains fish universal variable definitions.
-# VERSION: 3.0
-SETUVAR __fish_initialized:3100
-SETUVAR fish_color_autosuggestion:555\x1ebrblack
-SETUVAR fish_color_cancel:\x2dr
-SETUVAR fish_color_command:005fd7
-SETUVAR fish_color_comment:990000
-SETUVAR fish_color_cwd:green
-SETUVAR fish_color_cwd_root:red
-SETUVAR fish_color_end:009900
-SETUVAR fish_color_error:ff0000
-SETUVAR fish_color_escape:00a6b2
-SETUVAR fish_color_history_current:\x2d\x2dbold
-SETUVAR fish_color_host:normal
-SETUVAR fish_color_host_remote:yellow
-SETUVAR fish_color_match:\x2d\x2dbackground\x3dbrblue
-SETUVAR fish_color_normal:normal
-SETUVAR fish_color_operator:00a6b2
-SETUVAR fish_color_param:00afff
-SETUVAR fish_color_quote:999900
-SETUVAR fish_color_redirection:00afff
-SETUVAR fish_color_search_match:bryellow\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_selection:white\x1e\x2d\x2dbold\x1e\x2d\x2dbackground\x3dbrblack
-SETUVAR fish_color_status:red
-SETUVAR fish_color_user:brgreen
-SETUVAR fish_color_valid_path:\x2d\x2dunderline
-SETUVAR fish_greeting:Welcome\x20to\x20fish\x2c\x20the\x20friendly\x20interactive\x20shell\x0aType\x20\x60help\x60\x20for\x20instructions\x20on\x20how\x20to\x20use\x20fish
-SETUVAR fish_key_bindings:fish_default_key_bindings
-SETUVAR fish_pager_color_completion:\x1d
-SETUVAR fish_pager_color_description:B3A06D\x1eyellow
-SETUVAR fish_pager_color_prefix:white\x1e\x2d\x2dbold\x1e\x2d\x2dunderline
-SETUVAR fish_pager_color_progress:brwhite\x1e\x2d\x2dbackground\x3dcyan