From: Jannik Zander Date: Sun, 29 May 2016 13:23:52 +0000 (+0200) Subject: Add XDG env X-Git-Url: https://git.zndr.dk/?a=commitdiff_plain;h=b37f729d7959e940c8fd59584acdbd99d0b22f7b;p=dotfiles.git Add XDG env --- diff --git a/.config/profile/environ.sh b/.config/profile/environ.sh index 735fa58..1d1c676 100644 --- a/.config/profile/environ.sh +++ b/.config/profile/environ.sh @@ -17,10 +17,15 @@ export HISTCONTROL=ignoreboth; # Make some commands not show up in history export HISTIGNORE="ls:cd:cd -:pwd:exit:date:* --help"; -# Prefer US English and use UTF-8 +# Prefer US language and UTF-8 export LANG="en_US.UTF-8"; -export LC_ALL="en_US.UTF-8"; - +export LC_ALL="en_DK.UTF-8"; +#export LC_NUMERIC=en_DK.UTF-8 +#export LC_TIME=en_DK.UTF-8 +#export LC_MONETARY=en_DK.UTF-8 +#export LC_PAPER=en_DK.UTF-8 +#export LC_MEASUREMENT=en_DK.UTF-8 +export KEYMAP=us # Highlight section titles in manual pages export LESS_TERMCAP_md="${yellow}"; @@ -32,4 +37,7 @@ export LESS_TERMCAP_md="${yellow}"; # export LESSOPEN="| /usr/bin/src-hilite-lesspipe.sh %s" export LESS=-eFRX - +if [ -f ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs ]; then + . ${XDG_CONFIG_HOME:-~/.config}/user-dirs.dirs + export XDG_DESKTOP_DIR XDG_DOWNLOAD_DIR XDG_TEMPLATES_DIR XDG_PUBLICSHARE_DIR XDG_DOCUMENTS_DIR XDG_MUSIC_DIR XDG_PICTURES_DIR XDG_VIDEOS_DIR + fi diff --git a/.config/profile/prompt.sh b/.config/profile/prompt.sh index db68610..ac2ef30 100644 --- a/.config/profile/prompt.sh +++ b/.config/profile/prompt.sh @@ -57,6 +57,8 @@ set_prompts() yellow="\e[1;33m" fi + fg="$black" + # build the prompt # logged in as root @@ -79,14 +81,14 @@ set_prompts() if [ -n "${BASH_VERSION}" ]; then PS1+=$'\r' # carriage return PS1+="\[$userStyle\]\u" # username - PS1+="\[$reset$white\] at " + PS1+="\[$reset$fg\] at " PS1+="\[$hostStyle\]\h" # host - PS1+="\[$reset$white\] in " + PS1+="\[$reset$fg\] in " PS1+="\[$green\]\w" # working directory # PS1+="\$(prompt_git \"$white on $cyan\")" # git repository details - PS1+="\$(__git_ps1 ' \[${white}\]on \[${cyan}\]%s')"; # on branch + PS1+="\$(__git_ps1 ' \[${fg}\]on \[${cyan}\]%s')"; # on branch PS1+=$'\n' # newline - PS1+="\[$reset$white\]\$ \[$reset\]" # $ (and reset color) + PS1+="\[$reset$fg\]\$ \[$reset\]" # $ (and reset color) PS2="\[${yellow}\]→ " # `→` PS2+="\[${reset}\]" # reset color diff --git a/.config/user-dirs.dirs b/.config/user-dirs.dirs new file mode 100644 index 0000000..0d19da4 --- /dev/null +++ b/.config/user-dirs.dirs @@ -0,0 +1,15 @@ +# This file is written by xdg-user-dirs-update +# If you want to change or add directories, just edit the line you're +# interested in. All local changes will be retained on the next run +# 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/Documents" +XDG_MUSIC_DIR="$HOME/Music" +XDG_PICTURES_DIR="$HOME/Pictures" +XDG_VIDEOS_DIR="$HOME/Videos" diff --git a/.vimrc b/.vimrc index 2906b05..1341693 100644 --- a/.vimrc +++ b/.vimrc @@ -45,7 +45,6 @@ call plug#end() " section: options {{{1 " --------------------- - set autoindent set autoread set autowrite " automatically save before commands like :next and :make @@ -91,7 +90,7 @@ set winaltkeys=no if !has("gui_running") && $display == '' || !has("gui") set mouse= endif -set background=light +set background=dark set number " plugin settings {{{2