more prompt fun
authorJoerg Jaspert <joerg@debian.org>
Mon, 11 Mar 2013 23:36:53 +0000 (00:36 +0100)
committerJoerg Jaspert <joerg@debian.org>
Mon, 11 Mar 2013 23:37:50 +0000 (00:37 +0100)
.zsh/.gitignore
.zsh/20_Prompts.zsh
.zsh/functions/dist-config
.zsh/functions/prompt_ganneff_setup
.zsh/net:debconf.org/Prompts.zsh [new file with mode: 0644]
.zsh/net:debian.org/Prompts.zsh [new file with mode: 0644]

index e6340b8..b6c2f59 100644 (file)
@@ -4,3 +4,4 @@ var
 .zcompdump.zwc
 zsh-install.sh
 run
+.zdirs
index 8e04c31..90728e7 100644 (file)
@@ -14,7 +14,7 @@ if is437; then
          zstyle ':prompt:ganneff:right:setup' use-rprompt true
          zstyle ':prompt:ganneff:left:full:setup' items \
              ulcorner line openbracket user at host pts closebracket line history \
-             ganneff flexline openbracket path closebracket line urcorner newline \
+             flexline openbracket path closebracket line urcorner newline \
              llcorner line rc openbracket time closebracket line vcs line change-root pipe space
          zstyle ':prompt:ganneff:right:full:setup' items \
              pipe line openbracket date closebracket line lrcorner
@@ -22,13 +22,12 @@ if is437; then
              ulcorner line openbracket user at host closebracket line openbracket path closebracket newline \
              llcorner line rc openbracket time closebracket line vcs line pipe space
 
-#         zstyle ':prompt:ganneff:left:items:ganneff' pre '${PR_RED}'
-#         zstyle ':prompt:ganneff:left:items:ganneff' post '${PR_NO_COLOR}'
-#         zstyle ':prompt:ganneff:left:items:ganneff' pre '%M'
+        zstyle ':prompt:ganneff:*:items:date' token '%D{%Y-%m-%d [d:%j/w:%V]}'
 
-
-
-         prompt ganneff
+#        zstyle ':prompt:ganneff:left:items:ganneff' pre '${PR_RED}'
+#        zstyle ':prompt:ganneff:left:items:ganneff' post '${PR_NO_COLOR}'
+#        zstyle ':prompt:ganneff:left:items:ganneff' token '$BLABLA'
+        prompt ganneff
     fi
 else
 # And the old way
index 3d28727..530f78f 100644 (file)
@@ -131,7 +131,7 @@ fi
         [[ -z $1 ]] || {
             plog "Remote install..."
             scp $TMPDIR/dotfiles-install.sh ${remote}:
-            ssh $remote sh ./dotfiles-install.sh
+            ssh -t $remote sh ./dotfiles-install.sh
             plog "OK"
         }
     } always {
index d310ff5..2e50821 100644 (file)
@@ -97,9 +97,9 @@ prompt_ganneff_help () {
             zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat \
                       "\${PR_YELLOW}%b%{\${PR_RED}%}:\${PR_YELLOW}%r\${PR_NO_COLOR}"
             zstyle ':vcs_info:*' formats \
-                      "(\${PR_YELLOW}%s\${PR_NO_COLOR} \${PR_GREEN}%b\${PR_NO_COLOR})%m%u%c "
+                      "(\${PR_YELLOW}%s\${PR_NO_COLOR})-[\${PR_GREEN}%b\${PR_NO_COLOR}]%m%u%c "
             zstyle ':vcs_info:*' actionformats \
-                      "(\${PR_YELLOW}%s\${PR_NO_COLOR} \${PR_GREEN}%b\${PR_NO_COLOR}-\${PR_RED}(%a)\${PR_NO_COLOR})%m%u%c "
+                      "(\${PR_YELLOW}%s\${PR_NO_COLOR})-[\${PR_GREEN}%b\${PR_NO_COLOR}-\${PR_RED}(%a)\${PR_NO_COLOR}]%m%u%c "
 
         - colors (boolean): If \`true' (the default), use colors. b/w
           otherwise.
@@ -222,8 +222,8 @@ ${PR_SHIFT_IN}${PR_HBAR}${PR_CYAN}${PR_HBAR}${PR_SHIFT_OUT}${PR_NO_COLOR} '
 
             # change vcs_info formats for the prompt
             zstyle ':vcs_info:(sv[nk]|bzr):*' branchformat "${PR_YELLOW}%b%{${PR_RED}%}:${PR_YELLOW}%r${PR_NO_COLOR}"
-            zstyle ':vcs_info:*' formats "(${PR_YELLOW}%s${PR_NO_COLOR} ${PR_GREEN}%b${PR_NO_COLOR})%m%u%c "
-            zstyle ':vcs_info:*' actionformats "(${PR_YELLOW}%s${PR_NO_COLOR} ${PR_GREEN}%b${PR_NO_COLOR}-${PR_RED}(%a)${PR_NO_COLOR})%m%u%c "
+            zstyle ':vcs_info:*' formats "(${PR_YELLOW}%s${PR_NO_COLOR})-[${PR_GREEN}%b${PR_NO_COLOR}]%m%u%c "
+            zstyle ':vcs_info:*' actionformats "(${PR_YELLOW}%s${PR_NO_COLOR})-[${PR_GREEN}%b${PR_NO_COLOR}-${PR_RED}(%a)${PR_NO_COLOR}]%m%u%c "
         fi
     fi
 
@@ -416,7 +416,7 @@ ganneff_prompt_addto () {
     for it in "${items[@]}"; do
         zstyle -s ":prompt:ganneff:${lr}:items:$it" pre apre \
             || apre=${ganneff_prompt_pre_default[$it]}
-        zstyle -s ":prompt:ganneff:ganneff:${lr}:$it" post apost \
+        zstyle -s ":prompt:ganneff:${lr}:items:$it" post apost \
             || apost=${ganneff_prompt_post_default[$it]}
         zstyle -s ":prompt:ganneff:${lr}:items:$it" token new \
             || new=${ganneff_prompt_token_default[$it]}
diff --git a/.zsh/net:debconf.org/Prompts.zsh b/.zsh/net:debconf.org/Prompts.zsh
new file mode 100644 (file)
index 0000000..1f1e3e7
--- /dev/null
@@ -0,0 +1,4 @@
+# -*- mode:sh -*-
+
+# We want hostname to look different
+zstyle ':prompt:ganneff:*:items:host' pre '${PR_MAGENTA}'
diff --git a/.zsh/net:debian.org/Prompts.zsh b/.zsh/net:debian.org/Prompts.zsh
new file mode 100644 (file)
index 0000000..80c6d3b
--- /dev/null
@@ -0,0 +1,4 @@
+# -*- mode:sh -*-
+
+# We want hostname to look different
+zstyle ':prompt:ganneff:*:items:host' pre '${PR_YELLOW}'