diff --git a/shell/material-design-colors.itermcolors b/shell/material-design-colors.itermcolors deleted file mode 100644 index a1e5cf9..0000000 --- a/shell/material-design-colors.itermcolors +++ /dev/null @@ -1,213 +0,0 @@ - - - - - Ansi 0 Color - - Blue Component - 0.40253299474716187 - Green Component - 0.35616019368171692 - Red Component - 0.26286587119102478 - - Ansi 1 Color - - Blue Component - 0.25575384497642517 - Green Component - 0.22098405659198761 - Red Component - 0.9871404767036438 - - Ansi 10 Color - - Blue Component - 0.74659085273742676 - Green Component - 0.96712285280227661 - Red Component - 0.67800694704055786 - - Ansi 11 Color - - Blue Component - 0.42511638998985291 - Green Component - 0.88262283802032471 - Red Component - 0.99765938520431519 - - Ansi 12 Color - - Blue Component - 0.99898606538772583 - Green Component - 0.81066548824310303 - Red Component - 0.43880558013916016 - - Ansi 13 Color - - Blue Component - 0.60766077041625977 - Green Component - 0.40164706110954285 - Red Component - 0.9887651801109314 - - Ansi 14 Color - - Blue Component - 0.90182536840438843 - Green Component - 1 - Red Component - 0.60292786359786987 - - Ansi 15 Color - - Blue Component - 0.99999129772186279 - Green Component - 0.99997437000274658 - Red Component - 1 - - Ansi 2 Color - - Blue Component - 0.62042194604873657 - Green Component - 0.94388872385025024 - Red Component - 0.36202818155288696 - - Ansi 3 Color - - Blue Component - 0.19727933406829834 - Green Component - 0.81672251224517822 - Red Component - 0.99627053737640381 - - Ansi 4 Color - - Blue Component - 0.99871528148651123 - Green Component - 0.7149810791015625 - Red Component - 0.215079665184021 - - Ansi 5 Color - - Blue Component - 0.43182668089866638 - Green Component - 0.13310989737510681 - Red Component - 0.986469566822052 - - Ansi 6 Color - - Blue Component - 0.82062870264053345 - Green Component - 1 - Red Component - 0.34860008955001831 - - Ansi 7 Color - - Blue Component - 0.99999129772186279 - Green Component - 0.99997437000274658 - Red Component - 1 - - Ansi 8 Color - - Blue Component - 0.72321081161499023 - Green Component - 0.69167852401733398 - Red Component - 0.63061976432800293 - - Ansi 9 Color - - Blue Component - 0.42818409204483032 - Green Component - 0.45310419797897339 - Red Component - 0.98958194255828857 - - Background Color - - Blue Component - 0.16608485579490662 - Green Component - 0.14745020866394043 - Red Component - 0.11278382688760757 - - Bold Color - - Blue Component - 0.91648769378662109 - Green Component - 0.91671288013458252 - Red Component - 0.91654461622238159 - - Cursor Color - - Blue Component - 0.91648769378662109 - Green Component - 0.91671288013458252 - Red Component - 0.91654461622238159 - - Cursor Text Color - - Blue Component - 0.0 - Green Component - 0.0 - Red Component - 0.0 - - Foreground Color - - Blue Component - 0.93115901947021484 - Green Component - 0.92142927646636963 - Red Component - 0.90730977058410645 - - Selected Text Color - - Blue Component - 0.93115901947021484 - Green Component - 0.92142927646636963 - Red Component - 0.90730977058410645 - - Selection Color - - Blue Component - 0.47096589207649231 - Green Component - 0.41462835669517517 - Red Component - 0.30659490823745728 - - - diff --git a/tmux/tmux.conf b/tmux/tmux.conf index 7376887..dc5821b 100644 --- a/tmux/tmux.conf +++ b/tmux/tmux.conf @@ -1,8 +1,8 @@ -# More straight forward key bindings for splitting -unbind % +# split panes using | and - bind | split-window -h -unbind '"' bind - split-window -v +unbind '"' +unbind % # History set -g history-limit 10000 diff --git a/shell/README.md b/zsh/README.md similarity index 100% rename from shell/README.md rename to zsh/README.md diff --git a/shell/zshrc b/zsh/zshrc similarity index 57% rename from shell/zshrc rename to zsh/zshrc index 8b4d425..5ee3b2b 100644 --- a/shell/zshrc +++ b/zsh/zshrc @@ -1,31 +1,12 @@ -# If you come from bash you might have to change your $PATH. +export ZSH="/Users/mia/.oh-my-zsh" + +plugins=(git) + export PATH=$HOME/bin:/usr/local/bin:$PATH - -# Path to your oh-my-zsh installation. export ZSH=$HOME/.oh-my-zsh -export ZPLUG_HOME=/usr/local/opt/zplug -source $ZPLUG_HOME/init.zsh source $ZSH/oh-my-zsh.sh -source "${HOME}/.zgen/zgen.zsh" - -# Set name of the theme to load --- if set to "random", it will -# load a random theme each time oh-my-zsh is loaded, in which case, -# to know which specific one was loaded, run: echo $RANDOM_THEME -# See https://github.com/robbyrussell/oh-my-zsh/wiki/Themes -# See https://github.com/denysdovhan/spaceship-prompt -ZSH_THEME="spaceship" - -# Which plugins would you like to load? -plugins=(git extract web-search yum git-extras docker vagrant) -zgen load denysdovhan/spaceship-prompt spaceship -zplug 'zplug/zplug', hook-build:'zplug --self-manage' -zplug denysdovhan/spaceship-prompt, use:spaceship.zsh, from:github, as:theme -source ~/.zplug/init.zsh - -# Set Spaceship ZSH as a prompt -autoload -U promptinit; promptinit -prompt spaceship +ZSH_THEME="agnoster" ###################################################### # PERSONAL ALIASES @@ -46,6 +27,8 @@ alias df='df -kTh' alias dc="docker-compose" alias dcrun="docker-compose run --rm" +alias dev='cd ~/dev' +alias python='python3' ###################################################### # EXPORT OPTIONS @@ -71,3 +54,22 @@ function h() { +# Set Spaceship ZSH as a prompt +autoload -U promptinit; promptinit +prompt spaceship + +# >>> conda initialize >>> +# !! Contents within this block are managed by 'conda init' !! +__conda_setup="$('/Users/mia/miniconda3/bin/conda' 'shell.zsh' 'hook' 2> /dev/null)" +if [ $? -eq 0 ]; then + eval "$__conda_setup" +else + if [ -f "/Users/mia/miniconda3/etc/profile.d/conda.sh" ]; then + . "/Users/mia/miniconda3/etc/profile.d/conda.sh" + else + export PATH="/Users/mia/miniconda3/bin:$PATH" + fi +fi +unset __conda_setup +# <<< conda initialize <<< +