new fonts and colors

6 files changed, 77 insertions, 55 deletions

diff --git a/.Xresources b/.Xresources
index 64b6d06..efd79a1 100644
--- a/.Xresources
+++ b/.Xresources
@@ -1,55 +1,29 @@
-URxvt.iconFile: /usr/share/icons/Faenza/apps/scalable/urxvt.svg
-URxvt.transparent: false
-!URxvt.shading: 40  // 0 to 99 darkens, 101 to 200 lightens
-URxvt.scrollBar: off
-URxvt.font: xft:cure:size=9
-URxvt.perl-ext-common:default,url-select,keyboard-select,clipboard,autocomplete-ALL-the-things,
-URxvt.keysym.M-u:perl:url-select:select_next
-URxvt.keysym.M-slash:  perl:aAtt:complete
-URxvt.urlLauncher:firefox
-URvxt.url-select.button: 1
-URxvt.underlineURLs:true
-URxvt.keysym.M-Escape: perl:keyboard-select:activate
-URxvt.keysym.M-c:   perl:clipboard:copy
-URxvt.keysym.M-v:   perl:clipboard:paste
-URxvt.keysym.M-C-v: perl:clipboard:paste_escaped
-URxvt.clipboard.copycmd:    xsel -ib
-URxvt.clipboard.pastecmd:   xsel -ob
-!AMBIANCE
-URxvt*background:       #222D32
-URxvt.foreground:        #F2F1F0
-URxvt.cursorColor:       #F07746
-
 !black
-/* *color0: #222D32 */
-*color0: #182024
+*color0: #111A1F
 *color8: #666666
 !red
-*color1: #E84F4F
+*color1: #FF8f40
 *color9: #D23D3D
 !green
-/* *color2: #B7CE42 */
-/* *color10: #BDE077 */
-*color2: #19B596
+*color2: #8D7856
 *color10: #19B596
 !yellow
-/* *color3: #C4E969 */
-/* *color11: #C4E969 */
-*color3: #EADAB1
+*color3: #9B9257
 *color11: #EBCB88
 !blue
-*color4: #66AABB
+*color4: #6998B3
 *color12: #AACCBB
 !magenta
 *color5: #B7416E
 *color13: #E16A98
 !cyan
-*color6: #6D878D
+*color6: #738C9C
 *color14: #42717B
 !white
-*color7: #F2F1F0
-*color15: #F2F1F0
-
+*color7: #C0C7Ca
+*color15: #C0C7Ca
+!st terminal
+st.alpha: 0.92
 ! SXIV COLORS
-Sxiv.background: #202020
-Sxiv.foreground: #565656
+Sxiv.background: #111A1F
+Sxiv.foreground: #9B9257
diff --git a/.config/fontconfig/fonts.conf b/.config/fontconfig/fonts.conf
index a11d3ba..ee20220 100644
--- a/.config/fontconfig/fonts.conf
+++ b/.config/fontconfig/fonts.conf
@@ -28,7 +28,7 @@
 	<alias>
 		<family>monospace</family>
 		<prefer>
-			<family>Brutalist Mono</family>
+			<family>Maison Mono</family>
 			<family>Liberation Mono</family>
 		</prefer>
 	</alias>
diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim
index a06a92c..cc72393 100755
--- a/.config/nvim/init.vim
+++ b/.config/nvim/init.vim
@@ -39,6 +39,8 @@ Plug 'romgrk/todoist.nvim', { 'do': ':TodoistInstall' }
 Plug 'hisaknown/deoplete-latex'
 " Turning vim into an R IDE
 Plug 'jalvesaq/Nvim-R'
+" Vim Clap
+Plug 'liuchengxu/vim-clap', { 'do': ':Clap install-binary!' }
 " Vim Sensible
 Plug 'tpope/vim-sensible'
 " Kite copilot
@@ -79,6 +81,8 @@ Plug 'dylanaraps/wal.vim'
 Plug 'arcticicestudio/nord-vim'
 " My personal colorscheme
 Plug 'ChausseBenjamin/friffle-vim'
+" Retro, yet relaxed colorscheme
+Plug 'ryuta69/elly.vim'
 " Vim Fugitive
 Plug 'tpope/vim-fugitive'
 " Vim-Surround
@@ -118,6 +122,7 @@ call plug#end()
 syntax on
 filetype plugin on
 set termguicolors
+set lazyredraw
 set t_Co=256
 set encoding=utf-8
 set path+=** " Provides tab-completion for all file related tasks
@@ -178,6 +183,7 @@ autocmd InsertLeave,TextChanged *.gd,*.ms,*.mom :w! | :execute 'silent AsyncRun
 map <leader>x :w! \| AsyncRun todotable <c-r>% TODO FIXME CHANGED XXX IDEA HACK NOTE REVIEW NB BUG QUESTION COMBAK TEMP<CR><CR>
 " Have dwmblocks automatically recompile and run when you edit this file in
 autocmd BufWritePost ~/Compilation/dwmblocks/config.h !cd ~/Compilation/dwmblocks/; make && sudo make install && { killall -q dwmblocks;setsid dwmblocks & }
+autocmd BufWritePost ~/.Xresources !xrdb -load %
 " Open corresponding .pdf/.html or preview
     map <leader>p :! opout <c-r>%<CR><CR>
 " Open corresponding .pdf/.html or preview
@@ -206,22 +212,22 @@ call matchadd('ColorColumn', '\%81v', 100)
     map <C-j> <C-w>j
     map <C-k> <C-w>k
     map <C-l> <C-w>l
-" Figlet dotfile titles
-command RcTitle .!figlet -s -f big
 " Easily escape terminal mode
 tnoremap <Esc> <C-\><C-n>
-" Pressing shift semicolon was too long:
+" Space is my leader
 nmap <Space> <Leader>
-" Fastest :w in the west
+" Fastest save in the west
 nnoremap <leader>w :w<CR>
+
 " #---Visual Enhancements---# "
-colorscheme friffle
+colorscheme elly
+" colorscheme friffle
 " Remove latex underscore errors
 let g:tex_no_error=1
 " let g:airline_powerline_fonts = 1
 " Lightline config
 let g:lightline = {
-      \ 'colorscheme': 'friffle',
+      \ 'colorscheme': 'elly',
       \ 'active': {
       \   'left': [ [ 'mode', 'paste' ],
       \             [ 'gitbranch', 'readonly', 'filename', 'modified' ] ]
@@ -257,6 +263,22 @@ nmap <leader>gh :diffget //3<CR>
 nmap <leader>gu :diffget //2<CR>
 nmap <leader>gs :G<CR>
 nmap <leader>gc :Gcommit<CR>
+" Todoist icons
+  let todoist = {
+  \ 'icons': {
+  \   'unchecked': ' ',
+  \   'checked':   ' ',
+  \   'loading':   ' ',
+  \   'error':     ' ',
+  \ },
+  \}
+" Todoist with vim Clap
+let clap_provider_todoist = {
+\ 'source': {-> Todoist__listProjects()},
+\ 'sink': 'Todoist',
+\}
+
+
 
 
 " #---Universal Macros---# "
@@ -266,3 +288,4 @@ inoremap ;; <Esc>/<++><CR>"_c4l
 inoremap << «
 inoremap >> »
 " #---Filetype Specific Settings---# "
+set runtimepath^=~/.vim/bundle/todoist.nvim
diff --git a/.config/vifm/colors/elly.vifm b/.config/vifm/colors/elly.vifm
new file mode 100644
index 0000000..d6b0b95
--- /dev/null
+++ b/.config/vifm/colors/elly.vifm
@@ -0,0 +1,26 @@
+" colortheme
+highlight clear
+
+highlight Win cterm=none ctermfg=cyan ctermbg=none
+highlight Directory cterm=bold ctermfg=yellow ctermbg=default
+highlight Link cterm=bold ctermfg=green ctermbg=default
+highlight BrokenLink cterm=bold ctermfg=red ctermbg=default
+highlight Socket cterm=bold ctermfg=magenta ctermbg=default
+highlight Device cterm=bold ctermfg=red ctermbg=default
+highlight Fifo cterm=bold ctermfg=yellow ctermbg=default
+highlight Executable cterm=bold ctermfg=green ctermbg=default
+highlight Selected cterm=bold ctermfg=magenta ctermbg=default
+highlight CurrLine cterm=bold,reverse ctermfg=default ctermbg=default
+highlight TopLine cterm=none ctermfg=black ctermbg=none
+highlight TopLineSel cterm=bold ctermfg=black ctermbg=default
+highlight StatusLine cterm=bold ctermfg=black ctermbg=none
+highlight WildMenu cterm=underline,reverse ctermfg=cyan ctermbg=black
+highlight CmdLine cterm=none ctermfg=cyan ctermbg=none
+highlight ErrorMsg cterm=none ctermfg=red ctermbg=black
+highlight Border cterm=none ctermfg=black ctermbg=none
+highlight JobLine cterm=bold,reverse ctermfg=black ctermbg=cyan
+highlight SuggestBox cterm=bold ctermfg=default ctermbg=default
+highlight CmpMismatch cterm=bold ctermfg=cyan ctermbg=red
+highlight AuxWin cterm=bold,underline,reverse,standout,italic ctermfg=default ctermbg=default
+
+" vim: ft=vim
diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc
index 20dcdb9..4c15dca 100644
--- a/.config/vifm/vifmrc
+++ b/.config/vifm/vifmrc
@@ -38,7 +38,8 @@ set undolevels=100
 set norunexec
 
 " Selected color scheme
-colorscheme minimal
+colorscheme elly
+" colorscheme minimal
 
 " Format for displaying time in file list. For example:
 " TIME_STAMP_FORMAT=%m/%d-%H:%M
@@ -138,7 +139,7 @@ set rulerformat=
 
 " CSV/Excel
 " filetype *.xlsx libreoffice %c %i
-" fileviewer *.csv sed "s/,,,,/,,-,,/g;s/,,/ /g" %c | column -t | sed "s/ - /  /g" | cut -c -%pw
+fileviewer *.csv sed "s/,,,,/,,-,,/g;s/,,/ /g" %c | column -t | sed "s/ - /  /g" | cut -c -%pw
 
 " HTMLs
 fileviewer *.html w3m -dump %c
@@ -226,7 +227,7 @@ nmap q ZQ
 nnoremap , :
 
 " Set highlighted image as wallpaper
-nnoremap bg :!sh ~/.scripts/control/setbg %c &<cr>
+nnoremap bg :!sh $SCRIPTS/setbg %c &<cr>
 
 " Upload highlighted file to 0x0.st and then save url to clipboard
 nnoremap 0x0 :!curl -s -F'file=@%c' https://0x0.st > /dev/null | xclip -sel clip && notify-send "vifm" "File uploaded: $(xclip -o -selection clipboard)" &<cr>
@@ -241,10 +242,6 @@ source ~/.cache/vifm-shortcuts
 " Easily go back home
 nnoremap cd :cd<cr>
 
-
-" Start shell in current directory
-nnoremap s :shell<cr>
-
 " Display sorting dialog
 nnoremap S :sort<cr>
 
@@ -274,7 +271,6 @@ nnoremap x :!/home/siddharth/bin/utils/extract %f &<cr>
 
 " Share Files with dropbox
 nnoremap s :!dbshare %d/%b &<cr>
-nnoremap re :!tmpfunc %d/%b &<cr>
 
 " Make a new directory
 nnoremap mkd :mkdir<space>
diff --git a/.xinitrc b/.xinitrc
index f262bbb..53243c1 100644
--- a/.xinitrc
+++ b/.xinitrc
@@ -5,7 +5,7 @@ remaps &
 dunst &
 unclutter &
 protonmail-bridge --no-window &
-xautolock -time 5 -detectsleep -locker slock &
+xautolock -time 5 -detectsleep -secure -locker /usr/local/bin/slock &
 picom -b &
 echo "" > $HOME/.local/share/newsboat/queue
 echo us > $HOME/.cache/layout
@@ -13,6 +13,9 @@ xrdb -load $HOME/.Xresources
 flashfocus -n 30 -o 0.75 -v ERROR &
 dwmblocks &
 newsup &
-exec	dwm
+while true;
+do
+  exec	dwm
+done
 # exec icewm
 # vim:filetype=sh