mirror of
https://github.com/NaomiAmethyst/dots.git
synced 2025-04-13 09:30:06 +00:00
Merge branch 'master' of majnematic.com:davesdots
This commit is contained in:
commit
71410318b9
2 changed files with 1 additions and 3 deletions
|
@ -5,10 +5,8 @@ for dircolors in gdircolors dircolors ; do
|
||||||
dircolor_text=''
|
dircolor_text=''
|
||||||
if [ -f "${HOME}/.dir_colors" ] ; then
|
if [ -f "${HOME}/.dir_colors" ] ; then
|
||||||
dircolor_text=`cat "${HOME}/.dir_colors"`
|
dircolor_text=`cat "${HOME}/.dir_colors"`
|
||||||
eval `$dircolors -b "${HOME}/.dir_colors"`
|
|
||||||
elif [ -f /etc/DIR_COLORS ] ; then
|
elif [ -f /etc/DIR_COLORS ] ; then
|
||||||
dircolor_text=`cat /etc/DIR_COLORS`
|
dircolor_text=`cat /etc/DIR_COLORS`
|
||||||
eval `$dircolors -b /etc/DIR_COLORS`
|
|
||||||
fi
|
fi
|
||||||
|
|
||||||
if $dircolors --version 2>/dev/null | grep GNU >/dev/null 2>&1 ; then
|
if $dircolors --version 2>/dev/null | grep GNU >/dev/null 2>&1 ; then
|
||||||
|
|
2
vimrc
2
vimrc
|
@ -3,7 +3,7 @@
|
||||||
" Original author: Saleem Abdulrasool <compnerd@compnerd.org>
|
" Original author: Saleem Abdulrasool <compnerd@compnerd.org>
|
||||||
" vim: set ts=3 sw=3 et nowrap:
|
" vim: set ts=3 sw=3 et nowrap:
|
||||||
|
|
||||||
if has ('multi_byte') " Make sure we have unicode support
|
if has('multi_byte') " Make sure we have unicode support
|
||||||
scriptencoding utf-8 " This file is in UTF-8
|
scriptencoding utf-8 " This file is in UTF-8
|
||||||
|
|
||||||
" ---- Terminal Setup ----
|
" ---- Terminal Setup ----
|
||||||
|
|
Loading…
Add table
Reference in a new issue