Skip to content

Commit 14abebe

Browse files
Hayao0819Hayao0819
committed
Merge branch 'dev' into dev-stable
2 parents d5955c2 + 13ed92a commit 14abebe

File tree

18 files changed

+104
-61
lines changed

18 files changed

+104
-61
lines changed

‎channels/cinnamon/airootfs.any/etc/skel/.zshrc‎

Lines changed: 12 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ export ZIPINFOOPT=-OCP932
2525
export UNZIPOPT=-OCP932
2626

2727

28+
#-- Like fish prompt --#
29+
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
30+
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
31+
source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
32+
33+
2834
#-- Key --#
2935
# create a zkbd compatible hash;
3036
# to add other keys to this hash, see: man 5 terminfo
@@ -47,13 +53,17 @@ key[PageDown]=${terminfo[knp]}
4753
[[ -n "${key[End]}" ]] && bindkey "${key[End]}" end-of-line
4854
[[ -n "${key[Insert]}" ]] && bindkey "${key[Insert]}" overwrite-mode
4955
[[ -n "${key[Delete]}" ]] && bindkey "${key[Delete]}" delete-char
50-
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
51-
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
56+
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" history-substring-search-up
57+
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" history-substring-search-down
5258
[[ -n "${key[Left]}" ]] && bindkey "${key[Left]}" backward-char
5359
[[ -n "${key[Right]}" ]] && bindkey "${key[Right]}" forward-char
5460
[[ -n "${key[PageUp]}" ]] && bindkey "${key[PageUp]}" beginning-of-buffer-or-history
5561
[[ -n "${key[PageDown]}" ]] && bindkey "${key[PageDown]}" end-of-buffer-or-history
5662

63+
# Normal history display
64+
#[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
65+
#[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
66+
5767
# Finally, make sure the terminal is in application mode, when zle is
5868
# active. Only then are the values from $terminfo valid.
5969
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
@@ -108,7 +118,3 @@ else
108118

109119
install_powerline_precmd
110120
fi
111-
112-
#-- Like fish prompt --#
113-
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
114-
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

‎channels/cinnamon/packages.i686/shell.i686‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -27,4 +27,5 @@ powerline-go
2727
zsh
2828
zsh-autosuggestions
2929
zsh-completions
30+
zsh-history-substring-search
3031
zsh-syntax-highlighting

‎channels/cinnamon/packages.x86_64/shell.x86_64‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -26,4 +26,5 @@ powerline-go
2626
zsh
2727
zsh-autosuggestions
2828
zsh-completions
29+
zsh-history-substring-search
2930
zsh-syntax-highlighting

‎channels/i3/airootfs.any/etc/skel/.zshrc‎

Lines changed: 28 additions & 20 deletions
Original file line numberDiff line numberDiff line change
@@ -6,21 +6,35 @@
66
# Twitter: @Watasuke102
77
# Email : [email protected]
88
#
9+
# Yamada Hayao
10+
# Twitter: @Hayao0819
11+
# Email : [email protected]
12+
#
913
# (c) 2020 Fascode Network.
1014

1115

12-
# Completion
16+
#-- Alias --#
17+
[[ -f .aliases ]] && source .aliases
18+
19+
20+
#-- Completion --#
1321
[ -e /usr/local/share/zsh-completions ] && fpath=(/usr/local/share/zsh-completions $fpath)
1422
autoload -U compinit
1523
compinit -u
1624

1725

18-
# Archive settings
26+
#-- Archive settings --#
1927
export ZIPINFOOPT=-OCP932
2028
export UNZIPOPT=-OCP932
2129

2230

23-
# Key
31+
#-- Like fish prompt --#
32+
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
33+
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
34+
source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
35+
36+
37+
#-- Key --#
2438
# create a zkbd compatible hash;
2539
# to add other keys to this hash, see: man 5 terminfo
2640
typeset -A key
@@ -42,13 +56,17 @@ key[PageDown]=${terminfo[knp]}
4256
[[ -n "${key[End]}" ]] && bindkey "${key[End]}" end-of-line
4357
[[ -n "${key[Insert]}" ]] && bindkey "${key[Insert]}" overwrite-mode
4458
[[ -n "${key[Delete]}" ]] && bindkey "${key[Delete]}" delete-char
45-
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
46-
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
59+
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" history-substring-search-up
60+
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" history-substring-search-down
4761
[[ -n "${key[Left]}" ]] && bindkey "${key[Left]}" backward-char
4862
[[ -n "${key[Right]}" ]] && bindkey "${key[Right]}" forward-char
4963
[[ -n "${key[PageUp]}" ]] && bindkey "${key[PageUp]}" beginning-of-buffer-or-history
5064
[[ -n "${key[PageDown]}" ]] && bindkey "${key[PageDown]}" end-of-buffer-or-history
5165

66+
# Normal history display
67+
#[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
68+
#[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
69+
5270
# Finally, make sure the terminal is in application mode, when zle is
5371
# active. Only then are the values from $terminfo valid.
5472
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
@@ -63,28 +81,28 @@ if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
6381
fi
6482

6583

66-
# Do not sound
84+
#-- Do not sound --#
6785
setopt nolistbeep
6886
setopt nolistbeep
6987

7088

71-
# Save history.
89+
#-- Save history. --#
7290
HISTFILE=~/.zsh_history
7391
HISTSIZE=100000
7492
SAVEHIST=100000
7593
setopt share_history
7694

7795

78-
# Make colors available
96+
#-- Make colors available --#
7997
autoload -Uz colors
8098
colors
8199

82100

83-
# Pass to the path
101+
#-- Pass to the path --#
84102
[[ -d ~/.bin ]] && export PATH="~/.bin:${PATH}"
85103

86104

87-
# PROMPT
105+
#-- PROMPT --#
88106
if [[ ${TERM} = "linux" ]]; then
89107
PROMPT='%B%F{red}%(?..%? )%f%b%B%F{red}%n%f%b@%m %B%40<..<%~%<< %b%# '
90108
else
@@ -103,13 +121,3 @@ else
103121

104122
install_powerline_precmd
105123
fi
106-
107-
# Like fish prompt
108-
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
109-
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
110-
111-
# Alias
112-
[[ -f .aliases ]] && source .aliases
113-
114-
# Set default terminal
115-
export TERMINAL=/usr/bin/sakura

‎channels/i3/packages.i686/shell.i686‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ powerline-go
1818
zsh
1919
zsh-autosuggestions
2020
zsh-completions
21+
zsh-history-substring-search
2122
zsh-syntax-highlighting
2223

2324

‎channels/i3/packages.x86_64/shell.x86_64‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -18,6 +18,7 @@ powerline-go
1818
zsh
1919
zsh-autosuggestions
2020
zsh-completions
21+
zsh-history-substring-search
2122
zsh-syntax-highlighting
2223

2324

‎channels/lxde/airootfs.any/etc/skel/.zshrc‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ export ZIPINFOOPT=-OCP932
2525
export UNZIPOPT=-OCP932
2626

2727

28+
#-- Like fish prompt --#
29+
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
30+
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
31+
source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
32+
33+
2834
#-- Key --#
2935
# create a zkbd compatible hash;
3036
# to add other keys to this hash, see: man 5 terminfo
@@ -47,13 +53,17 @@ key[PageDown]=${terminfo[knp]}
4753
[[ -n "${key[End]}" ]] && bindkey "${key[End]}" end-of-line
4854
[[ -n "${key[Insert]}" ]] && bindkey "${key[Insert]}" overwrite-mode
4955
[[ -n "${key[Delete]}" ]] && bindkey "${key[Delete]}" delete-char
50-
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
51-
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
56+
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" history-substring-search-up
57+
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" history-substring-search-down
5258
[[ -n "${key[Left]}" ]] && bindkey "${key[Left]}" backward-char
5359
[[ -n "${key[Right]}" ]] && bindkey "${key[Right]}" forward-char
5460
[[ -n "${key[PageUp]}" ]] && bindkey "${key[PageUp]}" beginning-of-buffer-or-history
5561
[[ -n "${key[PageDown]}" ]] && bindkey "${key[PageDown]}" end-of-buffer-or-history
5662

63+
# Normal history display
64+
#[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
65+
#[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
66+
5767
# Finally, make sure the terminal is in application mode, when zle is
5868
# active. Only then are the values from $terminfo valid.
5969
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
@@ -90,7 +100,7 @@ colors
90100

91101

92102
#-- PROMPT --#
93-
if [[ ${TERM} = linux ]]; then
103+
if [[ ${TERM} = "linux" ]]; then
94104
PROMPT='%B%F{red}%(?..%? )%f%b%B%F{red}%n%f%b@%m %B%40<..<%~%<< %b%# '
95105
else
96106
function powerline_precmd() {
@@ -108,7 +118,3 @@ else
108118

109119
install_powerline_precmd
110120
fi
111-
112-
#-- Like fish prompt --#
113-
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
114-
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

‎channels/lxde/packages.i686/shell.i686‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ powerline-go
2323
zsh
2424
zsh-autosuggestions
2525
zsh-completions
26+
zsh-history-substring-search
2627
zsh-syntax-highlighting

‎channels/lxde/packages.x86_64/shell.x86_64‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,4 +23,5 @@ powerline-go
2323
zsh
2424
zsh-autosuggestions
2525
zsh-completions
26+
zsh-history-substring-search
2627
zsh-syntax-highlighting

‎channels/plasma/airootfs.any/etc/skel/.zshrc‎

Lines changed: 13 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -25,6 +25,12 @@ export ZIPINFOOPT=-OCP932
2525
export UNZIPOPT=-OCP932
2626

2727

28+
#-- Like fish prompt --#
29+
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
30+
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh
31+
source /usr/share/zsh/plugins/zsh-history-substring-search/zsh-history-substring-search.zsh
32+
33+
2834
#-- Key --#
2935
# create a zkbd compatible hash;
3036
# to add other keys to this hash, see: man 5 terminfo
@@ -47,13 +53,17 @@ key[PageDown]=${terminfo[knp]}
4753
[[ -n "${key[End]}" ]] && bindkey "${key[End]}" end-of-line
4854
[[ -n "${key[Insert]}" ]] && bindkey "${key[Insert]}" overwrite-mode
4955
[[ -n "${key[Delete]}" ]] && bindkey "${key[Delete]}" delete-char
50-
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
51-
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
56+
[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" history-substring-search-up
57+
[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" history-substring-search-down
5258
[[ -n "${key[Left]}" ]] && bindkey "${key[Left]}" backward-char
5359
[[ -n "${key[Right]}" ]] && bindkey "${key[Right]}" forward-char
5460
[[ -n "${key[PageUp]}" ]] && bindkey "${key[PageUp]}" beginning-of-buffer-or-history
5561
[[ -n "${key[PageDown]}" ]] && bindkey "${key[PageDown]}" end-of-buffer-or-history
5662

63+
# Normal history display
64+
#[[ -n "${key[Up]}" ]] && bindkey "${key[Up]}" up-line-or-history
65+
#[[ -n "${key[Down]}" ]] && bindkey "${key[Down]}" down-line-or-history
66+
5767
# Finally, make sure the terminal is in application mode, when zle is
5868
# active. Only then are the values from $terminfo valid.
5969
if (( ${+terminfo[smkx]} )) && (( ${+terminfo[rmkx]} )); then
@@ -90,7 +100,7 @@ colors
90100

91101

92102
#-- PROMPT --#
93-
if [[ ${TERM} = linux ]]; then
103+
if [[ ${TERM} = "linux" ]]; then
94104
PROMPT='%B%F{red}%(?..%? )%f%b%B%F{red}%n%f%b@%m %B%40<..<%~%<< %b%# '
95105
else
96106
function powerline_precmd() {
@@ -108,7 +118,3 @@ else
108118

109119
install_powerline_precmd
110120
fi
111-
112-
#-- Like fish prompt --#
113-
source /usr/share/zsh/plugins/zsh-autosuggestions/zsh-autosuggestions.zsh
114-
source /usr/share/zsh/plugins/zsh-syntax-highlighting/zsh-syntax-highlighting.zsh

0 commit comments

Comments
 (0)