From 95012945a13707ec8a479587c74b61850c292181 Mon Sep 17 00:00:00 2001 From: Benjamin Chausse Date: Tue, 1 Dec 2020 16:40:08 -0500 Subject: Figlet headers and more vim spring cleaning --- .Xresources | 15 +++++++++---- .config/mutt/my-configs | 7 +++++- .config/newsboat/urls | 9 +++++++- .config/nvim/init.vim | 47 +++++++------------------------------- .config/todotxt-machine/config | 51 ------------------------------------------ .config/vifm/vifmrc | 7 ++++++ .config/zathura/zathurarc | 11 +++++++-- .local/bin/dwmbar/dwmb-battery | 2 +- .profile | 22 +++++++++--------- .zshrc | 1 + 10 files changed, 62 insertions(+), 110 deletions(-) delete mode 100644 .config/todotxt-machine/config diff --git a/.Xresources b/.Xresources index efd79a1..9266b65 100644 --- a/.Xresources +++ b/.Xresources @@ -1,3 +1,10 @@ +! __ __ +! \ \/ /_ __ ___ ___ ___ _ _ _ __ ___ ___ ___ +! \ /| '__/ _ \/ __|/ _ \| | | | '__/ __/ _ \/ __| +! / \| | | __/\__ \ (_) | |_| | | | (_| __/\__ \ +! /_/\_\_| \___||___/\___/ \__,_|_| \___\___||___/ +! + !black *color0: #111A1F *color8: #666666 @@ -17,13 +24,13 @@ *color5: #B7416E *color13: #E16A98 !cyan -*color6: #738C9C -*color14: #42717B +*color6: #42717B +*color14: #738C9C !white *color7: #C0C7Ca *color15: #C0C7Ca -!st terminal -st.alpha: 0.92 +!other +*.alpha: 0.92 ! SXIV COLORS Sxiv.background: #111A1F Sxiv.foreground: #9B9257 diff --git a/.config/mutt/my-configs b/.config/mutt/my-configs index baa3c51..6bd6f1a 100644 --- a/.config/mutt/my-configs +++ b/.config/mutt/my-configs @@ -1,6 +1,6 @@ # These are my personal configs on top of mutt-wizard. # Add the following line to your muttrc to have them: -# source $HOME/.config/mutt/goobook +# source $HOME/.config/mutt/my-configs # GOOBOOK: # goobook let's you query google for contact information. @@ -17,4 +17,9 @@ set crypt_use_gpgme=yes set crypt_autosign set pgp_auto_decode +# Muttprint: +set print_command="muttprint" +# Dump all headers +# macro index p " " + # vim: filetype=neomuttrc diff --git a/.config/newsboat/urls b/.config/newsboat/urls index e02c348..dff4b3a 100644 --- a/.config/newsboat/urls +++ b/.config/newsboat/urls @@ -1,4 +1,11 @@ -#https://rss.app/feeds/nxTRC66uslhT5E22.xml #---Podcasts---# # +# ____ ____ ____ +# | _ \/ ___/ ___| +# | |_) \___ \___ \ +# | _ < ___) |__) | +# |_| \_\____/____/ +# + +# #--- Podcasts ---# # http://feeds.wnyc.org/science-friday "Podcast" "~Podcast: Science Friday " https://feeds.buzzsprout.com/191338.rss "Podcast" "~Podcast: Our Ludicrous Future (Tim Dodd) " https://carpoolcritics.libsyn.com/rss "Podcast" "~Podcast: Carpool Critics " diff --git a/.config/nvim/init.vim b/.config/nvim/init.vim index cc72393..feb2d66 100755 --- a/.config/nvim/init.vim +++ b/.config/nvim/init.vim @@ -17,17 +17,6 @@ endif " #---Vim Plugins---# " call plug#begin() -" if has('nvim') - " Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } -" else - " Plug 'Shougo/deoplete.nvim' - " Plug 'roxma/nvim-yarp' - " Plug 'roxma/vim-hug-neovim-rpc' -" endif -" Latex Deoplete source -" Plug 'hisaknown/deoplete-latex' -" Comment frames (for comment aesthetics) -Plug 'cometsong/CommentFrame.vim' " Deoplete Plug 'Shougo/deoplete.nvim', { 'do': ':UpdateRemotePlugins' } " Go Deoplete sources @@ -39,12 +28,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 -Plug 'kiteco/vim-plugin' " Using vim to compile arduino code Plug 'stevearc/vim-arduino' " Vim org tables @@ -63,26 +48,20 @@ Plug 'kovetskiy/sxhkd-vim' Plug 'ivyl/vim-bling' " Vim Hard Mode Plug 'wikitopian/hardmode' -" I want to be a python ninja! +" Make vim behave like Jupyter Plug 'metakirby5/codi.vim' -" Quickrun for python -Plug 'thinca/vim-quickrun' " markdown preview vim Plug 'iamcco/markdown-preview.nvim', { 'do': { -> mkdp#util#install() }} " Emmet expansion for html Plug 'mattn/emmet-vim' " html preview Plug 'turbio/bracey.vim' -" VimCompletesMe for VimTex -Plug 'ajh17/VimCompletesMe' -" Xresources colors -Plug 'dylanaraps/wal.vim' -" Nord colors -Plug 'arcticicestudio/nord-vim' -" My personal colorscheme +" My colorscheme Plug 'ChausseBenjamin/friffle-vim' -" Retro, yet relaxed colorscheme +" Elly colorscheme Plug 'ryuta69/elly.vim' +" Nord colorscheme +Plug 'arcticicestudio/nord-vim' " Vim Fugitive Plug 'tpope/vim-fugitive' " Vim-Surround @@ -91,12 +70,6 @@ Plug 'tpope/vim-surround' Plug 'tpope/vim-repeat' " Vimtex Plug 'lervag/vimtex' -" Tags for latex -" Plug 'ludovicchabant/vim-gutentags' -" C developement in vim -Plug 'vim-scripts/c.vim' -" Icons in NERDTree and Airline -Plug 'ryanoasis/vim-devicons' " lightline Plug 'itchyny/lightline.vim' " Commentary @@ -117,7 +90,6 @@ Plug 'dpelle/vim-Grammalecte' Plug 'dpelle/vim-LanguageTool' call plug#end() - " #---Basics/Recomended---# " syntax on filetype plugin on @@ -252,7 +224,9 @@ autocmd BufWritePre * %s/\s\+$//e filetype plugin indent on " Nvim-R send line nmap l -" Nvim folding +" Nvim-R match colorscheme +let rout_follow_colorscheme = 1 +" Nvim-R folding let r_syntax_folding = 1 set foldnestmax=1 " Arduino settings @@ -272,11 +246,6 @@ nmap gc :Gcommit \ 'error': ' ', \ }, \} -" Todoist with vim Clap -let clap_provider_todoist = { -\ 'source': {-> Todoist__listProjects()}, -\ 'sink': 'Todoist', -\} diff --git a/.config/todotxt-machine/config b/.config/todotxt-machine/config deleted file mode 100644 index 1eca896..0000000 --- a/.config/todotxt-machine/config +++ /dev/null @@ -1,51 +0,0 @@ -[settings] -file = ~/Dropbox/TODOtxt/InitialFiles/todo.txt-cli/todo.txt -archive = ~/Dropbox/TODOtxt/InitialFiles/todo.txt-cli/done.txt -auto-save = True -show-toolbar = True -show-filter-panel = False -enable-borders = True -enable-word-wrap = True -colorscheme = myawesometheme -[colorscheme-myawesometheme] -plain=h250 -selected=,h238 -header_todo_count=h37 -header_todo_pending_count=h222 -header_todo_done_count=h188 -header_file=h244 -dialog_background=,h248 -dialog_color=,h240 -dialog_shadow=,h238 -footer=h39,h236 -search_match=h222,h236 -completed=h59 -context=h39 -project=h214 -creation_date=h135 -due_date=h37 -priority_a=h131 -priority_b=h222 -priority_c=h109 -priority_d=h139 -priority_e=h244 -priority_f=h244 -priority_g=h244 -priority_h=h244 -priority_i=h244 -priority_j=h244 -priority_k=h244 -priority_l=h244 -priority_m=h244 -priority_n=h244 -priority_o=h244 -priority_p=h244 -priority_q=h244 -priority_r=h244 -priority_s=h244 -priority_u=h244 -priority_v=h244 -priority_w=h244 -priority_x=h244 -priority_y=h244 -priority_z=h244 diff --git a/.config/vifm/vifmrc b/.config/vifm/vifmrc index 4c15dca..10296bb 100644 --- a/.config/vifm/vifmrc +++ b/.config/vifm/vifmrc @@ -1,3 +1,10 @@ +" __ _____ _____ __ __ ____ ____ +" \ \ / /_ _| ___| \/ | _ \ / ___| +" \ \ / / | || |_ | |\/| | |_) | | +" \ V / | || _| | | | | _ <| |___ +" \_/ |___|_| |_| |_|_| \_\\____| +" + " {{{ General config " This is the actual command used to start vi. The default is vim. " If you would like to use another vi clone such as Elvis or Vile diff --git a/.config/zathura/zathurarc b/.config/zathura/zathurarc index dd1d8b4..6a9bd6e 100644 --- a/.config/zathura/zathurarc +++ b/.config/zathura/zathurarc @@ -1,3 +1,10 @@ +# _____ _ _ +# |__ /__ _| |_| |__ _ _ _ __ __ _ +# / // _` | __| '_ \| | | | '__/ _` | +# / /| (_| | |_| | | | |_| | | | (_| | +# /____\__,_|\__|_| |_|\__,_|_| \__,_| +# + set statusbar-h-padding 0 set statusbar-v-padding 0 set statusbar-basename true @@ -7,8 +14,8 @@ set window-title-page true set default-bg "rgba( 0, 0, 0, 0 )" set recolor-lightcolor "rgba( 8, 11, 12, 0.82 )" set recolor-darkcolor "rgba( 256, 256, 256, 1 )" -# set recolor-lightcolor "rgba( 24, 32, 36, 0.72 )" -# set recolor-darkcolor "rgba( 186, 196, 199, 1 )" +# set recolor-lightcolor "rgba( 24, 32, 36, 0.72 )" +# set recolor-darkcolor "rgba( 186, 196, 199, 1 )" set inputbar-fg "rgba( 186, 196, 199, 1 )" set inputbar-bg "rgba( 34, 45, 50, 0.9 )" set statusbar-fg "rgba( 186, 196, 199, 1 )" diff --git a/.local/bin/dwmbar/dwmb-battery b/.local/bin/dwmbar/dwmb-battery index 68f8b49..007bae4 100755 --- a/.local/bin/dwmbar/dwmb-battery +++ b/.local/bin/dwmbar/dwmb-battery @@ -25,6 +25,6 @@ do # If it is discharging and 25% or less, we will add a  as a warning. [ "$capacity" -le 25 ] && [ "$status" = " " ] && warn=" " - printf "%s%s%s%% " " $status" "$warn" "$capacity" + printf "%s%s%s%%" " $status" "$warn" "$capacity" unset warn done | sed 's/ *$//' diff --git a/.profile b/.profile index c565c16..84d57d2 100644 --- a/.profile +++ b/.profile @@ -1,23 +1,23 @@ export GOPATH=$HOME/.go export SCRIPTS=$HOME/.local/bin -export PATH="$PATH:$(du "$HOME/.scripts/" | cut -f2 | tr '\n' ':')" +export PATH=$PATH$( find $HOME/.local/bin/ -type d -printf ":%p" ) +export PATH=$PATH:$HOME/.cargo/bin export PATH=$PATH:/root/.local/bin export PATH=$PATH:$HOME/.local/bin -export PATH=$PATH:$HOME/.cargo/bin -export PATH=$PATH$( find $HOME/.local/bin/ -type d -printf ":%p" ) export QT_QPA_PLATFORMTHEME="qt5ct" export EDITOR=/usr/bin/nvim export READER=/usr/bin/zathura export GTK2_RC_FILES="$HOME/.gtkrc-2.0" export QT_QPA_PLATFORMTHEME="qt5ct" export GRDB="dropbox://default@/git-private" -export TERM=st export TERMINAL=st +export TERM=st export BIB=$HOME/Dropbox/A/Scholar/All/References export REFERBIB=$HOME/Dropbox/A/Scholar/All/References/bibliography.refer export DISTRIB_ID=arch export DISTRIB_RELEASE=$(uname -r) export XDG_CONFIG_HOME=$HOME/.config +export R_PROFILE_USER=$HOME/.config/R/Rprofile export TODOIST_API_KEY="$(pass Todoist/api)" # export GOROOT=/usr/bin/go @@ -26,13 +26,13 @@ export BROWSER=$(which firefox) # less/man colors export LESS=-R -export LESS_TERMCAP_mb="$(printf '%b' '')" # begin bold -export LESS_TERMCAP_md="$(printf '%b' '')" # begin blink -export LESS_TERMCAP_me="$(printf '%b' '')" # reset bold/blink -export LESS_TERMCAP_so="$(printf '%b' '')" # begin reverse video -export LESS_TERMCAP_se="$(printf '%b' '')" # reset reverse video -export LESS_TERMCAP_us="$(printf '%b' '')" #begin underline -export LESS_TERMCAP_ue="$(printf '%b' '')" # reset underline +export LESS_TERMCAP_md=$'\e[01;36;74m' # begin bold +export LESS_TERMCAP_mb=$'\e[01;31;4m' # begin blinking +export LESS_TERMCAP_us=$'\e[04;32;146m' # begin underline +export LESS_TERMCAP_so=$'\e[30;42;146m' # begin reverse video +export LESS_TERMCAP_se=$'\e[0m' # end reverse video +export LESS_TERMCAP_me=$'\e[0m' # end mode +export LESS_TERMCAP_ue=$'\e[0m' # end underline # Start Desktop Environment if on the main TTY if [[ -z $DISPLAY ]] && [[ $(tty) = /dev/tty1 ]]; then diff --git a/.zshrc b/.zshrc index 1b80103..d8f6e18 100644 --- a/.zshrc +++ b/.zshrc @@ -73,6 +73,7 @@ setopt prompt_subst # Prompt theme PROMPT=" %B%F{blue}π %b%F{yellow}" +# RPROMPT="\$vcs_info_msg_1_ %B%F{magenta}(%B%F{cyan}%1/%B%F{magenta})" RPROMPT="\$vcs_info_msg_0_ %B%F{magenta}(%B%F{cyan}%1/%B%F{magenta})" zstyle ':vcs_info:git:*' formats '%b' -- cgit v1.2.3