bashrc, vimrc and Xdefaults update

3 files changed, 54 insertions, 9 deletions

diff --git a/.Xdefaults b/.Xdefaults
index 64d2594..36874e7 100644
--- a/.Xdefaults
+++ b/.Xdefaults
@@ -1,8 +1,26 @@
-xterm*Background:	black
-xterm*Foreground:	white
 xterm*cursorColor:	yellow
 xterm*pointerShape:	xterm
 xterm*pointerColor:	magenta
 xterm*faceSize: 12
 xterm*faceName: wts11
 Sxiv.background: #000000
+
+! Dracula Xresources palette
+*.foreground: #F8F8F2
+*.background: #282A36
+*.color0:     #000000
+*.color8:     #4D4D4D
+*.color1:     #FF5555
+*.color9:     #FF6E67
+*.color2:     #50FA7B
+*.color10:    #5AF78E
+*.color3:     #F1FA8C
+*.color11:    #F4F99D
+*.color4:     #BD93F9
+*.color12:    #CAA9FA
+*.color5:     #FF79C6
+*.color13:    #FF92D0
+*.color6:     #8BE9FD
+*.color14:    #9AEDFE
+*.color7:     #BFBFBF
+*.color15:    #E6E6E6
diff --git a/.bashrc b/.bashrc
index cb17c12..9a75b23 100644
--- a/.bashrc
+++ b/.bashrc
@@ -8,7 +8,7 @@ shopt -s autocd cdspell checkjobs extglob
 
 HISTSIZE= HISTFILESIZE= # Infinite history.
 
-PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 0)\]\t \[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\W\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]" ; export PS1
+PS1="\[$(tput bold)\]\[$(tput setaf 1)\][\[$(tput setaf 3)\]\u\[$(tput setaf 2)\]@\[$(tput setaf 4)\]\h \[$(tput setaf 5)\]\w\[$(tput setaf 1)\]]\[$(tput setaf 7)\]\\$ \[$(tput sgr0)\]" ; export PS1
 
 [ -f "$HOME/.config/aliasrc" ] && source "$HOME/.config/aliasrc"
 
@@ -27,3 +27,19 @@ LS_COLORS='rs=0:di=01;34:ln=01;36:mh=00:pi=40;33:so=01;35:do=01;35:bd=40;33;01:c
 export LS_COLORS
 
 HISTCONTROL="ignorespace"
+
+# >>> conda initialize >>>
+# !! Contents within this block are managed by 'conda init' !!
+__conda_setup="$('/home/mas/miniconda3/bin/conda' 'shell.bash' 'hook' 2> /dev/null)"
+if [ $? -eq 0 ]; then
+    eval "$__conda_setup"
+else
+    if [ -f "/home/mas/miniconda3/etc/profile.d/conda.sh" ]; then
+        . "/home/mas/miniconda3/etc/profile.d/conda.sh"
+    else
+        export PATH="/home/mas/miniconda3/bin:$PATH"
+    fi
+fi
+unset __conda_setup
+# <<< conda initialize <<<
+
diff --git a/.vimrc b/.vimrc
index 73e50fc..49952df 100644
--- a/.vimrc
+++ b/.vimrc
@@ -29,7 +29,6 @@ set clipboard=unnamedplus
 	autocmd BufWritePost *Xresources,*Xdefaults !xrdb %
 
 
-	colorscheme delek
 
 call plug#begin('~/.vim/plugged')
 
@@ -41,6 +40,11 @@ Plug 'scrooloose/nerdtree', { 'on': ['NERDTreeToggle', 'NERDTreeFind'] }
 Plug 'w0rp/ale'
 Plug 'ctrlpvim/ctrlp.vim'
 
+" Theme
+Plug 'dracula/vim', { 'as': 'dracula' }
+" Bottom line
+Plug 'itchyny/lightline.vim'
+
 call plug#end()
 "Ctrlp Settings {{{
 
@@ -97,13 +101,13 @@ let g:ale_linters = {
 
 let g:deoplete#enable_at_startup = 1
 
-let g:deoplete#auto_complete_start_length = 2
-let g:deoplete#sources = {}
-let g:deoplete#sources._=['buffer', 'ultisnips', 'file', 'dictionary']
-let g:deoplete#sources.javascript = ['tern', 'omni', 'file', 'buffer', 'ultisnips']
+let g:deoplete#custom#auto_complete_start_length = 2
+let g:deoplete#custom#sources = {}
+let g:deoplete#custom#sources._=['buffer', 'ultisnips', 'file', 'dictionary']
+let g:deoplete#custom#sources.javascript = ['tern', 'omni', 'file', 'buffer', 'ultisnips']
 
 " Use smartcase.
-let g:deoplete#enable_smart_case = 1
+let g:deoplete#custom#enable_smart_case = 1
 
 
 "set completeopt-=preview
@@ -141,3 +145,10 @@ set errorformat=%A%f:%l:\ %m,%-Z%p^,%-C.%#
 autocmd FileType java setlocal omnifunc=javacomplete#Complete
 autocmd FileType java JCEnable
 " }}}
+
+	colorscheme dracula
+
+let g:lightline = {
+      \ 'colorscheme': 'dracula',
+      \ }
+