From fbc878cb66cbe0067998034c2d2e383b2742c0de Mon Sep 17 00:00:00 2001 From: Rob Freiburger Date: Sat, 18 Feb 2017 04:31:36 -0600 Subject: Adds option to disable auto update prompt I noticed this option was missing from the template. When I followed the directions in README to enable it, I put it below line 59 without noticing it wouldn't have any effect by then. Prevent others from making a rookie mistake like mine. --- templates/zshrc.zsh-template | 3 +++ 1 file changed, 3 insertions(+) (limited to 'templates') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index af42e5b9f..93bbf36aa 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -19,6 +19,9 @@ ZSH_THEME="robbyrussell" # Uncomment the following line to disable bi-weekly auto-update checks. # DISABLE_AUTO_UPDATE="true" +# Uncomment the following line to automatically update without prompting. +# DISABLE_UPDATE_PROMPT="true" + # Uncomment the following line to change how often to auto-update (in days). # export UPDATE_ZSH_DAYS=13 -- cgit v1.2.3-70-g09d2 From d3e3b2dd0d7c7574d2a47c0d3a0d79583c58b2b8 Mon Sep 17 00:00:00 2001 From: Cristian Consonni Date: Fri, 13 Jul 2018 13:14:15 +0200 Subject: Add support for custom timestamp format in history (#6770) --- lib/history.zsh | 3 ++- templates/zshrc.zsh-template | 5 ++++- 2 files changed, 6 insertions(+), 2 deletions(-) (limited to 'templates') diff --git a/lib/history.zsh b/lib/history.zsh index 7d4e59d00..62e02648b 100644 --- a/lib/history.zsh +++ b/lib/history.zsh @@ -23,7 +23,8 @@ case $HIST_STAMPS in "mm/dd/yyyy") alias history='omz_history -f' ;; "dd.mm.yyyy") alias history='omz_history -E' ;; "yyyy-mm-dd") alias history='omz_history -i' ;; - *) alias history='omz_history' ;; + "") alias history='omz_history' ;; + *) alias history="omz_history -t '$HIST_STAMPS'" ;; esac ## History file configuration diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index bba2d370d..5f98fb211 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -48,7 +48,10 @@ ZSH_THEME="robbyrussell" # Uncomment the following line if you want to change the command execution time # stamp shown in the history command output. -# The optional three formats: "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# You can set one of the optional three formats: +# "mm/dd/yyyy"|"dd.mm.yyyy"|"yyyy-mm-dd" +# or set a custom format using the strftime function format specifications, +# see 'man strftime' for details. # HIST_STAMPS="mm/dd/yyyy" # Would you like to use another custom folder than $ZSH/custom? -- cgit v1.2.3-70-g09d2 From 77d75d7fcdcc7978246b84e6b3f0e95a0595c452 Mon Sep 17 00:00:00 2001 From: Samuel Lelièvre Date: Wed, 29 Aug 2018 20:50:52 +0200 Subject: Clarify random theme setting (#7090) Clarify random theme setting, in particular how to know which theme was loaded if picked at random. --- templates/zshrc.zsh-template | 21 +++++++++++---------- 1 file changed, 11 insertions(+), 10 deletions(-) (limited to 'templates') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 5f98fb211..7cd2a873b 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -4,23 +4,23 @@ # Path to your oh-my-zsh installation. export ZSH=$HOME/.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. +# 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 ZSH_THEME="robbyrussell" -# Set list of themes to load -# Setting this variable when ZSH_THEME=random -# cause zsh load theme from this variable instead of -# looking in ~/.oh-my-zsh/themes/ -# An empty array have no effect +# Set list of themes to pick from when loading at random +# Setting this variable when ZSH_THEME=random will cause zsh to load +# a theme from this variable instead of looking in ~/.oh-my-zsh/themes/ +# If set to an empty array, this variable will have no effect. # ZSH_THEME_RANDOM_CANDIDATES=( "robbyrussell" "agnoster" ) # Uncomment the following line to use case-sensitive completion. # CASE_SENSITIVE="true" -# Uncomment the following line to use hyphen-insensitive completion. Case -# sensitive completion must be off. _ and - will be interchangeable. +# Uncomment the following line to use hyphen-insensitive completion. +# Case-sensitive completion must be off. _ and - will be interchangeable. # HYPHEN_INSENSITIVE="true" # Uncomment the following line to disable bi-weekly auto-update checks. @@ -57,7 +57,8 @@ ZSH_THEME="robbyrussell" # Would you like to use another custom folder than $ZSH/custom? # ZSH_CUSTOM=/path/to/new-custom-folder -# Which plugins would you like to load? (plugins can be found in ~/.oh-my-zsh/plugins/*) +# Which plugins would you like to load? +# Standard plugins can be found in ~/.oh-my-zsh/plugins/* # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -- cgit v1.2.3-70-g09d2 From b9670d04092a461ae1db41080263b5a82bc1f958 Mon Sep 17 00:00:00 2001 From: Rehan Mahmood Date: Sun, 20 Jan 2019 14:31:23 -0500 Subject: template: change plugins definition to single line (#7498) --- templates/zshrc.zsh-template | 4 +--- 1 file changed, 1 insertion(+), 3 deletions(-) (limited to 'templates') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index 7cd2a873b..abd2c8812 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -62,9 +62,7 @@ ZSH_THEME="robbyrussell" # Custom plugins may be added to ~/.oh-my-zsh/custom/plugins/ # Example format: plugins=(rails git textmate ruby lighthouse) # Add wisely, as too many plugins slow down shell startup. -plugins=( - git -) +plugins=(git) source $ZSH/oh-my-zsh.sh -- cgit v1.2.3-70-g09d2 From 9981479900e3d3ff86bff0b3313c8e45891e880c Mon Sep 17 00:00:00 2001 From: Marc Cornellà Date: Mon, 8 Apr 2019 17:34:59 +0200 Subject: zshrc: remove SSH_KEY_PATH comment Fixes #5741 --- templates/zshrc.zsh-template | 3 --- 1 file changed, 3 deletions(-) (limited to 'templates') diff --git a/templates/zshrc.zsh-template b/templates/zshrc.zsh-template index abd2c8812..bc892ff38 100644 --- a/templates/zshrc.zsh-template +++ b/templates/zshrc.zsh-template @@ -83,9 +83,6 @@ source $ZSH/oh-my-zsh.sh # Compilation flags # export ARCHFLAGS="-arch x86_64" -# ssh -# export SSH_KEY_PATH="~/.ssh/rsa_id" - # Set personal aliases, overriding those provided by oh-my-zsh libs, # plugins, and themes. Aliases can be placed here, though oh-my-zsh # users are encouraged to define aliases within the ZSH_CUSTOM folder. -- cgit v1.2.3-70-g09d2