From e300bccd6c305571a80ac374a0577d4bba21ef21 Mon Sep 17 00:00:00 2001 From: Firas Abuzaid Date: Fri, 31 Dec 2021 18:51:31 -0600 Subject: [PATCH] Fig --- .gitconfig | 2 ++ .gitignore | 1 + .tmux.conf | 4 ++++ .zshrc | 29 +++++++++++++++++++++++++++-- fig-settings.json | 8 ++++++++ 5 files changed, 42 insertions(+), 2 deletions(-) create mode 100644 .gitignore create mode 100644 fig-settings.json diff --git a/.gitconfig b/.gitconfig index 30b8648..4929ce7 100644 --- a/.gitconfig +++ b/.gitconfig @@ -25,3 +25,5 @@ enabled = true [push] default = simple +[pull] + ff = only diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..1377554 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +*.swp diff --git a/.tmux.conf b/.tmux.conf index 5765f38..5d587c6 100644 --- a/.tmux.conf +++ b/.tmux.conf @@ -19,3 +19,7 @@ bind r source-file ~/.tmux.conf # if-shell "$is_older" "set -g mode-mouse on; set -g mouse-resize-pane on;\ # set -g mouse-select-pane on; set -g mouse-select-window on" "set -g mouse on" + +# Fig Tmux Integration: Enabled +source-file ~/.fig/tmux +# End of Fig Tmux Integration diff --git a/.zshrc b/.zshrc index b454208..55bb1c7 100644 --- a/.zshrc +++ b/.zshrc @@ -1,5 +1,8 @@ -export PATH="/usr/local/opt/bison/bin:/anaconda3/bin:$PATH" +#### FIG ENV VARIABLES #### +# Please make sure this block is at the start of this file. +[ -s ~/.fig/shell/pre.sh ] && source ~/.fig/shell/pre.sh +#### END FIG ENV VARIABLES #### DEFAULT_USER=`whoami` prompt_context(){} @@ -13,7 +16,7 @@ export ZSH=/Users/fabuzaid/.oh-my-zsh # Set name of the theme to load. Optionally, if you set this to "random" # it'll load a random theme each time that oh-my-zsh is loaded. # See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -ZSH_THEME="agnoster" +ZSH_THEME="powerlevel10k/powerlevel10k" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -91,3 +94,25 @@ source $HOME/google-cloud-sdk/path.zsh.inc # Example aliases # alias zshconfig="mate ~/.zshrc" # alias ohmyzsh="mate ~/.oh-my-zsh" + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/Users/fabuzaid/anaconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/Users/fabuzaid/anaconda3/etc/profile.d/conda.sh" ]; then + . "/Users/fabuzaid/anaconda3/etc/profile.d/conda.sh" + else + export PATH="/Users/fabuzaid/anaconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< + +POWERLEVEL9K_DISABLE_CONFIGURATION_WIZARD=true + +#### FIG ENV VARIABLES #### +# Please make sure this block is at the end of this file. +[ -s ~/.fig/fig.sh ] && source ~/.fig/fig.sh +#### END FIG ENV VARIABLES #### diff --git a/fig-settings.json b/fig-settings.json new file mode 100644 index 0000000..6d0108e --- /dev/null +++ b/fig-settings.json @@ -0,0 +1,8 @@ +{ + "autocomplete.addStatusToTerminalTitle" : false, + "autocomplete.disable" : false, + "autocomplete.immediatelyExecuteAfterSpace" : true, + "autocomplete.theme" : "dark", + "pty.path" : "\/Users\/fabuzaid\/.nvm\/versions\/node\/v14.17.5\/bin:\/Users\/fabuzaid\/anaconda3\/envs\/neo-tax-ml-service\/bin:\/Users\/fabuzaid\/anaconda3\/condabin:\/Users\/fabuzaid\/google-cloud-sdk\/bin:\/usr\/local\/opt\/postgresql@13\/bin:\/Users\/fabuzaid\/packages\/bin:\/usr\/local\/opt\/ruby\/bin:\/usr\/local\/bin:\/usr\/bin:\/bin:\/usr\/sbin:\/sbin:\/Users\/fabuzaid\/.fig\/bin", + "userShell" : "\/bin\/zsh" +} \ No newline at end of file