From 464e1c4b109bd05a933ec3a7e55e8ba59da7d30f Mon Sep 17 00:00:00 2001
From: Maximilian Friedersdorff <maxf130@gmail.com>
Date: Mon, 10 Oct 2016 09:16:04 +0100
Subject: [PATCH 1/1] Ratpoison bindings, vimperator history fix

---
 bash/.bashrc             | 43 +++++++++++++++++++++++-----------------
 ratpoison/.ratpoisonrc   |  2 +-
 vimperator/.vimperatorrc |  3 ++-
 3 files changed, 28 insertions(+), 20 deletions(-)

diff --git a/bash/.bashrc b/bash/.bashrc
index ab339cb..a90c177 100644
--- a/bash/.bashrc
+++ b/bash/.bashrc
@@ -64,6 +64,12 @@ GRAY=$(tput setaf 7)
 BOLD=$(tput bold)
 RESET=$(tput sgr0)
 
+function __virtualenv_prompt() {
+  if [ -n "$VIRTUAL_ENV" ]; then
+    echo "(${VIRTUAL_ENV##*/}) "
+  fi
+}
+
 # set up command prompt
 function __prompt_command()
 {
@@ -71,22 +77,6 @@ function __prompt_command()
   EXIT="$?"
   PS1=""
 
-  PS1+=$PS1_PREPEND
-
-  if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
-
-  # if logged in via ssh shows the ip of the client
-  if [ -n "$SSH_CLIENT" ]; then 
-    IP=${SSH_CLIENT%% *}
-    PS1+="\[$YELLOW\]("$IP")\[$RESET\]"; 
-  fi
-
-  # debian chroot stuff (take it or leave it)
-  PS1+="${debian_chroot:+($debian_chroot)}"
-
-  # basic information (user@host:path)
-  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\] "
-
   # check if inside git repo
   local git_status="`git status -unormal 2>&1`"    
   if ! [[ "$git_status" =~ Not\ a\ git\ repo ]]; then
@@ -107,10 +97,27 @@ function __prompt_command()
     fi
 
     # add the result to prompt
-    PS1+="\[$Color_On\][$branch]\[$RESET\] "
+    PS1+="\n\[$Color_On\][$branch]\[$RESET\]\n"
   fi
 
-  PS1+=$PS1_APPEND
+
+  PS1+="$(__virtualenv_prompt)"
+
+  if [ $EXIT -eq 0 ]; then PS1+="\[$GREEN\][\!]\[$RESET\] "; else PS1+="\[$RED\][\!]\[$RESET\] "; fi
+
+  # if logged in via ssh shows the ip of the client
+  if [ -n "$SSH_CLIENT" ]; then 
+    IP=${SSH_CLIENT%% *}
+    PS1+="\[$YELLOW\]("$IP")\[$RESET\]"; 
+  fi
+
+  # debian chroot stuff (take it or leave it)
+  PS1+="${debian_chroot:+($debian_chroot)}"
+
+  # basic information (user@host:path)
+  PS1+="\[$RED$BOLD\]\u\[$RESET\]@\[$RED$BOLD\]\h\[$RESET\]:\[$BLUE\]\w\[$RESET\] "
+
+  
   # prompt $ or # for root
   PS1+="\$ "
 }
diff --git a/ratpoison/.ratpoisonrc b/ratpoison/.ratpoisonrc
index d76477c..513b887 100644
--- a/ratpoison/.ratpoisonrc
+++ b/ratpoison/.ratpoisonrc
@@ -10,4 +10,4 @@ bind t time
 bind l ratclick 1
 bind v ratclick 2
 
-bind $ exec ~/.local/bin/suspend
+bind dollar exec ~/.local/bin/suspend
diff --git a/vimperator/.vimperatorrc b/vimperator/.vimperatorrc
index 833df66..5d02f6f 100644
--- a/vimperator/.vimperatorrc
+++ b/vimperator/.vimperatorrc
@@ -1,6 +1,7 @@
 "3.14.0 (created: 2016/06/07 23:58:16)
 
 set defsearch=duckduckgo
+js services.services.autoCompleteSearch.class_="@mozilla.org/autocomplete/search;1?name=unifiedcomplete"
 source! /home/max/.vimperatorrc.local
 
-" vim: set ft=vimperator:
\ No newline at end of file
+" vim: set ft=vimperator:
-- 
2.45.2