-
Notifications
You must be signed in to change notification settings - Fork 0
Expand file tree
/
Copy pathdiff-zprezto
More file actions
221 lines (193 loc) · 6.22 KB
/
Copy pathdiff-zprezto
File metadata and controls
221 lines (193 loc) · 6.22 KB
1
2
3
4
5
6
7
8
9
10
11
12
13
14
15
16
17
18
19
20
21
22
23
24
25
26
27
28
29
30
31
32
33
34
35
36
37
38
39
40
41
42
43
44
45
46
47
48
49
50
51
52
53
54
55
56
57
58
59
60
61
62
63
64
65
66
67
68
69
70
71
72
73
74
75
76
77
78
79
80
81
82
83
84
85
86
87
88
89
90
91
92
93
94
95
96
97
98
99
100
101
102
103
104
105
106
107
108
109
110
111
112
113
114
115
116
117
118
119
120
121
122
123
124
125
126
127
128
129
130
131
132
133
134
135
136
137
138
139
140
141
142
143
144
145
146
147
148
149
150
151
152
153
154
155
156
157
158
159
160
161
162
163
164
165
166
167
168
169
170
171
172
173
174
175
176
177
178
179
180
181
182
183
184
185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
200
201
202
203
204
205
206
207
208
209
210
211
212
213
214
215
216
217
218
219
220
221
diff --git a/..gitmodules.un~ b/..gitmodules.un~
new file mode 100644
index 0000000..fcf33eb
Binary files /dev/null and b/..gitmodules.un~ differ
diff --git a/.gitmodules b/.gitmodules
index a8a9e57..868ffc6 100644
--- a/.gitmodules
+++ b/.gitmodules
@@ -1,18 +1,30 @@
[submodule "modules/history-substring-search/external"]
path = modules/history-substring-search/external
url = https://github.com/zsh-users/zsh-history-substring-search.git
+ branch = master
+ ignore = all
[submodule "modules/syntax-highlighting/external"]
path = modules/syntax-highlighting/external
url = https://github.com/zsh-users/zsh-syntax-highlighting.git
+ branch = master
+ ignore = all
[submodule "modules/completion/external"]
path = modules/completion/external
url = https://github.com/zsh-users/zsh-completions.git
+ branch = master
+ ignore = all
[submodule "modules/prompt/external/powerline"]
path = modules/prompt/external/powerline
url = https://github.com/davidjrice/prezto_powerline.git
+ branch = master
+ ignore = all
[submodule "modules/prompt/external/agnoster"]
path = modules/prompt/external/agnoster
url = https://github.com/agnoster/agnoster-zsh-theme.git
+ branch = master
+ ignore = all
[submodule "modules/prompt/functions/pure"]
path = modules/prompt/external/pure
url = https://github.com/sindresorhus/pure.git
+ branch = master
+ ignore = all
diff --git a/modules/utility/init.zsh b/modules/utility/init.zsh
index fd7aaf6..8b82952 100644
--- a/modules/utility/init.zsh
+++ b/modules/utility/init.zsh
@@ -36,7 +36,7 @@ alias rm='nocorrect rm'
# Disable globbing.
alias bower='noglob bower'
alias fc='noglob fc'
-alias find='noglob find'
+#alias find='noglob find'
alias ftp='noglob ftp'
alias history='noglob history'
alias locate='noglob locate'
diff --git a/runcoms/zpreztorc b/runcoms/zpreztorc
index 4778944..ca06e79 100644
--- a/runcoms/zpreztorc
+++ b/runcoms/zpreztorc
@@ -16,10 +16,10 @@
zstyle ':prezto:*:*' color 'yes'
# Set the Zsh modules to load (man zshmodules).
-# zstyle ':prezto:load' zmodule 'attr' 'stat'
+zstyle ':prezto:load' zmodule 'attr' 'stat'
# Set the Zsh functions to load (man zshcontrib).
-# zstyle ':prezto:load' zfunction 'zargs' 'zmv'
+zstyle ':prezto:load' zfunction 'zargs' 'zmv'
# Set the Prezto modules to load (browse modules).
# The order matters.
@@ -32,44 +32,58 @@ zstyle ':prezto:load' pmodule \
'spectrum' \
'utility' \
'completion' \
- 'prompt'
+ 'prompt' \
+ 'archive' \
+ 'command-not-found' \
+ 'git' \
+ 'gnu-utility' \
+ 'history-substring-search' \
+ 'node' \
+ 'screen' \
+ 'ssh' \
+ 'syntax-highlighting' \
+ '' \
+ '' \
+ '' \
+ ''
#+ 'fasd' \
#
# Editor
#
# Set the key mapping style to 'emacs' or 'vi'.
-zstyle ':prezto:module:editor' key-bindings 'emacs'
+zstyle ':prezto:module:editor' key-bindings 'vi'
# Auto convert .... to ../..
-# zstyle ':prezto:module:editor' dot-expansion 'yes'
+zstyle ':prezto:module:editor' dot-expansion 'yes'
#
# Git
#
# Ignore submodules when they are 'dirty', 'untracked', 'all', or 'none'.
-# zstyle ':prezto:module:git:status:ignore' submodules 'all'
+zstyle ':prezto:module:git:status:ignore' submodules 'all'
#
# GNU Utility
#
# Set the command prefix on non-GNU systems.
-# zstyle ':prezto:module:gnu-utility' prefix 'g'
+zstyle ':prezto:module:gnu-utility' prefix 'g'
#
# History Substring Search
#
# Set the query found color.
-# zstyle ':prezto:module:history-substring-search:color' found ''
+zstyle ':prezto:module:history-substring-search:color' found ''
# Set the query not found color.
-# zstyle ':prezto:module:history-substring-search:color' not-found ''
+zstyle ':prezto:module:history-substring-search:color' not-found ''
# Set the search globbing flags.
-# zstyle ':prezto:module:history-substring-search' globbing-flags ''
+zstyle ':prezto:module:history-substring-search' globbing-flags ''
#
# Pacman
@@ -85,7 +99,7 @@ zstyle ':prezto:module:editor' key-bindings 'emacs'
# Set the prompt theme to load.
# Setting it to 'random' loads a random theme.
# Auto set to 'off' on dumb terminals.
-zstyle ':prezto:module:prompt' theme 'sorin'
+zstyle ':prezto:module:prompt' theme 'steeef'
#
# Ruby
@@ -99,17 +113,17 @@ zstyle ':prezto:module:prompt' theme 'sorin'
#
# Auto start a session when Zsh is launched in a local terminal.
-# zstyle ':prezto:module:screen:auto-start' local 'yes'
+zstyle ':prezto:module:screen:auto-start' local 'yes'
# Auto start a session when Zsh is launched in a SSH connection.
-# zstyle ':prezto:module:screen:auto-start' remote 'yes'
+zstyle ':prezto:module:screen:auto-start' remote 'yes'
#
# SSH
#
# Set the SSH identities to load into the agent.
-# zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github'
+zstyle ':prezto:module:ssh:load' identities 'id_rsa' 'id_rsa2' 'id_github'
#
# Syntax Highlighting
@@ -117,31 +131,31 @@ zstyle ':prezto:module:prompt' theme 'sorin'
# Set syntax highlighters.
# By default, only the main highlighter is enabled.
-# zstyle ':prezto:module:syntax-highlighting' highlighters \
-# 'main' \
-# 'brackets' \
-# 'pattern' \
-# 'cursor' \
-# 'root'
+zstyle ':prezto:module:syntax-highlighting' highlighters \
+ 'main' \
+ 'brackets' \
+ 'pattern' \
+ 'cursor' \
+ 'root'
#
# Set syntax highlighting styles.
-# zstyle ':prezto:module:syntax-highlighting' styles \
-# 'builtin' 'bg=blue' \
-# 'command' 'bg=blue' \
-# 'function' 'bg=blue'
+zstyle ':prezto:module:syntax-highlighting' styles \
+ 'builtin' 'bg=blue' \
+ 'command' 'bg=blue' \
+ 'function' 'bg=blue'
#
# Terminal
#
# Auto set the tab and window titles.
-# zstyle ':prezto:module:terminal' auto-title 'yes'
+zstyle ':prezto:module:terminal' auto-title 'yes'
# Set the window title format.
-# zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
+zstyle ':prezto:module:terminal:window-title' format '%n@%m: %s'
# Set the tab title format.
-# zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
+zstyle ':prezto:module:terminal:tab-title' format '%m: %s'
#
# Tmux
diff --git a/runcoms/zprofile b/runcoms/zprofile
index d87cb3b..70280c8 100644
--- a/runcoms/zprofile
+++ b/runcoms/zprofile
@@ -72,3 +72,5 @@ if [[ ! -d "$TMPDIR" ]]; then
fi
TMPPREFIX="${TMPDIR%/}/zsh"
+
+export PATH="$HOME/.cargo/bin:$PATH"