From 3f56b6e0a6bbfcbb9e432d4547e0fdc4b8c9a710 Mon Sep 17 00:00:00 2001
From: danix <danix@danix.xyz>
Date: Fri, 30 Oct 2020 11:53:53 +0100
Subject: [PATCH] Fixed coloring issue with URxvt and vim

modificato:             Xresources
modificato:             bashrc
---
 Xresources | 27 ++++++++---------
 bashrc     | 88 +++++++++++++++++++++++++++++++++++-------------------
 2 files changed, 70 insertions(+), 45 deletions(-)

diff --git a/Xresources b/Xresources
index e147af6..f814b41 100644
--- a/Xresources
+++ b/Xresources
@@ -6,22 +6,19 @@ Xft.autohint: false
 Xft.hintstyle: hintslight
 Xft.lcdfilter: lcddefault
 
-XTerm*pointerColor: #16A085
+XTerm*pointerColor: #64b5f6
 XTerm*faceName: Fixed
 XTerm*faceSize: 11
 
-*background:            #272827
-*foreground:            #657b83
-*fading:                15
-*fadeColor:             black
-*cursorColor:           #16A085
-*pointerColorBackground:#2B2C2B
-*pointerColorForeground:#16A085
 
 ! special
 *.foreground:   #f5f5f5
 *.background:   #303030
-*.cursorColor:  #f5f5f5
+*.fading:                15
+*.fadeColor:             #303030
+*.cursorColor:           #64b5f6
+*.pointerColorBackground:#303030
+*.pointerColorForeground:#64b5f6
 
 ! black
 *.color0:       #303030
@@ -61,11 +58,13 @@ XTerm*foreground: #f5f5f5
 XTerm*reverseVideo: on
 XTerm*selectToClipboard: true
 
-URxvt*termName: rxvt-256color
-URxvt.font: xft:Droid Sans Mono for Powerline:size=10,style=regular
+URxvt*termName: rxvt-unicode-256color
+URxvt.font: xft:Inconsolata:Bold:pixelsize=14
+URxvt.boldFont: xft:Inconsolata:Black:pixelsize=14
 URxvt.geometry: 120x30
 URxvt.depth: 32
-URxvt.background:	[80]#303030
+URxvt.letterSpace: 1
+URxvt.background:	[90]#303030
 URxvt*scrollBar:                      false
 URxvt*mouseWheelScrollPage:           false
 URxvt*cursorBlink:                    true
@@ -75,6 +74,6 @@ URxvt*cursorColor:		      #f5f5f5
 URxvt*saveLines:                      5000
 URxvt.internalBorder: 1
 
-URxvt.colorIT:      #81c784
+URxvt.colorIT:      #64b5f6
 URxvt.colorBD:      #f5f5f5
-URxvt.colorUL:      #7986cb
+URxvt.colorUL:      #1976d2
diff --git a/bashrc b/bashrc
index 776707b..f6a2be9 100644
--- a/bashrc
+++ b/bashrc
@@ -8,43 +8,51 @@ if [ -f /etc/profile.d/bash_completion.sh ]; then
  . /etc/profile.d/bash_completion.sh
 fi
 
-# actual theme "MATERIAL DARK"
-#if [ "$TERM" = "linux" ]; then
-#    echo -en "\e]P0303030"
-#    echo -en "\e]P1d32f2f"
-#    echo -en "\e]P2388e3c"
-#    echo -en "\e]P3f57c00"
-#    echo -en "\e]P4303f9f"
-#    echo -en "\e]P5c51162"
-#    echo -en "\e]P61976d2"
-#    echo -en "\e]P7bdbdbd"
-#    echo -en "\e]P8424242"
-#    echo -en "\e]P9e57373"
-#    echo -en "\e]PA81c784"
-#    echo -en "\e]PBffb74d"
-#    echo -en "\e]PC7986cb"
-#    echo -en "\e]PDff4081"
-#    echo -en "\e]PE64b5f6"
-#    echo -en "\e]PFf5f5f5"
-#    clear
-#fi
-
 user_color=32m
 if [ ${UID} -eq 0 ]
 then
         user_color=31m
 fi
 
-PS1='[\[\e[$user_color\]\u\[\e[37m\]@\[\e[34m\]\h \[\e[37m\]- \w] \d \t\n$(__git_ps1)\\$ '
-
-case "$TERM" in
-    xterm*|*rxvt*)
-	    PROMPT_COMMAND='echo -ne "\033]0;${USER}@`echo $HOSTNAME|cut -d"." -f1`: ${PWD}\007"'
-        ;;
-    *)
-	    PROMPT_COMMAND=""
-        ;;
-esac
+bash_prompt() {
+    local NONE="\[\033[0m\]"    # unsets color to term's fg color
+    
+    # regular colors
+    local K="\[\033[0;30m\]"    # black
+    local R="\[\033[0;31m\]"    # red
+    local G="\[\033[0;32m\]"    # green
+    local Y="\[\033[0;33m\]"    # yellow
+    local B="\[\033[0;34m\]"    # blue
+    local M="\[\033[0;35m\]"    # magenta
+    local C="\[\033[0;36m\]"    # cyan
+    local W="\[\033[0;37m\]"    # white
+    
+    # emphasized (bolded) colors
+    local EMK="\[\033[1;30m\]"
+    local EMR="\[\033[1;31m\]"
+    local EMG="\[\033[1;32m\]"
+    local EMY="\[\033[1;33m\]"
+    local EMB="\[\033[1;34m\]"
+    local EMM="\[\033[1;35m\]"
+    local EMC="\[\033[1;36m\]"
+    local EMW="\[\033[1;37m\]"
+    
+    # background colors
+    local BGK="\[\033[40m\]"
+    local BGR="\[\033[41m\]"
+    local BGG="\[\033[42m\]"
+    local BGY="\[\033[43m\]"
+    local BGB="\[\033[44m\]"
+    local BGM="\[\033[45m\]"
+    local BGC="\[\033[46m\]"
+    local BGW="\[\033[47m\]"
+    
+    local UC=$EMG                 # user's color
+    [ $UID -eq "0" ] && UC=$EMR   # root's color
+    
+    PS1="${UC}\u ${NONE}@ ${EMB}\h ${NONE}{ ${M}\d ${NONE}} ${G}[ ${NONE}\w ${G}] ${NONE}\n\# ${UC}\\$> ${NONE}"
+}
+bash_prompt
 
 alias su="su -"
 alias ls="ls --color -lh"
@@ -59,6 +67,18 @@ alias df="df -h"
 alias du="du -sh"
 alias diff='diff --color=auto'
 alias grep='grep --color=auto'
+alias path='(IFS=:;ls -1d $PATH |  nl)'
+alias hf='history|grep'
+
+# history as big as possible!!
+HISTSIZE=1000000
+HISTFILESIZE=2000000
+HISTIGNORE='hf *'
+# unix.stackexchange.com/a/18443
+# history: erase duplicates...
+HISTCONTROL=ignoreboth:erasedups
+shopt -s histappend
+
 
 
 export PATH=~/.local/bin:~/bin:$PATH
@@ -106,3 +126,9 @@ if [ -x "$(which gpg-connect-agent)" ]; then
 	gpg-connect-agent updatestartuptty /bye >& /dev/null
 fi
 
+mount-fs () {
+    ( echo Filesystem Mountpoint Fstype;
+      mount | \grep -E '^[^[:lower:]_-]+' | awk '{print $1,$3,$5}'
+    ) | column -t
+}
+
-- 
2.20.1