From d5bb7254c5e053d8d01918cbdd388907b2ffd30f Mon Sep 17 00:00:00 2001
From: Jannik Zander <jaz@debian.local>
Date: Tue, 23 Jan 2018 00:12:33 -0600
Subject: [PATCH] Debian updates

---
 .config/bash/environ   | 88 ++++++++++++++++++++++++++++++++----------
 .config/user-dirs.dirs | 10 ++---
 .vimrc                 | 10 ++---
 3 files changed, 78 insertions(+), 30 deletions(-)

diff --git a/.config/bash/environ b/.config/bash/environ
index c09ed0e..41015d7 100644
--- a/.config/bash/environ
+++ b/.config/bash/environ
@@ -1,19 +1,54 @@
-# Color terminal
-#if [[ $COLORTERM = gnome-* && $TERM = xterm ]] && infocmp gnome-256color >/dev/null 2>&1; then
-#  export TERM='gnome-256color';
-#elif infocmp xterm-256color >/dev/null 2>&1; then
-#  export TERM='xterm-256color';
-#fi;
-
-# Git completion and prompt
-[ -f /usr/share/git/completion/git-completion.bash ] && . /usr/share/git/completion/git-completion.bash
-[ -f /usr/share/git/completion/git-prompt.sh ]       && . /usr/share/git/completion/git-prompt.sh
-
-export GIT_PS1_SHOWDIRTYSTATE=true
-export GIT_PS1_SHOWCOLORHINTS=true
-export GIT_PS1_UNTRACKEDFILES=true
-export PS1="\u@\h:\w (\[\e[32m\]${__git_ps1_branch_name}\[\e[0m\])\$"
-export PROMPT_COMMAND="__git_ps1 '\u@\h:\w' '\\$ '"
+# set a fancy prompt (non-color, unless we know we "want" color)
+case "$TERM" in
+    xterm-color|*-256color) color_prompt=yes;;
+esac
+
+# uncomment for a colored prompt, if the terminal has the capability; turned
+# off by default to not distract the user: the focus in a terminal window
+# should be on the output of commands, not on the prompt
+#force_color_prompt=yes
+
+if [ -n "$force_color_prompt" ]; then
+    if [ -x /usr/bin/tput ] && tput setaf 1 >&/dev/null; then
+	# We have color support; assume it's compliant with Ecma-48
+	# (ISO/IEC-6429). (Lack of such support is extremely rare, and such
+	# a case would tend to support setf rather than setaf.)
+	color_prompt=yes
+    else
+	color_prompt=
+    fi
+fi
+
+if [ "$color_prompt" = yes ]; then
+    PS1='${debian_chroot:+($debian_chroot)}\[\033[01;32m\]\u@\h\[\033[00m\]:\[\033[01;34m\]\w\[\033[00m\]\$ '
+else
+    PS1='${debian_chroot:+($debian_chroot)}\u@\h:\w\$ '
+fi
+unset color_prompt force_color_prompt
+
+# If this is an xterm set the title to user@host:dir
+case "$TERM" in
+xterm*|rxvt*)
+    PS1="\[\e]0;${debian_chroot:+($debian_chroot)}\u@\h: \w\a\]$PS1"
+    ;;
+*)
+    ;;
+esac
+
+# enable color support of ls and also add handy aliases
+if [ -x /usr/bin/dircolors ]; then
+    test -r ~/.dircolors && eval "$(dircolors -b ~/.dircolors)" || eval "$(dircolors -b)"
+    alias ls='ls --color=auto'
+    #alias dir='dir --color=auto'
+    #alias vdir='vdir --color=auto'
+
+    #alias grep='grep --color=auto'
+    #alias fgrep='fgrep --color=auto'
+    #alias egrep='egrep --color=auto'
+fi
+
+# colored GCC warnings and errors
+#export GCC_COLORS='error=01;31:warning=01;35:note=01;36:caret=01;32:locus=01:quote=01'
 
 # Larger bash history
 export HISTFILESIZE=10000;
@@ -22,7 +57,7 @@ export HISTCONTROL=ignoreboth:erasedups
 export HISTIGNORE="ll:ls:cd:cd -:pwd:exit:date:* --help";
 
 # Whenever displaying the prompt, write the previous line to disk
-export PROMPT_COMMAND="$PROMPT_COMMAND; history -a"
+#export PROMPT_COMMAND="history -a"
 
 # Add keys for github and bitbucket
 #if [ ! -S $HOME/.ssh/ssh_auth_sock ]; then
@@ -42,9 +77,20 @@ export BROWSER='lynx -vikeys -use_mouse'
 
 
 # Prefer US language with SI units (Danish)
-export LANG="en_US.UTF-8";
-export LC_ALL="en_DK.UTF-8";
-export KEYMAP=us
+export LANGUAGE="en_US.UTF-8"
+export LC_CTYPE="en_DK.UTF-8"
+export LC_NUMERIC="en_DK.UTF-8"
+export LC_TIME="en_DK.UTF-8"
+export LC_COLLATE="en_DK.UTF-8"
+export LC_MONETARY="en_DK.UTF-8"
+export LC_MESSAGES="en_DK.UTF-8"
+export LC_PAPER="en_DK.UTF-8"
+export LC_NAME="en_DK.UTF-8"
+export LC_ADDRESS="en_DK.UTF-8"
+export LC_TELEPHONE="en_DK.UTF-8"
+export LC_MEASUREMENT="en_DK.UTF-8"
+export LC_IDENTIFICATION="en_DK.UTF-8"
+KEYMAP=us
 
 # Highlight section titles in manual pages
 export LESS_TERMCAP_md="${yellow}";
@@ -78,3 +124,5 @@ fi
 export USERNAME=$LOGNAME
 export HOSTNAME=`hostname`
 echo Welcome $USERNAME. You are on Server: $HOSTNAME !!!
+
+
diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs
index ddf0c98..45ee7cb 100644
--- a/.config/user-dirs.dirs
+++ b/.config/user-dirs.dirs
@@ -4,12 +4,12 @@
 # Format is XDG_xxx_DIR="$HOME/yyy", where yyy is a shell-escaped
 # homedir-relative path, or XDG_xxx_DIR="/yyy", where /yyy is an
 # absolute path. No other format is supported.
-#
+# 
 XDG_DESKTOP_DIR="$HOME/Desktop"
 XDG_DOWNLOAD_DIR="$HOME/Downloads"
 XDG_TEMPLATES_DIR="$HOME/Templates"
 XDG_PUBLICSHARE_DIR="$HOME/Public"
-XDG_DOCUMENTS_DIR="$HOME/Work/Documents"
-XDG_MUSIC_DIR="$HOME/Work/Music"
-XDG_PICTURES_DIR="$HOME/Work/Pictures"
-XDG_VIDEOS_DIR="$HOME/Work/Videos"
+XDG_DOCUMENTS_DIR="$HOME/"
+XDG_MUSIC_DIR="$HOME/"
+XDG_PICTURES_DIR="$HOME/"
+XDG_VIDEOS_DIR="$HOME/"
diff --git a/.vimrc b/.vimrc
index 81c1ef4..7263fea 100644
--- a/.vimrc
+++ b/.vimrc
@@ -41,7 +41,7 @@ Plug 'michaeljsmith/vim-indent-object'
 "Plug 'mileszs/ack.vim'
 "Plug 'jeetsukumaran/vim-filesearch'
 "Plug 'haya14busa/incsearch.vim'
-Plug 'altercation/vim-colors-solarized'
+"Plug 'altercation/vim-colors-solarized'
 Plug 'editorconfig/editorconfig-vim'
 "Plug 'johnsyweb/vim-makeshift'
 "Plug 'tfnico/vim-gradle'
@@ -342,10 +342,10 @@ if (&t_Co > 2 || has("gui_running")) && has("syntax")
   endif
 endif
 
-colorscheme solarized
-let g:solarized_diffmode="high"
-let g:solarized_termtrans=1
-let g:solarized_menu=0
+"colorscheme solarized
+"let g:solarized_diffmode="high"
+"let g:solarized_termtrans=1
+"let g:solarized_menu=0
 set background=dark
 set t_Co=256
 " }}}1
-- 
2.43.0