From adb30619583d4eff8b6d112be40d42026df597b8 Mon Sep 17 00:00:00 2001 From: Shubham Saini Date: Thu, 11 Jun 2020 18:19:32 +0530 Subject: changed colorscheme & vim status --- alacritty/.config/alacritty/alacritty.yml | 40 ++++---- nvim/.config/nvim/colors/jellybeans.vim | 2 +- nvim/.config/nvim/init.vim | 151 +++++++++++++++++++++++++++--- spectrwm/.config/spectrwm/spectrwm.conf | 6 +- x/.Xresources | 141 +++++++++++++--------------- x/.xinitrc | 5 - 6 files changed, 227 insertions(+), 118 deletions(-) diff --git a/alacritty/.config/alacritty/alacritty.yml b/alacritty/.config/alacritty/alacritty.yml index 162fd9c..a4c4d06 100644 --- a/alacritty/.config/alacritty/alacritty.yml +++ b/alacritty/.config/alacritty/alacritty.yml @@ -2,41 +2,41 @@ colors: # Default colors primary: background: '0x000000' - foreground: '0xc0c5ce' + foreground: '0xeeffff' # Normal colors normal: - black: '0x2b303b' - red: '0xbf616a' - green: '0xa3be8c' - yellow: '0xebcb8b' - blue: '0x8fa1b3' - magenta: '0xb48ead' - cyan: '0x96b5b4' - white: '0xc0c5ce' + black: '0x000000' + red: '0xf07178' + green: '0x13ca91' + yellow: '0x00fdb4' + blue: '0x7898fb' + magenta: '0xff3299' + cyan: '0x79ffe1' + white: '0xeeffff' # Bright colors bright: - black: '0x65737e' - red: '0xbf616a' - green: '0xa3be8c' - yellow: '0xebcb8b' - blue: '0x8fa1b3' - magenta: '0xb48ead' - cyan: '0x96b5b4' - white: '0xeff1f5' + black: '0x4a4a4a' + red: '0xf78c6c' + green: '0x303030' + yellow: '0x353535' + blue: '0x787878' + magenta: '0xeeffff' + cyan: '0xff5370' + white: '0xffffff' background_opacity: 1.0 font: normal: - family: "Hermit" + family: "Input Mono" style: Regular bold: - family: "Hermit" + family: "Input Mono" style: Bold italic: - family: "Hermit" + family: "Input Mono" style: Italic # Point size diff --git a/nvim/.config/nvim/colors/jellybeans.vim b/nvim/.config/nvim/colors/jellybeans.vim index bb57c28..73a0d98 100644 --- a/nvim/.config/nvim/colors/jellybeans.vim +++ b/nvim/.config/nvim/colors/jellybeans.vim @@ -88,7 +88,7 @@ endif " - g:jellybeans_use_gui_italics (default = 1) " - g:jellybeans_use_term_italics (default = 0) -let s:background_color = "070707" +let s:background_color = "000000" if exists("g:jellybeans_overrides") let s:overrides = g:jellybeans_overrides diff --git a/nvim/.config/nvim/init.vim b/nvim/.config/nvim/init.vim index c61ef87..ecb1c98 100644 --- a/nvim/.config/nvim/init.vim +++ b/nvim/.config/nvim/init.vim @@ -35,7 +35,7 @@ set shiftwidth=4 " number of spaces to use for autoindent set expandtab " tabs are space set autoindent set copyindent " copy indent from the previous line -colorscheme jellybeans +colorscheme bloodbath "hi Normal ctermbg=16 guibg=#000000 "hi LineNr ctermbg=16 guibg=#000000 @@ -112,15 +112,140 @@ map l nnoremap S :%s//gI "statusbar -hi Comment cterm=italic -hi CursorLine guibg=#2b2b2b -set statusline= -set statusline +=%1*\ %n\ %* "buffer number -set statusline +=%5*%{&ff}%* "file format -set statusline +=%3*%y%* "file type -set statusline +=%4*\ %<%F%* "full path -set statusline +=%2*%m%* "modified flag -set statusline +=%1*%=%5l%* "current line -set statusline +=%2*/%L%* "total lines -set statusline +=%1*%4v\ %* "virtual column number -set statusline +=%2*0x%04B\ %* "character under cursor +scriptencoding utf-8 + +" statusline + +let g:currentmode={ + \ 'n' : 'NORMAL ', + \ 'no' : 'N·OPERATOR PENDING ', + \ 'v' : 'VISUAL ', + \ 'V' : 'V·LINE ', + \ '' : 'V·BLOCK ', + \ 's' : 'SELECT ', + \ 'S' : 'S·LINE ', + \ '' : 'S·BLOCK ', + \ 'i' : 'INSERT ', + \ 'R' : 'REPLACE ', + \ 'Rv' : 'V·REPLACE ', + \ 'c' : 'COMMAND ', + \ 'cv' : 'VIM EX ', + \ 'ce' : 'EX ', + \ 'r' : 'PROMPT ', + \ 'rm' : 'MORE ', + \ 'r?' : 'CONFIRM ', + \ '!' : 'SHELL ', + \ 't' : 'TERMINAL '} + +hi PrimaryBlock ctermfg=00 ctermbg=6 +hi SecondaryBlock ctermfg=07 ctermbg=10 +hi Blanks ctermfg=00 ctermbg=11 + +hi User1 ctermfg=01 ctermbg=0 +hi User2 ctermfg=02 ctermbg=0 +hi User3 ctermfg=03 ctermbg=0 +hi User4 ctermfg=04 ctermbg=0 +hi User5 ctermfg=05 ctermbg=0 +hi User6 ctermfg=06 ctermbg=0 +hi User7 ctermfg=07 ctermbg=0 +hi User8 ctermfg=08 ctermbg=0 +hi User9 ctermfg=09 ctermbg=0 + +highlight EndOfBuffer ctermfg=black ctermbg=black + +function! GitBranch() + return system("git rev-parse --abbrev-ref HEAD 2>/dev/null | tr -d '\n'") +endfunction + +function! StatuslineGit() + let l:branchname = GitBranch() + return strlen(l:branchname) > 0?'* '.l:branchname.' ':'' +endfunction + +function! ReadOnly() abort + if !&modifiable && &readonly + return ' RO' + elseif &modifiable && &readonly + return 'RO' + elseif !&modifiable && !&readonly + return '' + else + return '' + endif +endfunction + +function! Filepath() abort + let l:basename = expand('%:h') + let l:filename = expand('%:t') + let l:extension = expand('%:e') + let l:prefix = (l:basename ==# '' || l:basename ==# '.') ? + \ '' : substitute(l:basename . '/', '\C^' . $HOME, '~', '') + + if empty(l:prefix) && empty(l:filename) + return printf('%%8*%%f%%*%s %%m%%*', '%8*') + elseif empty(l:prefix) + return printf('%%8*%%f%%*%s %%m%%*', '%6*') + else + return printf('%%8*%s%%*%s%s%%*', l:prefix, &modified ? '%6*' : '%8*', l:filename) + endif +endfunction + +function! LinterStatus() abort + let info = get(b:, 'coc_diagnostic_info', {}) + if empty(info) | return '' | endif + let msgs = [] + if get(info, 'error', 0) + call add(msgs, printf('%%5*%s×%%*', info['error'])) + endif + if get(info, 'warning', 0) + call add(msgs, printf('%%3*%s!%%*', info['warning'])) + endif + return join(msgs, ' ') +endfunction + +function! StatusLine(mode) abort + let l:line='' + + " help or man pages + if &filetype ==# 'help' || &filetype ==# 'man' + let l:line.=' %#StatusLineNC# ['. &filetype .'] %f ' + return l:line + endif + + " active + if a:mode ==# 'active' + let l:line.='%7*%{StatuslineGit()}' + let l:line.='%<' + let l:line.=Filepath() + + let l:line.='%5*' + let l:line.=' %{ReadOnly()} %w%*' + let l:line.='%9* %=%*' + + let l:line.='%7* %l,%c %*' + let l:line.='%8* %{g:currentmode[mode()]}%*' + let l:line.=' ' + let l:line.=LinterStatus() + let l:line.=' ' + let l:line.='%8*'. &filetype + + else + " inactive + let l:line.='%#Blanks#' + let l:line.='%f %5*%m%*' + let l:line.='%#Blanks# %=%*' + endif + + let l:line.='%*' + + return l:line +endfunction + +set statusline=%!StatusLine('active') +augroup MyStatusLine + autocmd! + autocmd WinEnter * setl statusline=%!StatusLine('active') + autocmd WinLeave * setl statusline=%!StatusLine('inactive') +augroup END + + diff --git a/spectrwm/.config/spectrwm/spectrwm.conf b/spectrwm/.config/spectrwm/spectrwm.conf index ebb1b4a..0ff36dc 100644 --- a/spectrwm/.config/spectrwm/spectrwm.conf +++ b/spectrwm/.config/spectrwm/spectrwm.conf @@ -34,11 +34,11 @@ bar_enabled = 1 bar_border_width = 0 bar_border[1] = rgb:00/80/80 bar_border_unfocus[1] = rgb:00/40/40 -bar_color[1] = rgb:07/07/07 +bar_color[1] = rgb:00/00/00 bar_color_selected[1] = rgb:00/80/80 -bar_font_color[1] = rgb:b5/b5/b5, rgb:73/73/73 +bar_font_color[1] = rgb:ee/ff/ff, rgb:78/78/78 bar_font_color_selected = black -bar_font = Hermit:size=9.5:antialias=true:autohint=true:autohint=true:lcdfilter=lcddefault:rgba=rgb +bar_font = Hermit:pixelsize=12.5:antialias=true:autohint=true:autohint=true:lcdfilter=lcddefault:rgba=rgb bar_action = ~/.config/spectrwm/statusbar bar_action_expand = 1 bar_justify = left diff --git a/x/.Xresources b/x/.Xresources index a8c0489..2985bba 100644 --- a/x/.Xresources +++ b/x/.Xresources @@ -1,87 +1,76 @@ -URxvt.urgentOnBell: off -URxvt.visualBell: false -URxvt.iso14755: false -URxvt.iso14755_52: off -URxvt.meta8: false -URxvt.depth: 32 -URxvt.metaSendsEscape: true -URxvt.scrollBar: off -URxvt.cursorBlink: true -URxvt.cursorUnderline: true -URxvt.saveLines: 10000 -URxvt.scrollTtyOutput: false -URxvt.scrollWithBuffer: true -URxvt.scrollTtyKeypress: true +! ------------------------------------------------------------------------------ +! Colors +! ------------------------------------------------------------------------------ +! +!------------------------------------------------------------------------------ -URxvt.font: xft:Hermit:pixelsize=12:style=medium:antialias=true -URxvt.boldFont: xft:Hermit:pixelsize=12:style=bold:antialias=true -URxvt.italicFont: xft:Hermit:pixelsize=12:style=italic:antialias=true -URxvt.letterSpace: 1 -urxvt*termName: rxvt-256color -urxvt*scrollBar: false -urxvt*matcher.button: 1 -urxvt.transparent: false -!urxvt.boldFont: -Xft*dpi: 96 -Xft*antialias: true -Xft*hinting: true -Xft*hintstyle: hintfull -Xft.lcdfilter: lcddefault -Xft*rgba: rgb -URxvt*cursorUnderline: true -URxvt*geometry: 85x20 -*internalBorder: 15 -URxvt*fading: 0 -URxvt*tintColor: #ffffff -URxvt*shading: 0 -URxvt*inheritPixmap: False +#define base00 #000000 +#define base01 #303030 +#define base02 #353535 +#define base03 #4A4A4A +#define base04 #787878 +#define base05 #EEFFFF +#define base06 #EEFFFF +#define base07 #FFFFFF +#define base08 #F07178 +#define base09 #F78C6C +#define base0A #00fdb4 +#define base0B #13CA91 +#define base0C #79ffe1 +#define base0D #7898FB +#define base0E #ff3299 +#define base0F #FF5370 -! special -*.foreground: #c6c8d1 -*.background: #000000 -*.cursorColor: #c6c8d1 +! URxvt +! ------------------------------------------------------------------------------ -! black -*.color0: #161821 -*.color8: #6b7089 +*foreground: base05 +*background: base00 +*cursorColor: base05 -! red -*.color1: #e27878 -*.color9: #e98989 +*color0: base00 +*color1: base08 +*color2: base0B +*color3: base0A +*color4: base0D +*color5: base0E +*color6: base0C +*color7: base05 -! green -*.color2: #b4be82 -*.color10: #c0ca8e +*color8: base03 +*color9: base09 +*color10: base01 +*color11: base02 +*color12: base04 +*color13: base06 +*color14: base0F +*color15: base07 -! yellow -*.color3: #e2a478 -*.color11: #e9b189 +URxvt.cursorBlink : 1 +URxvt.font :xft:Input Mono:pixelsize=12.5:style=Regular \ + xft:DejaVu Sans Mono:size=12.5:style=Medium -! blue -*.color4: #84a0c6 -*.color12: #91acd1 +URxvt.italicFont :xft:Input Mono:pixelsize=12.5:style=Italic +URxvt.boldFont :xft:Input Mono:pixelsize=12.5:style=Bold -! magenta -*.color5: #a093c7 -*.color13: #ada0d3 +URxvt.lineSpace : 0 +URxvt.letterSpace : -1 +URxvt.scrollBar : false +URxvt.internalBorder : 25 +URxvt.cursorUnderline : false +URxvt.geometry : 70x35 +URxvt.thickness : 5 +URxvt.titleBar : false +URxvt.intensityStyles : false -! cyan -*.color6: #89b8c2 -*.color14: #95c4ce -! white -*.color7: #c6c8d1 -*.color15: #d2d4de +URxvt.perl-ext-common : default,matcher +URxvt.url-launcher : firefox-bin +URxvt.matcher.button : 1 -! Perls -URxvt.perl-ext-common : default,matcher,keyboard-select,resize-font -URxvt.resize-font.step: 1 -URxvt.keysym.M-Escape : perl:keyboard-select:activate -URxvt.keysym.M-u : perl:url-select:select_next -URxvt.keysym.M-s : perl:keyboard-select:search -!URxvt.perl-ext-common : tabbed,default,matcher -Urxvt.perl-lib : /usr/lib64/urxvt/perl/ -URxvt.url-select.launcher : firefox -URxvt.url-select.autocopy : true -URxvt.url-select.underline : true -URxvt.url-select.button: 1 +Xft.autohint: 1 +Xft.antialias: 1 +Xft.lcdfilter: lcddefault +Xft.hinting: true +Xft.rgba: rgb +Xft.dpi: 96 diff --git a/x/.xinitrc b/x/.xinitrc index af968d5..97028bf 100644 --- a/x/.xinitrc +++ b/x/.xinitrc @@ -2,9 +2,4 @@ #.xinitrc xset b off & xset s 600 & -# ~/bin/xss & -# ~/.fehbg & -# picom 2>/dev/null & -# dwmbar & - exec dbus-launch --exit-with-session spectrwm -- cgit v1.2.3