diff options
Diffstat (limited to 'dot_config')
| -rw-r--r-- | dot_config/zsh/.chezmoiignore | 6 | ||||
| -rw-r--r-- | dot_config/zsh/functions/prompt_fish_setup | 1 | ||||
| -rw-r--r-- | dot_config/zsh/functions/prompt_zstyle_setup | 14 | ||||
| -rw-r--r-- | dot_config/zsh/functions/tt | 1 | ||||
| -rw-r--r-- | dot_config/zsh/symlink_dot_zlogin | 1 | ||||
| -rw-r--r-- | dot_config/zsh/symlink_dot_zlogout | 1 | ||||
| -rw-r--r-- | dot_config/zsh/symlink_dot_zshrc.local | 1 | ||||
| -rw-r--r-- | dot_config/zsh/symlink_dot_zshrc.post | 1 | ||||
| -rw-r--r-- | dot_config/zsh/symlink_dot_zshrc.pre | 1 | ||||
| -rw-r--r-- | dot_config/zsh/zlogin | 1 | ||||
| -rw-r--r-- | dot_config/zsh/zlogout | 1 | ||||
| -rw-r--r-- | dot_config/zsh/zprofile | 1 | ||||
| -rw-r--r-- | dot_config/zsh/zshenv | 2 | ||||
| -rw-r--r-- | dot_config/zsh/zshrc | 1 | ||||
| -rw-r--r-- | dot_config/zsh/zshrc.options | 1 | ||||
| -rw-r--r-- | dot_config/zsh/zshrc.style | 1 |
16 files changed, 30 insertions, 5 deletions
diff --git a/dot_config/zsh/.chezmoiignore b/dot_config/zsh/.chezmoiignore index 68ef3ad..a7dfb92 100644 --- a/dot_config/zsh/.chezmoiignore +++ b/dot_config/zsh/.chezmoiignore @@ -1,4 +1,10 @@ .* +!.cache +!.zprofile +!.zshenv +!.zshrc +!.zlogin +!.zlogout *.pre *.local *.post diff --git a/dot_config/zsh/functions/prompt_fish_setup b/dot_config/zsh/functions/prompt_fish_setup index 397b3e0..12a0733 100644 --- a/dot_config/zsh/functions/prompt_fish_setup +++ b/dot_config/zsh/functions/prompt_fish_setup @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh # a prompt meant to imitate fish's default prompt # it's not meant to be too close necessarily, just same feel overall, diff --git a/dot_config/zsh/functions/prompt_zstyle_setup b/dot_config/zsh/functions/prompt_zstyle_setup index 256464c..1269575 100644 --- a/dot_config/zsh/functions/prompt_zstyle_setup +++ b/dot_config/zsh/functions/prompt_zstyle_setup @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh # a prompt entirely configured by zstyle, usable by default # make sure you configure vcs_info! @@ -57,9 +58,18 @@ prompt_zstyle_preset() { zstyle :prompt:zstyle:parts return '%(0?.. %F{red}[%?]%f)' zstyle :prompt:zstyle:parts separator '%(!.#.>)' zstyle :prompt:zstyle:parts vcsinfo \ - '${vcs_info_msg_0_:+ $vcs_info_msg_0_}' + '${vcs_info_msg_0_:+ $vcs_info_msg_0_}' zstyle :prompt:zstyle ps1 \ - login ' ' pwd vcsinfo return separator ' ' + login ' ' pwd vcsinfo return separator ' ' + ;; + grml) + prompt_zstyle_reset + zstyle :prompt:zstyle:parts login '%B%(!.%F{red}.%F{blue})%n%f%b@%m' + zstyle :prompt:zstyle:parts return '%(0?..%F{red}%?%f )' + zstyle :prompt:zstyle:parts vcsinfo \ + '${vcs_info_msg_0_:+ $vcs_info_msg_0_}' + zstyle :prompt:zstyle ps1 \ + return login ' ' pwd vcsinfo ' ' separator ' ' ;; esac } diff --git a/dot_config/zsh/functions/tt b/dot_config/zsh/functions/tt index 0328e71..090d935 100644 --- a/dot_config/zsh/functions/tt +++ b/dot_config/zsh/functions/tt @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh typeset -gaU __tt_exit_dirs __tt_exit() { diff --git a/dot_config/zsh/symlink_dot_zlogin b/dot_config/zsh/symlink_dot_zlogin new file mode 100644 index 0000000..93f0bc5 --- /dev/null +++ b/dot_config/zsh/symlink_dot_zlogin @@ -0,0 +1 @@ +zlogin diff --git a/dot_config/zsh/symlink_dot_zlogout b/dot_config/zsh/symlink_dot_zlogout new file mode 100644 index 0000000..16e7623 --- /dev/null +++ b/dot_config/zsh/symlink_dot_zlogout @@ -0,0 +1 @@ +zlogout diff --git a/dot_config/zsh/symlink_dot_zshrc.local b/dot_config/zsh/symlink_dot_zshrc.local deleted file mode 100644 index 1dd4a16..0000000 --- a/dot_config/zsh/symlink_dot_zshrc.local +++ /dev/null @@ -1 +0,0 @@ -zshrc.local diff --git a/dot_config/zsh/symlink_dot_zshrc.post b/dot_config/zsh/symlink_dot_zshrc.post deleted file mode 100644 index c384032..0000000 --- a/dot_config/zsh/symlink_dot_zshrc.post +++ /dev/null @@ -1 +0,0 @@ -zshrc.post diff --git a/dot_config/zsh/symlink_dot_zshrc.pre b/dot_config/zsh/symlink_dot_zshrc.pre deleted file mode 100644 index f7893fb..0000000 --- a/dot_config/zsh/symlink_dot_zshrc.pre +++ /dev/null @@ -1 +0,0 @@ -zshrc.pre diff --git a/dot_config/zsh/zlogin b/dot_config/zsh/zlogin index 600af43..c8c7579 100644 --- a/dot_config/zsh/zlogin +++ b/dot_config/zsh/zlogin @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh xzsource zlogin.pre diff --git a/dot_config/zsh/zlogout b/dot_config/zsh/zlogout index 0dd9533..4898bcf 100644 --- a/dot_config/zsh/zlogout +++ b/dot_config/zsh/zlogout @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh xzsource zlogout.pre diff --git a/dot_config/zsh/zprofile b/dot_config/zsh/zprofile index 27ea0fa..a9dbf47 100644 --- a/dot_config/zsh/zprofile +++ b/dot_config/zsh/zprofile @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh xzsource zprofile.pre diff --git a/dot_config/zsh/zshenv b/dot_config/zsh/zshenv index 62eea7e..2818dfd 100644 --- a/dot_config/zsh/zshenv +++ b/dot_config/zsh/zshenv @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh : ${ZDOTDIR:=~/.config/zsh} @@ -6,6 +7,7 @@ xsource() { for i; do [ -r "$i" ] && source "$i" done + : } xzsource() { xsource "${@/#/$ZDOTDIR/}" diff --git a/dot_config/zsh/zshrc b/dot_config/zsh/zshrc index 0ff93f9..cab9db9 100644 --- a/dot_config/zsh/zshrc +++ b/dot_config/zsh/zshrc @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh xzsource zshrc.pre diff --git a/dot_config/zsh/zshrc.options b/dot_config/zsh/zshrc.options index c32f3e6..8335d8a 100644 --- a/dot_config/zsh/zshrc.options +++ b/dot_config/zsh/zshrc.options @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh ### Options # Almost all options are set explicitly diff --git a/dot_config/zsh/zshrc.style b/dot_config/zsh/zshrc.style index d2a5514..07e4b56 100644 --- a/dot_config/zsh/zshrc.style +++ b/dot_config/zsh/zshrc.style @@ -1,3 +1,4 @@ +# -*- mode: sh -*- # vim: ft=zsh ### ZStyle ## completion |