diff --git a/liquidprompt/liquidpromptrc.symlink b/liquidprompt/liquidpromptrc.symlink deleted file mode 100644 index aa56c20f..00000000 --- a/liquidprompt/liquidpromptrc.symlink +++ /dev/null @@ -1,155 +0,0 @@ - -#################################### -# LIQUID PROMPT CONFIGURATION FILE # -#################################### - -# If you want to use different themes and features, -# you can load the corresponding files here: -#source ~/.config/liquidprompt/nojhan.theme -#LP_PS1_FILE=~/.config/liquidprompt/nojhan.ps1 - -############# -# BEHAVIOUR # -############# - -# Maximal value under which the battery level is displayed -# Recommended value is 75 -LP_BATTERY_THRESHOLD=75 - -# Minimal value after which the load average is displayed -# Recommended value is 60 -LP_LOAD_THRESHOLD=60 - -# Minimal value after which the temperature is displayed (in degrees Celsius) -# Recommended value is 60 -LP_TEMP_THRESHOLD=60 - -# The maximum percentage of the screen width used to display the path -# Recommended value is 35 -LP_PATH_LENGTH=35 - -# How many directories to keep at the beginning of a shortened path -# Recommended value is 2 -LP_PATH_KEEP=2 - -# Do you want to display the hostname, even if not connected through network? -# Defaults to 0 (do not display hostname when locally connected) -# set to 1 if you want to always see the hostname -# set to -1 if you want to never see the hostname -LP_HOSTNAME_ALWAYS=0 - -# Use the FQDN instead of the short hostname if the hostname is displayed -LP_ENABLE_FQDN=0 - -# Do you want to display the user, even if the user is the same as the one logged in? -# Defaults to 1 (always display the user) -# set to 0 if you want to hide the logged user (it will always display different users) -LP_USER_ALWAYS=1 - -# Do you want to display the percentages of load/batteries along with their -# corresponding marks? Set to 0 to only print the colored marks. -# Defaults to 1 (display percentages) -LP_PERCENTS_ALWAYS=1 - -# Do you want to use the permissions feature? -# Recommended value is 1 -LP_ENABLE_PERM=1 - -# Do you want to use the shorten path feature? -# Recommended value is 1 -LP_ENABLE_SHORTEN_PATH=1 - -# Do you want to use the proxy detection feature? -# Recommended value is 1 -LP_ENABLE_PROXY=1 - -# Do you want to use the jobs feature? -# Recommended value is 1 -LP_ENABLE_JOBS=1 - -# Do you want to use the load feature? -# Recommended value is 1 -LP_ENABLE_LOAD=1 - -# Do you want to use the battery feature? -# Recommended value is 1 -LP_ENABLE_BATT=1 - -# Do you want to use the 'sudo credentials' feature? -# Be warned that this may pollute the syslog if you don't have sudo -# credentials, and the sysadmin will hate you. -LP_ENABLE_SUDO=0 - -# Do you want to use VCS features with the root account? -# Recommended value is 0 -LP_ENABLE_VCS_ROOT=0 - -# Do you want to use the Git special features? -# Recommended value is 1 -LP_ENABLE_GIT=1 - -# Do you want to use the Subversion special features? -# Recommended value is 1 -LP_ENABLE_SVN=1 - -# Do you want to use the Mercurial special features? -# Recommended value is 1 -LP_ENABLE_HG=1 - -# Do you want to use the Fossil special features? -# Recommended value is 1 -LP_ENABLE_FOSSIL=1 - -# Do you want to use the Bazaar special features? -# Recommanded value is 1 -LP_ENABLE_BZR=1 - -# Show time of the last prompt display -# Recommended value is 0 -LP_ENABLE_TIME=0 - -# Show runtime of the last command if over LP_RUNTIME_THRESHOLD -# Recommended value is 0 -LP_ENABLE_RUNTIME=0 - -# Minimal runtime to be displayed -# Recommended value is 2 -LP_RUNTIME_THRESHOLD=2 - -# Display the virtualenv that is currently activated, if any -# Recommended value is 1 -LP_ENABLE_VIRTUALENV=1 - -# Display the enabled software collections, if any -# Recommended value is 1 -LP_ENABLE_SCLS=1 - -# Show average system temperature -LP_ENABLE_TEMP=1 - -# When showing time, use an analog clock instead of numeric values. -# The analog clock is "accurate" to the nearest half hour. -# You must have a unicode-capable terminal and a font with the "CLOCK" -# characters. -# Recommended value is 0 -LP_TIME_ANALOG=0 - -# Use the prompt as the title of the terminal window -# The content is not customizable, the implementation is very basic, -# and this may not work properly on exotic terminals, thus the -# recommended value is 0 -# See LP_TITLE_OPEN and LP_TITLE_CLOSE to change escape characters to adapt this -# feature to your specific terminal. -LP_ENABLE_TITLE=0 - -# Enable Title for screen and byobu -LP_ENABLE_SCREEN_TITLE=0 - -# Use differents colors for differents hosts you SSH in -LP_ENABLE_SSH_COLORS=0 - -# Specify a list of complete and colon (":") separated paths in which, all vcs -# will be disabled -LP_DISABLED_VCS_PATH="" - -# vim: set et sts=4 sw=4 tw=120 ft=sh: diff --git a/script/bootstrap b/script/bootstrap index e8ea330c..46b19840 100755 --- a/script/bootstrap +++ b/script/bootstrap @@ -142,7 +142,6 @@ if [ $(uname) == "Darwin" ]; then /usr/local/bin/brew install inetutils /usr/local/bin/brew install jo /usr/local/bin/brew install jsonpp - /usr/local/bin/brew install liquidprompt /usr/local/bin/brew install mariadb /usr/local/bin/brew install mosh /usr/local/bin/brew install netlifyctl @@ -181,7 +180,6 @@ if [ -f /etc/debian_version ]; then sudo apt-get -y install dos2unix sudo apt-get -y install httpie sudo apt-get -y install jo - sudo apt-get -y install liquidprompt sudo apt-get -y install mariadb-client sudo apt-get -y install mosh sudo apt-get -y install php diff --git a/tmux/tmux-airline.conf.symlink b/tmux/tmux-airline.conf.symlink index df4e0d75..65975d32 100644 --- a/tmux/tmux-airline.conf.symlink +++ b/tmux/tmux-airline.conf.symlink @@ -4,25 +4,25 @@ set -g status-justify "left" set -g status "on" set -g status-attr "none" -set -g message-command-bg "colour31" +set -g message-command-bg "colour236" set -g status-left-length "100" -set -g pane-active-border-fg "colour254" -set -g status-bg "colour234" -set -g message-command-fg "colour231" -set -g pane-border-fg "colour240" -set -g message-bg "colour31" +set -g pane-active-border-fg "colour32" +set -g status-bg "colour235" +set -g message-command-fg "colour15" +set -g pane-border-fg "colour236" +set -g message-bg "colour236" set -g status-left-attr "none" set -g status-right-attr "none" set -g status-right-length "100" -set -g message-fg "colour231" -setw -g window-status-fg "colour250" +set -g message-fg "colour15" +setw -g window-status-fg "colour15" setw -g window-status-attr "none" -setw -g window-status-activity-bg "colour234" -setw -g window-status-activity-attr "underscore" -setw -g window-status-activity-fg "colour250" +setw -g window-status-activity-bg "colour235" +setw -g window-status-activity-attr "none" +setw -g window-status-activity-fg "colour32" setw -g window-status-separator "" -setw -g window-status-bg "colour234" -set -g status-left "#[fg=colour16,bg=colour254,bold] #S #[fg=colour254,bg=colour236,nobold,nounderscore,noitalics]#[fg=colour247,bg=colour236] #H #[fg=colour236,bg=colour234,nobold,nounderscore,noitalics]" -set -g status-right "#[fg=colour236,bg=colour234,nobold,nounderscore,noitalics]#[fg=colour247,bg=colour236] %a %Y-%m-%d  %l:%M %p " -setw -g window-status-format "#[fg=colour234,bg=colour234,nobold,nounderscore,noitalics]#[default] #I #W #[fg=colour234,bg=colour234,nobold,nounderscore,noitalics]" -setw -g window-status-current-format "#[fg=colour234,bg=colour31,nobold,nounderscore,noitalics]#[fg=colour231,bg=colour31,bold] #I #W #[fg=colour31,bg=colour234,nobold,nounderscore,noitalics]" +setw -g window-status-bg "colour235" +set -g status-left "#[fg=colour15,bg=colour32,none] #S #[fg=colour32,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour235,none] #H #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]" +set -g status-right "#[fg=colour236,bg=colour235,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour236] %a %Y-%m-%d  %l:%M %p " +setw -g window-status-format "#[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]#[default] #I #W #[fg=colour235,bg=colour235,nobold,nounderscore,noitalics]" +setw -g window-status-current-format "#[fg=colour235,bg=colour236,nobold,nounderscore,noitalics]#[fg=colour15,bg=colour236,none] #I #W #[fg=colour236,bg=colour235,nobold,nounderscore,noitalics]" diff --git a/zsh/zshrc.symlink b/zsh/zshrc.symlink index 82191283..d7aaab1a 100644 --- a/zsh/zshrc.symlink +++ b/zsh/zshrc.symlink @@ -9,7 +9,7 @@ bashcompinit # Look in ~/.oh-my-zsh/themes/ # Optionally, if you set this to "random", it'll load a random theme each # time that oh-my-zsh is loaded. -ZSH_THEME="robbyrussell" +ZSH_THEME="pygmalion" # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" @@ -53,6 +53,10 @@ plugins=(aws brew colorize common-aliases compleat git git-extras history jira s source $ZSH/oh-my-zsh.sh +# Color settings. +export CLICOLOR=1 +export CLICOLOR_FORCE=1 + # User configuration. export PATH=$HOME/bin:/usr/local/bin:/usr/local/sbin:$PATH @@ -102,14 +106,6 @@ alias phpcbf="phpcbf --standard=Drupal --extensions=php,module,inc,install,test, alias drushd4d7="docker-compose exec --user 82 php drush --root=/var/www/html" alias drushd4d8="docker-compose exec --user 82 php drush --root=/var/www/html/web" -# Setup liquidprompt if available. -if [ -f /usr/local/share/liquidprompt ]; then - . /usr/local/share/liquidprompt -fi -if [ -f /usr/share/liquidprompt/liquidprompt ]; then - . /usr/share/liquidprompt/liquidprompt -fi - # Allowing opening of Sublime Text 3 in tmux sessions alias subl="reattach-to-user-namespace subl"