diff options
Diffstat (limited to '')
| -rw-r--r-- | Xresources_openbsd | 10 | ||||
| -rw-r--r-- | kshrc | 5 | ||||
| -rw-r--r-- | mutt2022/colors256-light | 94 | ||||
| -rw-r--r-- | mutt2022/colors_purple | 39 | ||||
| -rw-r--r-- | mutt2022/muttrc-softyellowgreen | 42 | ||||
| -rw-r--r-- | muttrc_fastmail_may22 | 8 | ||||
| -rw-r--r-- | newsboat/config | 19 | ||||
| -rw-r--r-- | taskrc | 8 | ||||
| -rw-r--r-- | tmux.conf | 79 | ||||
| -rw-r--r-- | vim/vimrc | 5 |
10 files changed, 263 insertions, 46 deletions
diff --git a/Xresources_openbsd b/Xresources_openbsd index cbb7145..d3189c3 100644 --- a/Xresources_openbsd +++ b/Xresources_openbsd @@ -17,15 +17,17 @@ Xft.rgba : rgb !xterm*faceName: xft:monospace:pixelsize=15 !xterm*faceName : DejaVu Sans mono:size=10 !xterm*faceName : Hack-Regular:size=8 -xterm*faceName : Terminus:size=10 -!xterm*faceName : JetBrainsMono:size=9 +!xterm*faceName : Terminus:size=10 +xterm*faceName : JetBrainsMono:size=9 XTerm*backarrowKey : false XTerm.vt100.backarrowKey: false XTerm.ttyModes : erase ^? XTerm.vt100.locale : true XTerm*selectToClipboard : true -XTerm*background : #000000 -XTerm*foreground : #ffffff +!XTerm*background : #000000 +XTerm*background : #fef8ed +!XTerm*foreground : #ffffff +XTerm*foreground : #000000 !remove the additional black border XTerm*borderWidth : 0 XTerm*internalBorder : 2 @@ -59,9 +59,10 @@ case "$(id -u)" in 0) _PS1_COLOR='\[\033[1;31m\]' ;; *) _PS1_COLOR='\[\033[32m\]' ;; esac -# PS1='$_XTERM_TITLE\A $_PS1_COLOR\u@\h$_PS1_CLEAR:$_PS1_BLUE\w$_PS1_COLOR\$$_PS1_CLEAR ' +PS1='$_XTERM_TITLE\A $_PS1_COLOR\u@\h$_PS1_CLEAR:$_PS1_BLUE\w$_PS1_COLOR\$$_PS1_CLEAR ' +export PS1 # export PS1="x1\[\e[31m\] \[\e[m\]\[\e[31m\]:\[\e[m\]\[\e[31m\]:\[\e[m\] \[\e[32m\]\w\[\e[m\] \[\e[34m\]ยป\[\e[m\] " -export PS1='\u@\h:\[\e[33m\]\w\[\e[0m\]\$ ' +# export PS1='\u@\h:\[\e[33m\]\w\[\e[0m\]\$ ' todj () { CMD=cat diff --git a/mutt2022/colors256-light b/mutt2022/colors256-light new file mode 100644 index 0000000..8487d67 --- /dev/null +++ b/mutt2022/colors256-light @@ -0,0 +1,94 @@ +#light colorscheme + +color normal color22 color230 +color indicator color22 color185 +color tree color136 color230 +color status color233 color214 +color error color231 color160 +color message color231 color166 +color signature color240 color230 +color attachment color37 color230 +color search color21 color215 +color tilde color130 color230 +color markers color138 color230 + +#mono bold reverse +#color bold color173 color191 +#mono underline reverse +#color underline color48 color191 + +color quoted color19 color230 # quoted text +color quoted1 color88 color230 +color quoted2 color55 color230 +color quoted3 color16 color230 +color quoted4 color52 color230 +color quoted5 color24 color230 +color quoted6 color96 color230 +color quoted7 color235 color230 +color quoted8 color130 color230 +color quoted9 color26 color230 +# color body cyan color230 "((ftp|http|https)://|news:)[^ >)\"\t]+" +# color body cyan color230 "[-a-z_0-9.+]+@[-a-z_0-9.]+" +# color body red color230 "(^| )\\*[-a-z0-9*]+\\*[,.?]?[ \n]" +# color body green color230 "(^| )_[-a-z0-9_]+_[,.?]?[\n]" +# color body red color230 "(^| )\\*[-a-z0-9*]+\\*[,.?]?[ \n]" +# color body green color230 "(^| )_[-a-z0-9_]+_[,.?]?[ \n]" + +color index color160 color230 ~F # Flagged +color index color20 color228 ~N # New +color index color20 color231 ~O +color index color22 color221 ~T # Tagged +color index color240 color230 ~D # Deleted + +###################### + +#mono body reverse '^(subject):.*' +#color body brightwhite magenta '^(subject):.*' +#mono body reverse '[[:alpha:]][[:alnum:]-]+:' +#color body black cyan '[[:alpha:]][[:alnum:]-]+:' + +###################### +# header + +color hdrdefault color23 color229 +color header color30 color229 '^date:' +color header color22 color229 '^(to|cc|bcc):' +color header color20 color229 '^from:' +color header color124 color229 '^subject:' +color header color31 color229 '^user-agent:' +color header color29 color229 '^reply-to:' + +#color header magenta default '^(status|lines|date|received|sender|references):' +#color header magenta default '^(pr|mime|x-|user|return|content-)[^:]*:' +#color header brightyellow default '^content-type:' +#color header magenta default '^content-type: *text/plain' +# color header brightgreen default '^list-[^:]*:' +#mono header bold '^(subject):.*$' +#color header brightcyan default '^(disposition)' +#color header green default '^(mail-)?followup' +#color header white default '^reply' +#color header brightwhite default '^(resent)' +# color header brightwhite default '^from:' + +###################### +# spam + +### html +#color index blue default '~b "<(img|a |html|body)"' + +### china spam +#color index brightred black '~h "^(content-type:| +).*charset=\"?(big5|gb2312|SHIFT.JIS|euc.kr|windows.125[^2]|iso.[0-9]+.jp|koi[^ ;"])"' + +### sex +#color index brightyellow black "~b '(p$E+n$I+$S|sex|er$E+ct$I+$O+n|p$O+rn$O+|v$I+$A+gr|c$I+$A+$L+$I+$S)'" + +### misc +#color index cyan black '~b "(w$A+tch|r$E+p$L+$I+c$A|d$I+p$L+$O+m|d$E+gr$E+e|pr$I+ce|s$A+les|\\\$[0-9]+)"' + +### drug +#color index white black "~b '(ph$A+rm$A+cy|m$E+d$I+c$A+t$I+$O+n|pr$E+scr$I+pt$I+$O+n|d$I+$S+c$O+$U+nt|p$I+$L+$S|v$A+$L+$I+$U+m|v$I+c$O+d$I+n)'" + + +#mono index bold '~h "^content-type: *(multipart/(mixed|signed|encrypted)|application/)"' +#color index green black '~h "^content-type: *multipart/(signed|encrypted)"' + diff --git a/mutt2022/colors_purple b/mutt2022/colors_purple new file mode 100644 index 0000000..818f42c --- /dev/null +++ b/mutt2022/colors_purple @@ -0,0 +1,39 @@ + +#-------------------snip----------------------- +set allow_ansi=yes + +color normal black default +color quoted color65 default +color quoted1 color138 default +color quoted2 color58 default +color quoted3 color105 default +color quoted4 cyan default +color quoted5 cyan default + +color indicator black color249 +color message green default +color status color139 color254 +color error color58 default +color attachment black default +color signature color253 default +color markers red yellow +color tilde black default +color search black green +color tree black default +color bold black default + +color hdrdefault black default +color header green default '^From:' +color header green default '^Subject:' +color header cyan default '^To:.*corky1951' + +color index color22 default ~N +color index blue default ~F +color index color55 default ~T +color index color52 default ~D + +color body color22 default "(http|https|ftp|news|telnet|finger)://[^ \">\t\r\n]*" +color body color22 default "mailto:[-a-z_0-9.]+ <at> [-a-z_0-9.]+" +color body color22 default "news:[^ \">\t\r\n]*" + +color body green default "[-a-z_0-9.%$]+ <at> [-a-z_0-9.]+\\.[-a-z][-a-z]+" diff --git a/mutt2022/muttrc-softyellowgreen b/mutt2022/muttrc-softyellowgreen new file mode 100644 index 0000000..c7c1793 --- /dev/null +++ b/mutt2022/muttrc-softyellowgreen @@ -0,0 +1,42 @@ + +#-------------------snip----------------------- +set allow_ansi=yes + +color normal black color255 +color quoted color236 color255 +color quoted1 color242 color255 +color quoted2 color246 color255 +color quoted3 color252 color255 +#color quoted4 cyan color255 +#color quoted5 cyan color255 + +color indicator black color254 +color message color28 color254 +color status color143 color234 +color error color58 color254 +color attachment black color254 +color signature color252 color254 +color markers color104 color254 +color tilde color69 color254 +color search black color153 +color tree color184 color255 +color bold brightblack color254 + +color hdrdefault black color254 +color header black color254 '^From:' +color header black color254 '^Subject:' +color header black color254 '^To:' + +color index color28 color255 ~N +color index color100 color254 ~F +color index color55 color254 ~T +color index color244 color255 ~D + +color body color18 color254 "(http|https|ftp|news|telnet|finger)://[^ \">\t\r\n]*" +color body color37 color255 "mailto:[-a-z_0-9.]+ <at> [-a-z_0-9.]+" +color body color18 color254 "news:[^ \">\t\r\n]*" +color body color112 color254 "[-a-z_0-9.%$]+ <at> [-a-z_0-9.]+\\.[-a-z][-a-z]+" +color body color112 color254 "^.*Autoview.*$" + + + diff --git a/muttrc_fastmail_may22 b/muttrc_fastmail_may22 index fa61928..95a8296 100644 --- a/muttrc_fastmail_may22 +++ b/muttrc_fastmail_may22 @@ -4,6 +4,10 @@ # source the mutt-solarized colorscheme #source ~/openbsd-dotfiles/mutt/mutt-colors-solarized-dark-256.muttrc +#source ~/.mutt/mutt-colors-solarized-light-256.muttrc +source ~/.mutt/colors_purple +#source ~/.mutt/colors256-light +#source ~/.mutt/muttrc-softyellowgreen set folder = ~/Mail/fastmail # mailbox location set alias_file = ~/.mutt/aliases # where to store aliases @@ -15,7 +19,7 @@ set tmpdir = ~/.mutt/temp # where to keep temp files set signature = ~/.mutt/signature # my signature file source ~/.mutt/subscriptions # Define the list of subscribed mailing lists. -source ~/.mutt/colours # Define colours. +#source ~/.mutt/colours # Define colours. # Allow forwarding of attachments with emails set mime_forward @@ -254,7 +258,7 @@ source ~/.mutt/mailboxes # Define the list of folders that receiv #source ~/.mutt/message-hooks # Define message hooks. #source ~/.mutt/bindings # Define key bindings. #source ~/.mutt/macros # Define macros. -source ~/.mutt/colours # Define colours. +#source ~/.mutt/colours # Define colours. #source ~/.mutt/sidebar # Define sidebar support (requires sidebar patch) # # MAILCAP diff --git a/newsboat/config b/newsboat/config index 21d4382..7f981bc 100644 --- a/newsboat/config +++ b/newsboat/config @@ -49,14 +49,17 @@ macro m set browser "mpv %u" ; open-in-browser ; set browser "/home/lemon/dotfil # massive hack but it works macro y set browser "get-newsboat-comment.sh %u" ; open-in-browser ; set browser "/home/lemon/dotfiles/lynx/lynx %u" -# solarized -color background default default -color listnormal default default -color listnormal_unread default default -color listfocus black cyan -color listfocus_unread black cyan -color info default black -color article default default +# color light +include /usr/local/share/doc/newsboat/contrib/colorschemes/light + +# # solarized +# color background default default +# color listnormal default default +# color listnormal_unread default default +# color listfocus black cyan +# color listfocus_unread black cyan +# color info default black +# color article default default confirm-mark-all-feeds-read no confirm-mark-feed-read no @@ -38,8 +38,8 @@ data.location=~/.task weekstart=Monday # Color theme (uncomment one to use) -#include /usr/share/doc/task/rc/light-16.theme -#include /usr/share/taskwarrior/light-256.theme +#include /usr/local/share/doc/taskwarrior/rc/light-16.theme +include /usr/local/share/doc/taskwarrior/rc/light-256.theme #include /usr/share/taskwarrior/dark-16.theme #include /usr/share/doc/task/rc/dark-256.theme #include /usr/share/doc/task/rc/dark-red-256.theme @@ -51,8 +51,8 @@ weekstart=Monday #include /usr/share/taskwarrior/dark-gray-256.theme #include /usr/share/taskwarrior/dark-gray-blue-256.theme #include /usr/share/taskwarrior/solarized-dark-256.theme -#include /usr/share/taskwarrior/solarized-light-256.theme -#include /usr/share/taskwarrior/no-color.theme +#include /usr/local/share/doc/taskwarrior/rc/solarized-light-256.theme +#include /usr/local/share/doc/taskwarrior/rc/no-color.theme #include /home/lemon/.task/solarized-16.theme #include /home/lemon/.task/solarized-dark-256.theme # @@ -94,29 +94,28 @@ bind-key -T copy-mode-vi r send-keys -X rectangle-toggle #bind -t vi-copy y copy-pipe "xclip -sel clip -i" # geohot colors -set -g status-position bottom -set -g status-bg colour234 -set -g status-fg colour137 -set -g status-style dim -set -g status-left '' -set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S ' -set -g status-right-length 50 -set -g status-left-length 20 - -setw -g window-status-current-style fg=colour81 -setw -g window-status-current-style bg=colour238 -setw -g window-status-current-style bold -setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' - -setw -g window-status-style fg=colour138 -setw -g window-status-style bg=colour235 -setw -g window-status-style none -setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' - -setw -g window-status-bell-style bold -setw -g window-status-bell-style fg=colour255 -setw -g window-status-bell-style bg=colour1 - +# set -g status-position bottom +# set -g status-bg colour234 +# set -g status-fg colour137 +# set -g status-style dim +# set -g status-left '' +# set -g status-right '#[fg=colour233,bg=colour241,bold] %d/%m #[fg=colour233,bg=colour245,bold] %H:%M:%S ' +# set -g status-right-length 50 +# set -g status-left-length 20 + +# setw -g window-status-current-style fg=colour81 +# setw -g window-status-current-style bg=colour238 +# setw -g window-status-current-style bold +# setw -g window-status-current-format ' #I#[fg=colour250]:#[fg=colour255]#W#[fg=colour50]#F ' + +# setw -g window-status-style fg=colour138 +# setw -g window-status-style bg=colour235 +# setw -g window-status-style none +# setw -g window-status-format ' #I#[fg=colour237]:#[fg=colour250]#W#[fg=colour244]#F ' + +# setw -g window-status-bell-style bold +# setw -g window-status-bell-style fg=colour255 +# setw -g window-status-bell-style bg=colour1 # fiddle with colors of status bar # set color for status bar @@ -167,7 +166,39 @@ setw -g mode-keys vi # battery information in status bar set status-interval 40 -set -g status-right "#[fg=colour155]#(apm -l)%% | #[fg=colour45]%d %b %R" +#set -g status-right "#[fg=colour155]#(apm -l)%% | #[fg=colour45]%d %b %R" + +# solarized light colours from https://raw.githubusercontent.com/seebi/tmux-colors-solarized/master/tmuxcolors-light.conf +#### COLOUR (Solarized light) + +# default statusbar colors +set-option -g status-style fg=magenta,bg=white #yellow and base2 + +# default window title colors +set-window-option -g window-status-style fg=black,bg=default #base0 and default +#set-window-option -g window-status-style dim + +# active window title colors +set-window-option -g window-status-current-style fg=brightred,bg=default #orange and default +#set-window-option -g window-status-current-style bright + +# pane border +set-option -g pane-border-style fg=white #base2 +set-option -g pane-active-border-style fg=brightcyan #base1 + +# message text +set-option -g message-style fg=brightred,bg=white #orange and base2 + +# pane number display +set-option -g display-panes-active-colour blue #blue +set-option -g display-panes-colour brightred #orange + +# clock +set-window-option -g clock-mode-colour red #green + +# bell +set-window-option -g window-status-bell-style fg=white,bg=red #base2, red + # ## Smart pane switching with awareness of Vim splits. @@ -447,8 +447,9 @@ let g:gruvbox_sign_column='bg0' let g:gruvbox_number_column='bg0' let g:gruvbox_invert_signs='0' let g:gruvbox_improved_strings='0' -set background=dark -colorscheme industry +set background=light +"colorscheme industry +colorscheme delek " manual highlights " highlight Visual ctermfg=black ctermbg=LightMagenta |