|
1 | 1 | {%- set config = item.config | default({}) -%} |
2 | 2 |
|
3 | 3 | # If you come from bash you might have to change your $PATH. |
4 | | -{{ config | manala.roles.zsh_config_parameter('export PATH', comment='# export PATH=$HOME/bin:/usr/local/bin:$PATH') }} |
| 4 | +{{ config | manala.roles.zsh_config_parameter('export PATH', comment='# export PATH=$HOME/bin:$HOME/.local/bin:/usr/local/bin:$PATH') }} |
5 | 5 |
|
6 | | -# Path to your oh-my-zsh installation. |
| 6 | +# Path to your Oh My Zsh installation. |
7 | 7 | {{ config | manala.roles.zsh_config_parameter('export ZSH', default=manala_ohmyzsh_dir) }} |
8 | 8 |
|
9 | | -# Ensure per-user cache |
10 | | -{{ config | manala.roles.zsh_config_parameter('ZSH_CACHE_DIR', default='$HOME/.oh-my-zsh/cache') }} |
11 | | - |
12 | | -if [[ ! -d $ZSH_CACHE_DIR ]]; then |
13 | | - mkdir -p $ZSH_CACHE_DIR |
14 | | -fi |
15 | | - |
16 | 9 | # Set name of the theme to load --- if set to "random", it will |
17 | | -# load a random theme each time oh-my-zsh is loaded, in which case, |
| 10 | +# load a random theme each time Oh My Zsh is loaded, in which case, |
18 | 11 | # to know which specific one was loaded, run: echo $RANDOM_THEME |
19 | 12 | # See https://github.com/ohmyzsh/ohmyzsh/wiki/Themes |
20 | 13 | {{ config | manala.roles.zsh_config_parameter('ZSH_THEME', default='robbyrussell') }} |
|
32 | 25 | # Case-sensitive completion must be off. _ and - will be interchangeable. |
33 | 26 | {{ config | manala.roles.zsh_config_parameter('HYPHEN_INSENSITIVE', default=true, comment=true) }} |
34 | 27 |
|
35 | | -# Uncomment the following line to disable bi-weekly auto-update checks. |
36 | | -{{ config | manala.roles.zsh_config_parameter('DISABLE_AUTO_UPDATE', default=true, comment=true) }} |
37 | | - |
38 | | -# Uncomment the following line to automatically update without prompting. |
39 | | -{{ config | manala.roles.zsh_config_parameter('DISABLE_UPDATE_PROMPT', default=true, comment=true) }} |
| 28 | +# Uncomment one of the following lines to change the auto-update behavior |
| 29 | +# zstyle ':omz:update' mode disabled # disable automatic updates |
| 30 | +# zstyle ':omz:update' mode auto # update automatically without asking |
| 31 | +# zstyle ':omz:update' mode reminder # just remind me to update when it's time |
40 | 32 |
|
41 | 33 | # Uncomment the following line to change how often to auto-update (in days). |
42 | | -{{ config | manala.roles.zsh_config_parameter('export UPDATE_ZSH_DAYS', default=13, comment=true) }} |
| 34 | +# zstyle ':omz:update' frequency 13 |
43 | 35 |
|
44 | 36 | # Uncomment the following line if pasting URLs and other text is messed up. |
45 | 37 | {{ config | manala.roles.zsh_config_parameter('DISABLE_MAGIC_FUNCTIONS', default=true, comment=true) }} |
@@ -95,29 +87,28 @@ source $ZSH/oh-my-zsh.sh |
95 | 87 | # if [[ -n $SSH_CONNECTION ]]; then |
96 | 88 | # export EDITOR='vim' |
97 | 89 | # else |
98 | | -# export EDITOR='mvim' |
| 90 | +# export EDITOR='nvim' |
99 | 91 | # fi |
100 | 92 |
|
101 | 93 | # Compilation flags |
102 | | -{{ config | manala.roles.zsh_config_parameter('export ARCHFLAGS', default='-arch x86_64', comment=true) }} |
103 | | - |
104 | | -# Set personal aliases, overriding those provided by oh-my-zsh libs, |
105 | | -# plugins, and themes. Aliases can be placed here, though oh-my-zsh |
106 | | -# users are encouraged to define aliases within the ZSH_CUSTOM folder. |
| 94 | +{{ config | manala.roles.zsh_config_parameter('export ARCHFLAGS', default='-arch $(uname -m)', comment=true) }} |
| 95 | + |
| 96 | +# Set personal aliases, overriding those provided by Oh My Zsh libs, |
| 97 | +# plugins, and themes. Aliases can be placed here, though Oh My Zsh |
| 98 | +# users are encouraged to define aliases within a top-level file in |
| 99 | +# the $ZSH_CUSTOM folder, with .zsh extension. Examples: |
| 100 | +# - $ZSH_CUSTOM/aliases.zsh |
| 101 | +# - $ZSH_CUSTOM/macos.zsh |
107 | 102 | # For a full list of active aliases, run `alias`. |
108 | 103 | {{ config | manala.roles.zsh_config_parameter('alias', comment='#\n# Example aliases\n# alias zshconfig="mate ~/.zshrc"\n# alias ohmyzsh="mate ~/.oh-my-zsh"') }} |
109 | 104 |
|
110 | 105 | {{ config | manala.roles.zsh_config(exclude=[ |
111 | 106 | 'export PATH', |
112 | 107 | 'export ZSH', |
113 | | - 'ZSH_CACHE_DIR', |
114 | 108 | 'ZSH_THEME', |
115 | 109 | 'ZSH_THEME_RANDOM_CANDIDATES', |
116 | 110 | 'CASE_SENSITIVE', |
117 | 111 | 'HYPHEN_INSENSITIVE', |
118 | | - 'DISABLE_AUTO_UPDATE', |
119 | | - 'DISABLE_UPDATE_PROMPT', |
120 | | - 'UPDATE ZSH_DAYS', |
121 | 112 | 'DISABLE_MAGIC_FUNCTIONS', |
122 | 113 | 'DISABLE_LS_COLORS', |
123 | 114 | 'DISABLE_AUTO_TITLE', |
|
0 commit comments