From fcba9e893be8232843826328b11e5893518a58a9 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Thu, 2 Feb 2017 11:08:53 +0000 Subject: add college email --- Mail/msmtprc | 9 +++++++++ 1 file changed, 9 insertions(+) (limited to 'Mail') diff --git a/Mail/msmtprc b/Mail/msmtprc index 297afde..6b02734 100644 --- a/Mail/msmtprc +++ b/Mail/msmtprc @@ -8,6 +8,15 @@ user v@skozl.com tls on tls_trust_file /etc/ssl/certs/ca-certificates.crt +account imperial +host smtp.office365.com +port 587 +protocol smtp +auth on +from vasil.zlatanov15@imperial.ac.uk +user vasil.zlatanov15@imperial.ac.uk +tls on +tls_starttls on account bitmessage host mail.bitmessage.ch -- cgit v1.2.3-54-g00ecf From c915def7a196fd412a95e1614078531d6d36bb6d Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 16 Apr 2017 13:05:33 +0200 Subject: massive upgrade to new laptop --- Mail/mutt/mailcap | 2 +- Mail/muttrc | 5 +++-- Panel/lemonbar/panel_bar | 4 ++-- Panel/lemonbar/profile | 6 +++--- Shell/bash_aliases | 11 +++++++++-- Shell/zshrc | 2 +- Window_Manager/ratpoison/firesend | 2 -- Window_Manager/ratpoison/py/colorz.pyc | Bin 3165 -> 3149 bytes Window_Manager/ratpoison/ratpoisonrc.conf | 10 +++++----- Xinit/Xdefaults | 7 +++---- Xinit/Xresources | 2 +- Xinit/xinitrc | 1 + 12 files changed, 29 insertions(+), 23 deletions(-) delete mode 100755 Window_Manager/ratpoison/firesend (limited to 'Mail') diff --git a/Mail/mutt/mailcap b/Mail/mutt/mailcap index 2ff7cf2..bc80a85 100644 --- a/Mail/mutt/mailcap +++ b/Mail/mutt/mailcap @@ -1,3 +1,3 @@ application/*; mkdir -p /tmp/mutt \; cp %s /tmp/mutt \; rifle /tmp/mutt/$(basename %s) & -text/html; vimb '%s' &; test=test -n "$DISPLAY"; needsterminal; +text/html; chromium '%s' &; test=test -n "$DISPLAY"; needsterminal; text/html; w3m -I %{charset} -T text/html; copiousoutput; diff --git a/Mail/muttrc b/Mail/muttrc index b9c3369..93a8175 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -55,7 +55,7 @@ macro index,pager A \ "add the sender email address to khard" # Load from CardDav -set query_command="khard email --parsable --search-in-source-files %s" +set query_command="$HOME/.mutt/mutt-eds-query %s" @@ -139,7 +139,7 @@ set markers=no set smart_wrap # Mutt LED notification -set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|" +# set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|" # Render silly html set mailcap_path = ~/.mutt/mailcap @@ -147,3 +147,4 @@ folder-hook . `rm -f /tmp/mutt/*` # delete tmp files crea auto_view text/html # view html automatically alternative_order text/plain text/enriched text/html # save html for last + diff --git a/Panel/lemonbar/panel_bar b/Panel/lemonbar/panel_bar index 40a2b27..5d36a88 100755 --- a/Panel/lemonbar/panel_bar +++ b/Panel/lemonbar/panel_bar @@ -45,7 +45,7 @@ while read -r line ; do ;; K*) # volume output - musicvol="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_MUSIC} ${line#?} %{B-}%{F-}" + #musicvol="%{F$COLOR_STATUS_FG}%{B$COLOR_STATUS_BG} ${ICON_MUSIC} ${line#?} %{B-}%{F-}" ;; @@ -115,5 +115,5 @@ while read -r line ; do # ;; esac # printf "%s\n" "%{l}${wm_infos}${title}%{r}${playing}${paused}${cpu}${ram}${essid}${signal}${volume}${musicvol}${battery}${time_infos} " - printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${notification}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${musicvol}${battery}${time_infos}" + printf "%s\n" "%{l}${desktop}${wm_infos}%{r}${notification}${face}${priv}${pub}${mail}${playing}${paused}${cpu}${ram}${volume}${battery}${time_infos}" done diff --git a/Panel/lemonbar/profile b/Panel/lemonbar/profile index 3a2f726..5c34dd7 100755 --- a/Panel/lemonbar/profile +++ b/Panel/lemonbar/profile @@ -1,8 +1,8 @@ #!/bin/sh PANEL_FIFO=/tmp/panel-fifo -PANEL_HEIGHT=24 +PANEL_HEIGHT=48 -FONT_FONT="fixed" -ICON_FONT="FontAwesome-9" +FONT_FONT="DejaVuSans-10" +ICON_FONT="FontAwesome-10" export PANEL_FIFO PANEL_HEIGHT PANEL_FONT_FAMILY FONT_FONT ICON_FONT diff --git a/Shell/bash_aliases b/Shell/bash_aliases index 6320c72..9a21eb1 100644 --- a/Shell/bash_aliases +++ b/Shell/bash_aliases @@ -1,5 +1,11 @@ #if you wanna change timezone just copy one of /usr/share/zoneinfo/place to /etc/localtime +alias sp='chromium --app=https://play.spotify.com' +alias wa='chromium --app=https://web.whatsapp.com' +alias serial='screen /dev/$(basename $(ls /dev/ttyAC*|tail -1)) 9600n' + +# bauerbill +alias bb='bb-wrapper' #ip alias ip='ip -c' @@ -11,8 +17,8 @@ alias ,.='!!' # mpv alias mpvl='mpv --ytdl-format=43' +alias mpv="mpv --ytdl-format 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'" -#Micrcontroller alias serial='micronucleus --run ~/Sync/Programming/serial.hex' alias yt='mpsyt' @@ -70,7 +76,8 @@ alias o='less' alias g='wget' alias x='tar -xvzf' alias a='tar -cvzf' -alias i='yaourt -S' +alias i='bb -S' +alias ia='bb -S --aur' alias p='sudo pacman -Rs' alias clean='sudo pacman -Rsn $(pacman -Qdtq)' alias t='optirun' diff --git a/Shell/zshrc b/Shell/zshrc index 6568d91..bbe35c2 100644 --- a/Shell/zshrc +++ b/Shell/zshrc @@ -27,7 +27,7 @@ export PATH="$HOME/bin:$PATH" export EDITOR="vim" export LD_LIBRARY_PATH=/usr/local/lib -PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}☢ " +PROMPT="%{$fg_no_bold[yellow]%}%1~ %{$reset_color%}▶ " #RPROMPT="[%{$fg_no_bold[yellow]%}%?%{$reset_color%}]" diff --git a/Window_Manager/ratpoison/firesend b/Window_Manager/ratpoison/firesend deleted file mode 100755 index 70ee78e..0000000 --- a/Window_Manager/ratpoison/firesend +++ /dev/null @@ -1,2 +0,0 @@ -#!/bin/bash -vimb $@ > /dev/null 2>&1 & diff --git a/Window_Manager/ratpoison/py/colorz.pyc b/Window_Manager/ratpoison/py/colorz.pyc index 2e77075..586db45 100644 Binary files a/Window_Manager/ratpoison/py/colorz.pyc and b/Window_Manager/ratpoison/py/colorz.pyc differ diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf index 757d186..d467bd1 100644 --- a/Window_Manager/ratpoison/ratpoisonrc.conf +++ b/Window_Manager/ratpoison/ratpoisonrc.conf @@ -47,7 +47,7 @@ exec xsetroot -cursor_name left_ptr #exec nitrogen --restore #Border & Padding -alias showpanel set padding 0 24 0 0 +alias showpanel set padding 0 48 0 0 alias hidepanel set padding 0 0 0 0 showpanel @@ -139,7 +139,7 @@ alias cont exec pkill -CONT # b : Open url -alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 vimb +alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 chromium alias browse colon browse_cmd bind b browse # B : open a new firefox tab and browse to the X clipboard selection @@ -159,7 +159,7 @@ definekey top s-c colon cont definekey top s-x colon stop definekey top s-f exec firefox -definekey top s-v exec vimb +definekey top s-v exec chromium definekey top s-V exec mpv `xclip -o` --ytdl-format=22 definekey top s-h exec ~/.config/vimb/history-search #definekey top s-g exec gvim @@ -200,8 +200,8 @@ definekey top s-Pause voltoggle #------------------------------------------------------------- # Brightness Control #------------------------------------------------------------- -alias brightup exec xbacklight -inc 2 -alias brightdown exec xbacklight -dec 2 +alias brightup exec light -A 2 +alias brightdown exec light -U 2 definekey top XF86MonBrightnessUp brightup definekey top XF86MonBrightnessDown brightdown diff --git a/Xinit/Xdefaults b/Xinit/Xdefaults index 0f56be6..7e08674 100644 --- a/Xinit/Xdefaults +++ b/Xinit/Xdefaults @@ -2,7 +2,7 @@ ! Xft settings !------------------------------------------------------------------------------- -Xft.dpi: 96 +Xft.dpi: 186 Xft.antialias: true Xft.rgba: rgb Xft.hinting: true @@ -18,7 +18,7 @@ URxvt.lineSpace: 0 ! Fonts URxvt.allow_bold: true -URxvt.font: xft:DejaVu Sans Mono:pixelsize=11 +URxvt.font: xft:DejaVu Sans Mono:pixelsize=26 ! Fix font space URxvt*letterSpace: -1 @@ -48,5 +48,4 @@ URxvt.keysym.M-s: perl:keyboard-select:search ! M-u to select open copy links !URxvt.perl-ext-common: ...,url-select URxvt.keysym.M-u: perl:url-select:select_next -URxvt.url-select.launcher: /home/vasko/.tools/firesend - +URxvt.url-select.launcher: chromium diff --git a/Xinit/Xresources b/Xinit/Xresources index 3fa2ad8..fe0210e 100644 --- a/Xinit/Xresources +++ b/Xinit/Xresources @@ -13,7 +13,7 @@ urxvt.scrollBar :false xterm.scrollBar :false xterm*faceName: DejaVu Sans Mono Book -xterm*faceSize: 11 +xterm*faceSize: 16 ! Enable copy paste xterm*metaSendsEscape: true diff --git a/Xinit/xinitrc b/Xinit/xinitrc index 5358300..c20998c 100755 --- a/Xinit/xinitrc +++ b/Xinit/xinitrc @@ -42,4 +42,5 @@ xrdb -merge ~/.Xdefaults # Automount #udiskie -N & +xrandr --dpi 186 ratpoison -- cgit v1.2.3-54-g00ecf From c14ecc029a041662768e0a003bd6629bc13118d0 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 16 Apr 2017 13:17:33 +0200 Subject: clean up mutt config --- Mail/muttrc | 116 ++++++++++++++++++++++++++---------------------------------- 1 file changed, 51 insertions(+), 65 deletions(-) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index 93a8175..c8ae33d 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -1,12 +1,7 @@ # GPG config source ~/.mutt/crypto.rc -#Load aliases -#set alias_file=$HOME/.mutt/aliases.txt -#source $alias_file - - -#Offline Imap config +#LocalMail config set mbox_type = Maildir set sendmail = /usr/bin/msmtp @@ -16,49 +11,16 @@ set mbox = "+dove/Archive" set postponed = "+dove/Drafts" set record = "+dove/Sent" -# Set maailboxes +# Set mailboxes mailboxes =dove/Inbox =dove/Sent =dove/Drafts =dove/Trash =dove/Archive -# Enable sidepanel -#set sidebar_visible=yes -#set sidebar_short_path=yes -#set sidebar_format = "%B %?N?(%N)?%* %S" -#set mail_check_stats = yes - # Set search to notmuch - bind index,pager / vfolder-from-query - -# View good/bad mails -# macro index S "~h \"X-Spam-Flag: YES\"" "Show only SPAM" -# macro index s "~h \"X-Spam-Status: No\"" "Hide SPAM" - -macro index D \ - "+dove/Trash" \ - "move message to the trash" - -#macro index S \ -# "+dove/Spam" \ -# "mark message as spam" - # Dove conf set from = "v@skozl.com" set realname = "Vasil Zlatanov" -# CardDav completion -bind editor complete-query - -# Save contact to CardDav -macro index,pager A \ - "khard add-email" \ - "add the sender email address to khard" - -# Load from CardDav -set query_command="$HOME/.mutt/mutt-eds-query %s" - - - # Change the following line to a different editor you prefer. set editor = "vim" @@ -97,6 +59,51 @@ ignore x-no-junk-mail x-server-date x-phone x-mime-autoconverted ignore x-alt-email x-orcpt company division x-warning +#---------------------------------------- +# Vi Keys +#---------------------------------------- + +# Moving around +bind attach,browser,index gg first-entry +bind attach,browser,index G last-entry +bind pager gg top +bind pager G bottom +bind pager k previous-line +bind pager j next-line + +# Scrolling +bind attach,browser,pager,index \CF next-page +bind attach,browser,pager,index \CB previous-page +bind attach,browser,pager,index \Cu half-up +bind attach,browser,pager,index \Cd half-down +bind browser,pager \Ce next-line +bind browser,pager \Cy previous-line +bind index \Ce next-line +bind index \Cy previous-line + +macro index dd \ + "+dove/Trash" \ + "move message to the trash" + +# Mail & Reply +bind index \Cm list-reply # Doesn't work currently + +# Search +bind index,pager "n" next-unread +bind index,pager "N" search-next +bind index,pager \CN search-opposite + + +# Threads +bind pager,index dT delete-thread +bind pager,index dt delete-subthread +bind pager,index gt next-thread +bind pager,index gT previous-thread +bind index za collapse-thread +bind index zA collapse-all # Missing :folddisable/foldenable + + + # Gmail-style keyboard shortcuts macro index,pager gi "=dove/Inbox" "Go to inbox" macro index,pager ga "=dove/Archive" "Go to all mail" @@ -105,6 +112,10 @@ macro index,pager gj "=dove/Spam" "Go to spam" macro index,pager gt "=dove/Trash" "Go to trash" macro index,pager gd "=dove/Drafts" "Go to drafts" + +bind index R group-reply + + # Other config set delete #set edit_headers @@ -112,35 +123,10 @@ set fast_reply unset help set pager_stop -# Bindings -bind index,pager "n" next-unread -bind index,pager "N" search-next - -bind browser d half-down -bind index d half-down -bind pager d half-down - -bind browser u half-up -bind index u half-up -bind pager u half-up - -bind index gg first-entry -bind pager gg top -bind index G last-entry -bind pager G bottom -bind index R group-reply - - -# Write in Aliases when opening email -#set display_filter='$HOME/.mutt/alias.sh' - # Remove + on wraps set markers=no set smart_wrap -# Mutt LED notification -# set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|" - # Render silly html set mailcap_path = ~/.mutt/mailcap folder-hook . `rm -f /tmp/mutt/*` # delete tmp files created by mailcap -- cgit v1.2.3-54-g00ecf From 15ed5aaf7b9dd67aacf3bfa3277a955b7eeff5a3 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 16 Apr 2017 13:19:33 +0200 Subject: remove threads --- Mail/muttrc | 10 ---------- 1 file changed, 10 deletions(-) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index c8ae33d..28fa388 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -94,16 +94,6 @@ bind index,pager "N" search-next bind index,pager \CN search-opposite -# Threads -bind pager,index dT delete-thread -bind pager,index dt delete-subthread -bind pager,index gt next-thread -bind pager,index gT previous-thread -bind index za collapse-thread -bind index zA collapse-all # Missing :folddisable/foldenable - - - # Gmail-style keyboard shortcuts macro index,pager gi "=dove/Inbox" "Go to inbox" macro index,pager ga "=dove/Archive" "Go to all mail" -- cgit v1.2.3-54-g00ecf From 599356ac95e5188bc16470a3d12b64af8811f9f8 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 16 Apr 2017 13:22:16 +0200 Subject: remove broken keybind --- Mail/muttrc | 3 +-- 1 file changed, 1 insertion(+), 2 deletions(-) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index 28fa388..70d22cf 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -86,7 +86,7 @@ macro index dd \ "move message to the trash" # Mail & Reply -bind index \Cm list-reply # Doesn't work currently +bind index R group-reply # Search bind index,pager "n" next-unread @@ -103,7 +103,6 @@ macro index,pager gt "=dove/Trash" "Go to trash" macro index,pager gd "=dove/Drafts" "Go to drafts" -bind index R group-reply # Other config -- cgit v1.2.3-54-g00ecf From 38535167b49fe25764471554dcedefde5cc94b83 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Wed, 19 Apr 2017 21:39:12 +0200 Subject: massive new latpop updates --- Editor/vimrc | 2 +- File_Manager/ranger/rifle.conf | 1 + File_Manager/ranger/scope.sh | 55 ++++++++++++++++++++++++++----- Mail/muttrc | 6 ++-- Panel/lemonbar/batterymon | 19 ++++++----- Panel/lemonbar/music | 2 +- Panel/lemonbar/panel_bar | 2 -- Panel/lemonbar/profile | 2 +- Panel/lemonbar/windows | 2 +- Shell/bash_aliases | 1 + Window_Manager/ratpoison/ratpoisonrc.conf | 11 ++++--- Xinit/Xdefaults | 8 ++--- Xinit/xinitrc | 11 ++++--- 13 files changed, 82 insertions(+), 40 deletions(-) (limited to 'Mail') diff --git a/Editor/vimrc b/Editor/vimrc index f27115a..491e557 100644 --- a/Editor/vimrc +++ b/Editor/vimrc @@ -1,7 +1,7 @@ set nocompatible " be iMproved, required filetype off " required -set background=light +set background=dark set rtp+=~/.vim/bundle/Vundle.vim call vundle#begin() diff --git a/File_Manager/ranger/rifle.conf b/File_Manager/ranger/rifle.conf index 9c19db3..256808d 100644 --- a/File_Manager/ranger/rifle.conf +++ b/File_Manager/ranger/rifle.conf @@ -147,6 +147,7 @@ ext xcf, X, flag f = gimp -- "$@" #------------------------------------------- # Documents #------------------------------------------- +ext pdf, has chromium, X, flag f = chromium --new-window --kiosk "$@" ext pdf, has llpp, X, flag f = llpp "$@" ext pdf, has zathura, X, flag f = zathura -- "$@" ext pdf, has mupdf, X, flag f = mupdf -- "$@" diff --git a/File_Manager/ranger/scope.sh b/File_Manager/ranger/scope.sh index 64bab71..da7168e 100755 --- a/File_Manager/ranger/scope.sh +++ b/File_Manager/ranger/scope.sh @@ -16,42 +16,67 @@ # 3 | fix width | success. Don't reload when width changes # 4 | fix height | success. Don't reload when height changes # 5 | fix both | success. Don't ever reload +# 6 | image | success. display the image $cached points to as an image preview +# 7 | image | success. display the file directly as an image # Meaningful aliases for arguments: -path="$1" # Full path of the selected file -width="$2" # Width of the preview pane (number of fitting characters) -height="$3" # Height of the preview pane (number of fitting characters) +path="$1" # Full path of the selected file +width="$2" # Width of the preview pane (number of fitting characters) +height="$3" # Height of the preview pane (number of fitting characters) +cached="$4" # Path that should be used to cache image previews +preview_images="$5" # "True" if image previews are enabled, "False" otherwise. maxln=200 # Stop after $maxln lines. Can be used like ls | head -n $maxln # Find out something about the file: mimetype=$(file --mime-type -Lb "$path") -extension=${path##*.} +extension=$(/bin/echo "${path##*.}" | awk '{print tolower($0)}') # Functions: # runs a command and saves its output into $output. Useful if you need # the return value AND want to use the output in a pipe try() { output=$(eval '"$@"'); } -# writes the output of the previouosly used "try" command -dump() { echo "$output"; } +# writes the output of the previously used "try" command +dump() { /bin/echo "$output"; } # a common post-processing function used after most commands trim() { head -n "$maxln"; } # wraps highlight to treat exit code 141 (killed by SIGPIPE) as success -highlight() { command highlight "$@"; test $? = 0 -o $? = 141; } +safepipe() { "$@"; test $? = 0 -o $? = 141; } + +# Image previews, if enabled in ranger. +if [ "$preview_images" = "True" ]; then + case "$mimetype" in + # Image previews for SVG files, disabled by default. + ###image/svg+xml) + ### convert "$path" "$cached" && exit 6 || exit 1;; + # Image previews for image files. w3mimgdisplay will be called for all + # image files (unless overriden as above), but might fail for + # unsupported types. + image/*) + exit 7;; + # Image preview for video, disabled by default.: + video/*) + ffmpegthumbnailer -i "$path" -o "$cached" -s 0 && exit 6 || exit 1;; + esac +fi case "$extension" in # Archive extensions: - 7z|a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\ + a|ace|alz|arc|arj|bz|bz2|cab|cpio|deb|gz|jar|lha|lz|lzh|lzma|lzo|\ rpm|rz|t7z|tar|tbz|tbz2|tgz|tlz|txz|tZ|tzo|war|xpi|xz|Z|zip) try als "$path" && { dump | trim; exit 0; } try acat "$path" && { dump | trim; exit 3; } try bsdtar -lf "$path" && { dump | trim; exit 0; } exit 1;; rar) + # avoid password prompt by providing empty password try unrar -p- lt "$path" && { dump | trim; exit 0; } || exit 1;; + 7z) + # avoid password prompt by providing empty password + try 7z -p l "$path" && { dump | trim; exit 0; } || exit 1;; # PDF documents: pdf) try pdftotext -l 10 -nopgbrk -q "$path" - && \ @@ -59,6 +84,9 @@ case "$extension" in # BitTorrent Files torrent) try transmission-show "$path" && { dump | trim; exit 5; } || exit 1;; + # ODT Files + odt|ods|odp|sxw) + try odt2txt "$path" && { dump | trim; exit 5; } || exit 1;; # HTML Pages: htm|html|xhtml) try w3m -dump "$path" && { dump | trim | fmt -s -w $width; exit 4; } @@ -70,7 +98,16 @@ esac case "$mimetype" in # Syntax highlight for text files: text/* | */xml) - try highlight --out-format=ansi "$path" && { dump | trim; exit 5; } || exit 2;; + if [ "$(tput colors)" -ge 256 ]; then + pygmentize_format=terminal256 + highlight_format=xterm256 + else + pygmentize_format=terminal + highlight_format=ansi + fi + try safepipe highlight --out-format=${highlight_format} "$path" && { dump | trim; exit 5; } + try safepipe pygmentize -f ${pygmentize_format} "$path" && { dump | trim; exit 5; } + exit 2;; # Ascii-previews of images: image/*) img2txt --gamma=0.6 --width="$width" "$path" && exit 4 || exit 1;; diff --git a/Mail/muttrc b/Mail/muttrc index 70d22cf..66376fa 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -3,7 +3,7 @@ source ~/.mutt/crypto.rc #LocalMail config set mbox_type = Maildir -set sendmail = /usr/bin/msmtp +set sendmail = /usr/local/bin/msmtpq set folder = ~/.mail/ set spoolfile = "+dove/Inbox" @@ -33,8 +33,8 @@ set message_cachedir=~/.muttlocal/cache/bodies set certificate_file=~/.muttlocal/certificates set move = no set include -set sort = 'reverse-date-received' -#set sort_aux = 'reverse-last-date-received' +set sort = 'threads' +set sort_aux = 'reverse-last-date-received' set auto_tag = yes ignore "Authentication-Results:" ignore "DomainKey-Signature:" diff --git a/Panel/lemonbar/batterymon b/Panel/lemonbar/batterymon index 27ea7a6..9d8c74d 100755 --- a/Panel/lemonbar/batterymon +++ b/Panel/lemonbar/batterymon @@ -1,13 +1,14 @@ #!/bin/sh while true;do -if [ `battery -f '%i'` -lt 4 ] && ! [ -z ~/.dontshut ]; then -touch ~/.dontshut -zenity --question --title "Battery" --text "Battery if pretty fucking low, go to sleep?" -if [ $? -ne 1 ];then -pm-suspend -fi -else -rm ~/.dontshut -fi + if [ `battery -f '%i'` -lt 4 ] && ! [ -z ~/.dontshut ]; then + touch ~/.dontshut + zenity --question --title "Battery" --text "Battery if pretty fucking low, go to sleep?" + if [ $? -ne 1 ];then + pm-suspend + fi + else + if [ -z ~/.dontshut ] + rm ~/.dontshut + fi sleep 180; done diff --git a/Panel/lemonbar/music b/Panel/lemonbar/music index d9e1d45..0ee2611 100755 --- a/Panel/lemonbar/music +++ b/Panel/lemonbar/music @@ -15,6 +15,6 @@ echo "K`mpc volume -h 127.0.0.1 | perl -pe 's/^volume://' | perl -pe 's/%$//' | mpc -h 127.0.0.1 idle > /dev/null if [ $? -ne 0 ];then echo 'mpd not alive'; -sleep 30; +sleep 300; fi done diff --git a/Panel/lemonbar/panel_bar b/Panel/lemonbar/panel_bar index 5d36a88..64eed1d 100755 --- a/Panel/lemonbar/panel_bar +++ b/Panel/lemonbar/panel_bar @@ -1,7 +1,5 @@ #! /bin/sh -num_mon=$(bspc query -M | wc -l) - . ./panel_colors . ./icons while read -r line ; do diff --git a/Panel/lemonbar/profile b/Panel/lemonbar/profile index 5c34dd7..fe9d7b1 100755 --- a/Panel/lemonbar/profile +++ b/Panel/lemonbar/profile @@ -1,6 +1,6 @@ #!/bin/sh PANEL_FIFO=/tmp/panel-fifo -PANEL_HEIGHT=48 +PANEL_HEIGHT=40 FONT_FONT="DejaVuSans-10" ICON_FONT="FontAwesome-10" diff --git a/Panel/lemonbar/windows b/Panel/lemonbar/windows index 108eeac..4af5a5c 100755 --- a/Panel/lemonbar/windows +++ b/Panel/lemonbar/windows @@ -1,3 +1,3 @@ #!/bin/sh echo 'Wclear' > /tmp/panel-fifo -ratpoison -c 'windows %s%n %t' | while read line;do echo "${line}" | cut -c -25 > /tmp/panel-fifo && sleep 0.004;done +ratpoison -c 'windows %s%n %t' | cut -c -25 > /tmp/panel-fifo diff --git a/Shell/bash_aliases b/Shell/bash_aliases index 9a21eb1..b2c0874 100644 --- a/Shell/bash_aliases +++ b/Shell/bash_aliases @@ -17,6 +17,7 @@ alias ,.='!!' # mpv alias mpvl='mpv --ytdl-format=43' +alias mpvh='mpv --ytdl-format=137+251' alias mpv="mpv --ytdl-format 'bestvideo[ext=mp4]+bestaudio[ext=m4a]/mp4'" alias serial='micronucleus --run ~/Sync/Programming/serial.hex' diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf index d467bd1..4d592f4 100644 --- a/Window_Manager/ratpoison/ratpoisonrc.conf +++ b/Window_Manager/ratpoison/ratpoisonrc.conf @@ -1,12 +1,13 @@ #using jcs hacks # info: C=control, M=meta/alt, s=super, S=shift, H = Hyper # xnest for testing + escape grave definekey top s-grave meta definekey top Arabic_dammatan meta -#set quiet 1 - +# Surpress 'Current Frame' +set framemsgwait -1 set historyexpansion 1 @@ -47,7 +48,7 @@ exec xsetroot -cursor_name left_ptr #exec nitrogen --restore #Border & Padding -alias showpanel set padding 0 48 0 0 +alias showpanel set padding 0 40 0 0 alias hidepanel set padding 0 0 0 0 showpanel @@ -139,7 +140,7 @@ alias cont exec pkill -CONT # b : Open url -alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 chromium +alias browse_cmd exec .config/ratpoison/exec_to_workspace 2 chromium --start-fullscreen --new-window https://google.com alias browse colon browse_cmd bind b browse # B : open a new firefox tab and browse to the X clipboard selection @@ -159,7 +160,7 @@ definekey top s-c colon cont definekey top s-x colon stop definekey top s-f exec firefox -definekey top s-v exec chromium +definekey top s-v exec chromium --new-window --start-fullscreen https://google.com definekey top s-V exec mpv `xclip -o` --ytdl-format=22 definekey top s-h exec ~/.config/vimb/history-search #definekey top s-g exec gvim diff --git a/Xinit/Xdefaults b/Xinit/Xdefaults index 7e08674..99371ec 100644 --- a/Xinit/Xdefaults +++ b/Xinit/Xdefaults @@ -2,7 +2,7 @@ ! Xft settings !------------------------------------------------------------------------------- -Xft.dpi: 186 +Xft.dpi: 161 Xft.antialias: true Xft.rgba: rgb Xft.hinting: true @@ -18,10 +18,10 @@ URxvt.lineSpace: 0 ! Fonts URxvt.allow_bold: true -URxvt.font: xft:DejaVu Sans Mono:pixelsize=26 +URxvt.font: xft:DejaVu Sans Mono:pixelsize=22 ! Fix font space -URxvt*letterSpace: -1 +URxvt*letterSpace: -2 ! Scrollbar URxvt.scrollStyle: rxvt @@ -33,7 +33,7 @@ URxvt.matcher.button: 1 URxvt.urlLauncher: vimb ! Cursor -URxvt.cursorBlink: true +URxvt.cursorBlink: false URxvt.cursorColor: #657b83 URxvt.cursorUnderline: false diff --git a/Xinit/xinitrc b/Xinit/xinitrc index c20998c..d517206 100755 --- a/Xinit/xinitrc +++ b/Xinit/xinitrc @@ -24,8 +24,11 @@ statnot ~/dotfiles/Panel/statnot/config & # Init clipboard ~/.tools/clipboard init +# Toutchpad config +xinput --set-prop 12 "libinput Natural Scrolling Enabled" 1 +xinput --set-prop 12 "libinput Tapping Enabled" 1 + # Keyboard bindings -xcape -t 300 -e 'Shift_L=parenleft;Shift_R=parenright;Hyper_L=Shift_L|exclam;Hyper_R=Shift_L|question' & xset r 64 xset r 133 xset r rate 170 60 @@ -33,14 +36,14 @@ xset m 0 0 xset -b # Launch locking program -xautolock -detectsleep -locker '~/.tools/lock' -time 11 -corners 0-00 & +#xautolock -detectsleep -locker '~/.tools/lock' -time 11 -corners 0-00 & # Load xterm colors xrdb -merge ~/.Xresources xrdb -merge ~/.Xdefaults # Automount -#udiskie -N & +udiskie -N -T -q --no-appindicator -a & -xrandr --dpi 186 +xrandr --dpi 161 ratpoison -- cgit v1.2.3-54-g00ecf From 88b5692a4c877d52890b9ac363dbb8dfc15ba46e Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Wed, 20 Sep 2017 00:32:20 +0100 Subject: let mutt clear bar notification --- Mail/mutt/notify.sh | 1 + 1 file changed, 1 insertion(+) (limited to 'Mail') diff --git a/Mail/mutt/notify.sh b/Mail/mutt/notify.sh index a628c52..d4c8d30 100755 --- a/Mail/mutt/notify.sh +++ b/Mail/mutt/notify.sh @@ -21,6 +21,7 @@ if [ $status -eq 0 ];then touch ~/.mutt/newmail else xset -led 1 + echo 'Ixlear' > /tmp/panel-fifo if [ -e ~/.mutt/newmail ];then rm ~/.mutt/newmail fi -- cgit v1.2.3-54-g00ecf From eafd7f9c5a0ed464c5189880988e7da5959200c7 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Wed, 20 Sep 2017 00:32:28 +0100 Subject: add noops for macros --- Mail/muttrc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index 66376fa..b0e76d5 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -64,6 +64,7 @@ ignore x-alt-email x-orcpt company division x-warning #---------------------------------------- # Moving around +bind attach,browser,index,pager g noop bind attach,browser,index gg first-entry bind attach,browser,index G last-entry bind pager gg top @@ -81,6 +82,7 @@ bind browser,pager \Cy previous-line bind index \Ce next-line bind index \Cy previous-line +bind index d noop macro index dd \ "+dove/Trash" \ "move message to the trash" -- cgit v1.2.3-54-g00ecf From 608992d1a428760745e708c1911e56daabeda82b Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sat, 23 Sep 2017 17:11:28 +0100 Subject: let mutt clear panel notification for new mail --- Mail/muttrc | 2 ++ 1 file changed, 2 insertions(+) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index b0e76d5..2f5cba3 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -105,6 +105,8 @@ macro index,pager gt "=dove/Trash" "Go to trash" macro index,pager gd "=dove/Drafts" "Go to drafts" +# Clear new email notification +set status_format="$HOME/.mutt/notify.sh '%r %f (%L) [Msgs:%?M?%M/?%m%?n? New:%n?%?d? Del:%d?%?F? Flag:%F?%?t? Tag:%t?%?p? Post:%p?%?b? Inc:%b?]'|" # Other config -- cgit v1.2.3-54-g00ecf From 0acc2b9fb6df46ea7f45464e80437384a3fb43ac Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sat, 30 Sep 2017 15:55:01 +0100 Subject: Add macros to change sender address --- Mail/msmtprc | 3 ++- Mail/muttrc | 12 +++++++++++- Window_Manager/ratpoison/ratpoisonrc.conf | 4 ++-- 3 files changed, 15 insertions(+), 4 deletions(-) (limited to 'Mail') diff --git a/Mail/msmtprc b/Mail/msmtprc index 6b02734..19ea47a 100644 --- a/Mail/msmtprc +++ b/Mail/msmtprc @@ -14,9 +14,10 @@ port 587 protocol smtp auth on from vasil.zlatanov15@imperial.ac.uk -user vasil.zlatanov15@imperial.ac.uk +user vz215@ic.ac.uk tls on tls_starttls on +tls_trust_file /etc/ssl/certs/ca-certificates.crt account bitmessage host mail.bitmessage.ch diff --git a/Mail/muttrc b/Mail/muttrc index 2f5cba3..cdbcc05 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -3,7 +3,7 @@ source ~/.mutt/crypto.rc #LocalMail config set mbox_type = Maildir -set sendmail = /usr/local/bin/msmtpq +set sendmail = msmtp set folder = ~/.mail/ set spoolfile = "+dove/Inbox" @@ -82,6 +82,16 @@ bind browser,pager \Cy previous-line bind index \Ce next-line bind index \Cy previous-line +# Change from address +bind index F noop +macro index Fi \ + ":set sendmail='msmtp -a imperial'; set from='vasil.zlatanov15@imperial.ac.uk" \ + ":set from to vasil.zlatanov15@imperial.ac.uk" + +macro index Fd \ + "set sendmail='msmtp'; set sendmail='v@skozl.com'" \ + "set from to v@skozl.com' + bind index d noop macro index dd \ "+dove/Trash" \ diff --git a/Window_Manager/ratpoison/ratpoisonrc.conf b/Window_Manager/ratpoison/ratpoisonrc.conf index 02abfc2..a68766d 100644 --- a/Window_Manager/ratpoison/ratpoisonrc.conf +++ b/Window_Manager/ratpoison/ratpoisonrc.conf @@ -106,7 +106,7 @@ bind V hsplit 2/3 bind s vsplit bind S vsplit 2/3 bind d remove -bind space exec qterminal +bind space exec urxvt bind o only bind semicolon colon bind e exec @@ -160,7 +160,7 @@ definekey top s-c colon cont definekey top s-x colon stop definekey top s-f exec firefox -definekey top s-v exec chromium --new-window --start-fullscreen https://google.com +definekey top s-v exec chromium definekey top s-V exec mpv `xclip -o` --ytdl-format=22 definekey top s-h exec ~/.config/vimb/history-search #definekey top s-g exec gvim -- cgit v1.2.3-54-g00ecf From 21d47afd3a0c19280aef4dcc69a30a3af97f026c Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 15 Oct 2017 18:08:11 +0100 Subject: add ical support to mutt --- Mail/mutt/mailcap | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Mail') diff --git a/Mail/mutt/mailcap b/Mail/mutt/mailcap index bc80a85..fbf60e4 100644 --- a/Mail/mutt/mailcap +++ b/Mail/mutt/mailcap @@ -1,3 +1,5 @@ application/*; mkdir -p /tmp/mutt \; cp %s /tmp/mutt \; rifle /tmp/mutt/$(basename %s) & -text/html; chromium '%s' &; test=test -n "$DISPLAY"; needsterminal; +text/html; chromium-dev '%s' &; test=test -n "$DISPLAY"; needsterminal; text/html; w3m -I %{charset} -T text/html; copiousoutput; +text/calendar; mutt-ical.py -i -e "vasil.zlatanov15@imperial.ac.uk" %s +application/ics; mutt-ical.py -i -e "vasil.zlatanov15@imperial.ac.uk" %s -- cgit v1.2.3-54-g00ecf From db01453fe2bde1be9762501839225cf70c5bb6e1 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 15 Oct 2017 18:08:48 +0100 Subject: correct response time and fix macro --- Mail/muttrc | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index cdbcc05..df58018 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -1,6 +1,8 @@ # GPG config source ~/.mutt/crypto.rc +set attribution="On %[!%a, %b %d, %G at %H:%M ], %n <%a> wrote:" + #LocalMail config set mbox_type = Maildir set sendmail = msmtp @@ -89,7 +91,7 @@ macro index Fi \ ":set from to vasil.zlatanov15@imperial.ac.uk" macro index Fd \ - "set sendmail='msmtp'; set sendmail='v@skozl.com'" \ + ":set sendmail='msmtp'; set from='v@skozl.com" \ "set from to v@skozl.com' bind index d noop -- cgit v1.2.3-54-g00ecf From 2986d622ad73bfd6bc997cde556ecac6b126bbaf Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Sun, 15 Oct 2017 18:47:04 +0100 Subject: make vim rewrap --- Mail/mutt/ftplugin/mail.vim | 2 ++ Mail/muttrc | 3 +++ 2 files changed, 5 insertions(+) create mode 100644 Mail/mutt/ftplugin/mail.vim (limited to 'Mail') diff --git a/Mail/mutt/ftplugin/mail.vim b/Mail/mutt/ftplugin/mail.vim new file mode 100644 index 0000000..9064c78 --- /dev/null +++ b/Mail/mutt/ftplugin/mail.vim @@ -0,0 +1,2 @@ +setl tw=72 +setl fo=aw diff --git a/Mail/muttrc b/Mail/muttrc index df58018..1969b49 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -128,6 +128,9 @@ set fast_reply unset help set pager_stop +# Make hard wrap not so hard +set text_flowed=yes + # Remove + on wraps set markers=no set smart_wrap -- cgit v1.2.3-54-g00ecf From 39913f30f1acd41cd696ed64ffab5e1ac271e682 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Mon, 16 Oct 2017 15:03:46 +0100 Subject: add khard support to mutt --- Mail/muttrc | 8 ++++++++ 1 file changed, 8 insertions(+) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index 1969b49..e49c05e 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -19,6 +19,14 @@ mailboxes =dove/Inbox =dove/Sent =dove/Drafts =dove/Trash =dove/Archive # Set search to notmuch bind index,pager / vfolder-from-query +set query_command= "khard email --parsable %s" +bind editor complete-query +bind editor ^T complete + +macro index,pager A \ + "khard add-email" \ + "add the sender email address to khard" + # Dove conf set from = "v@skozl.com" set realname = "Vasil Zlatanov" -- cgit v1.2.3-54-g00ecf From 4a2b90384831ecdb54d1c80ce169246b82b83012 Mon Sep 17 00:00:00 2001 From: Vasil Zlatanov Date: Thu, 23 Nov 2017 22:46:18 +0000 Subject: set mutt editor to nvim --- Mail/muttrc | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) (limited to 'Mail') diff --git a/Mail/muttrc b/Mail/muttrc index e49c05e..045cb4e 100644 --- a/Mail/muttrc +++ b/Mail/muttrc @@ -32,7 +32,7 @@ set from = "v@skozl.com" set realname = "Vasil Zlatanov" # Change the following line to a different editor you prefer. -set editor = "vim" +set editor = "nvim" # Basic config, you can leave this as is set mail_check = 1 -- cgit v1.2.3-54-g00ecf