From 11b3f461bbffccd6f336975b4dd49acbce8fb7ca Mon Sep 17 00:00:00 2001 From: Tyler Perkins Date: Mon, 10 Jan 2022 15:10:20 -0500 Subject: [PATCH] Update dotfiles 10-1-22 --- Makefile | 32 ++++++++++++++++---------------- src/aerc/accounts.conf | 17 +++++++++-------- src/aerc/binds.conf | 8 +++----- src/bash/bashrc | 25 ++++++++++++++++--------- src/vim/vimrc | 13 +++++++++++-- 5 files changed, 55 insertions(+), 40 deletions(-) diff --git a/Makefile b/Makefile index 3050637..469b2b2 100644 --- a/Makefile +++ b/Makefile @@ -96,12 +96,12 @@ update: [ -f ~/.config/calcurse/keys ] && cp ~/.config/calcurse/keys $(SRC)/calcurse/keys; \ fi #newsboat - @which newsboat > /dev/null 2>&1 - @if [ $$? -eq 0 ]; then \ - echo "newsboat found! Updating config files with existing versions..."; \ - [ -f ~/.newsboat/config ] && cp ~/.newsboat/config $(SRC)/newsboat/config; \ - [ -f ~/.newsboat/urls ] && cp ~/.newsboat/urls $(SRC)/newsboat/urls; \ - fi + #@which newsboat > /dev/null 2>&1 + #@if [ $$? -eq 0 ]; then \ + # echo "newsboat found! Updating config files with existing versions..."; \ + # [ -f ~/.newsboat/config ] && cp ~/.newsboat/config $(SRC)/newsboat/config; \ + # [ -f ~/.newsboat/urls ] && cp ~/.newsboat/urls $(SRC)/newsboat/urls; \ + #fi #mpv @which mpv > /dev/null 2>&1 @if [ $$? -eq 0 ]; then \ @@ -109,17 +109,17 @@ update: [ -f ~/.config/mpv/mpv.conf ] && cp ~/.config/mpv/mpv.conf $(SRC)/mpv/mpv.conf; \ fi #compton - @which compton > /dev/null 2>&1 - @if [ $$? -eq 0 ]; then \ - echo "compton found! Updating config files with existing versions..."; \ - [ -f ~/.config/compton.conf ] && cp ~/.config/compton.conf $(SRC)/compton/compton.conf; \ - fi + #@which compton > /dev/null 2>&1 + #@if [ $$? -eq 0 ]; then \ + # echo "compton found! Updating config files with existing versions..."; \ + # [ -f ~/.config/compton.conf ] && cp ~/.config/compton.conf $(SRC)/compton/compton.conf; \ + #fi #sc-im - @which sc-im > /dev/null 2>&1 - @if [ $$? -eq 0 ]; then \ - echo "sc-im found! Updating config files with existing versions..."; \ - [ -f ~/.config/sc-im/scimrc ] && cp ~/.config/sc-im/scimrc $(SRC)/sc-im/scimrc; \ - fi + #@which sc-im > /dev/null 2>&1 + #@if [ $$? -eq 0 ]; then \ + # echo "sc-im found! Updating config files with existing versions..."; \ + # [ -f ~/.config/sc-im/scimrc ] && cp ~/.config/sc-im/scimrc $(SRC)/sc-im/scimrc; \ + #fi #aerc @which aerc > /dev/null 2>&1 @if [ $$? -eq 0 ]; then \ diff --git a/src/aerc/accounts.conf b/src/aerc/accounts.conf index b7aaf1b..e6e813f 100644 --- a/src/aerc/accounts.conf +++ b/src/aerc/accounts.conf @@ -1,18 +1,19 @@ [Gmail] -source = imaps://britishlink12%40gmail.com@imap.gmail.com:993 -source-cred-cmd = pass email/britishlink12@gmail.com -outgoing = smtps+plain://britishlink12%40gmail.com@smtp.gmail.com:465 +source = imaps://britishlink12%40gmail.com@imap.gmail.com:993 +outgoing = smtp+plain://britishlink12%40gmail.com@smtp.gmail.com:587 +default = INBOX +smtp-starttls = yes +from = Tyler Perkins +copy-to = Sent outgoing-cred-cmd = pass email/britishlink12@gmail.com -default = INBOX -from = Tyler Perkins -copy-to = Sent +source-cred-cmd = pass email/britishlink12@gmail.com [School] source = imaps://tperki17%40kent.edu@imap.gmail.com -source-cred-cmd = pass email/tperki17@kent.edu outgoing = smtps+plain://tperki17%40kent.edu@smtp.gmail.com -outgoing-cred-cmd = pass email/tperki17@kent.edu default = INBOX from = Tyler Perkins copy-to = Sent +outgoing-cred-cmd = pass email/tperki17@kent.edu +source-cred-cmd = pass email/tperki17@kent.edu diff --git a/src/aerc/binds.conf b/src/aerc/binds.conf index 8cf2eab..2aecb69 100644 --- a/src/aerc/binds.conf +++ b/src/aerc/binds.conf @@ -2,9 +2,7 @@ # To use '=' in a key sequence, substitute it with "Eq": "" # If you wish to bind #, you can wrap the key sequence in quotes: "#" = quit = :prev-tab -H = :prev-tab = :next-tab -L = :next-tab = :term [messages] @@ -27,11 +25,13 @@ G = :select -1 J = :next-folder K = :prev-folder +L = :next-tab +H = :prev-tab + v = :mark -t V = :mark -v = :view -l = :view d = :prompt 'Really delete this message?' 'delete-message' D = :delete A = :archive flat @@ -71,8 +71,6 @@ H = :toggle-headers = :next-part J = :next K = :prev -h = :close -o = :open [compose] # Keybindings used when the embedded terminal is not selected in the compose diff --git a/src/bash/bashrc b/src/bash/bashrc index 0b3e102..3a3d820 100644 --- a/src/bash/bashrc +++ b/src/bash/bashrc @@ -41,13 +41,19 @@ alias weather="curl wttr.in" alias http="python -m http.server" alias google="tuxi" alias clipboard="xclip -selection clipboard" -alias new-wallpaper="xwallpaper --maximize $(find /home/tyler/.desktop/wallpaper/ -type f | shuf -n 1 --random-source=/dev/random)" +alias new-wallpaper="feh --bg-fill --randomize ~/.desktop/wallpaper/" +alias set-motd="vim /home/tyler/.desktop/alarm/motd.txt" alias diff="diff --color=auto" alias grep="grep -i --color=auto" alias mv="mv -v" alias nnn="nnn -e" alias sudo="doas" +alias arduino="_JAVA_AWT_WM_NONREPARENTING=1 arduino" +alias logisim-evolution="_JAVA_AWT_WM_NONREPARENTING=1 logisim-evolution" +alias vifm="vifmrun" +alias svn="colorsvn" +alias f="vifm" alias sched="vim /home/tyler/school/Sched.txt" alias disable-alarm=". /home/tyler/.desktop/alarm/disable-alarm.sh" @@ -55,14 +61,14 @@ alias memes-down="rsync -azPv tyler@174.104.135.12:/media/hd/memes/ /media/hd/me alias memes-up="rsync -azPv /media/hd/memes/ tyler@174.104.135.12:/media/hd/memes/" #vim opens vim wiki by default, else the file -function vimw(){ - if [ $# -eq 0 ]; then - vim ~/vimwiki/splash.wiki - else - vim $@ - fi -} -alias vim="vimw" +#function vimw(){ +# if [ $# -eq 0 ]; then +# vim ~/vimwiki/splash.wiki +# else +# vim $@ +# fi +#} +#alias vim="vimw" #display colors @@ -83,3 +89,4 @@ echo -e "${_PROMPT_HEAD_}#EIp : ${_PROMPT_VAR_}$(ifconfig eno1 | grep -Eo 'inet echo -e "${_PROMPT_HEAD_}#PIp : ${_PROMPT_VAR_}$(curl -s ipinfo.io/ip)" echo -e "${_PROMPT_HEAD_}#Time: ${_PROMPT_VAR_}$(date +"%T")" echo -e "${_PROMPT_HEAD_}#Batt: ${_PROMPT_VAR_}${_BATTERY_}%" +echo -e "${_PROMPT_HEAD_}#${_PROMPT_VAR_}\x1b[3m $(shuf -n 1 ~/.desktop/messages.txt) " diff --git a/src/vim/vimrc b/src/vim/vimrc index 775f8a6..2a5a96e 100644 --- a/src/vim/vimrc +++ b/src/vim/vimrc @@ -15,7 +15,6 @@ call vundle#begin() Plugin 'VundleVim/Vundle.vim' "add plugins here -"Plugin 'ycm-core/YouCompleteMe' Plugin 'tpope/vim-surround' Plugin 'preservim/nerdtree' @@ -26,6 +25,7 @@ Plugin 'jamessan/vim-gnupg' Plugin 'vim-syntastic/syntastic' Plugin 'airblade/vim-gitgutter' Plugin 'vimwiki/vimwiki' +Plugin 'ekalinin/Dockerfile.vim' "Appearence Plugin 'ap/vim-css-color' @@ -35,6 +35,11 @@ Plugin 'itchyny/lightline.vim' "hard mode Plugin 'takac/vim-hardtime' +"reference +Plugin 'dbeniamine/cheat.sh-vim' +Plugin 'moll/vim-node' + + "end plugins "end @@ -58,6 +63,7 @@ highlight SyntasticError guibg=#2f0000 highlight link SyntasticErrorLine error highlight link SyntasticWarningLine todo + let g:syntastic_always_populate_loc_list = 1 "let g:syntastic_auto_loc_list = 1 let g:syntastic_check_on_open = 1 @@ -67,6 +73,8 @@ let g:syntastic_c_remove_include_errors = 1 let g:syntastic_cpp_compiler = "g++" let g:syntastic_cpp_compiler_options = "-Wall -Wextra" +let g:syntastic_asm_checkers = ['nasm'] + let g:GPGFilePattern = '*.\(gpg\|asc\|pgp\|gpg\)\(.wiki\)\=' "clear sign column @@ -166,7 +174,8 @@ function! Compile() endif endfunction -let g:vimwiki_list = [{'path': '$HOME/vimwiki', 'template_path': '$HOME/vimwiki/templates/', 'template_default': 'default', 'template_ext': '.php'}] +let g:vimwiki_list = [{'path': '$HOME/vimwiki', 'path_html': '$HOME/vimwiki/.html', 'template_path': '$HOME/vimwiki/templates/', 'template_default': 'default', 'template_ext': '.php'}] noremap p :call Preview() noremap q :call Compile() +