dotfiles

Obligatory dotfiles repo
git clone git://git.danielmoch.com/dotfiles.git
Log | Files | Refs

commit 6e510471a42b25ad0d9f898c1c2a294cd0f03ac7
parent 0673b33451c41799109df15166ecbedd0638096b
Author: Daniel Moch <daniel@danielmoch.com>
Date:   Sun,  1 Sep 2019 15:31:13 -0400

New color scheme

Diffstat:
M.Xresources | 42++++++++++++++++++++----------------------
M.bashrc | 9+--------
M.config/awesome/theme.lua | 70++++++++++++++--------------------------------------------------------
M.config/gtk-3.0/settings.ini | 2+-
M.config/nncli/config | 6+++---
M.config/qutebrowser/config.py | 34+++++++++++++++++-----------------
M.irssi/config | 2+-
A.irssi/djmoch.theme | 295+++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++++
M.local/lib/tmux/battery_indicator.sh | 4++--
M.minttyrc | 36++++++++++++++++++------------------
M.muttrc | 146++++++++++++++++++++++++++++++++++++++++----------------------------------------
M.newsboat/config | 10+++++-----
M.tmux.conf | 3++-
M.vim/vimrc | 2+-
M.zshrc | 13+------------
15 files changed, 454 insertions(+), 220 deletions(-)

diff --git a/.Xresources b/.Xresources @@ -14,24 +14,24 @@ Xft.hintsytle: hintlight Xft.lcdfilter: lcddefault ! Global defaults -*background: #262626 -*foreground: #BCBCBC +*background: #FFFFFF +*foreground: #000000 *font: FIXED -*color0: #1C1C1C -*color8: #444444 -*color1: #AF5F5F -*color9: #FF8700 -*color2: #5F875F -*color10: #87AF87 -*color3: #87875F -*color11: #FFFFAF -*color4: #5F87AF -*color12: #8FAFD7 -*color5: #5F5F87 -*color13: #8787AF -*color6: #5F8787 -*color14: #5FAFAF -*color7: #6C6C6C +*color0: #000000 +*color8: #3A3A3A +*color1: #870000 +*color9: #D7005F +*color2: #00875F +*color10: #00D75F +*color3: #878700 +*color11: #D7D787 +*color4: #005FAF +*color12: #5FAFFF +*color5: #875FAF +*color13: #D787FF +*color6: #008080 +*color14: #87FF87 +*color7: #BCBCBC *color15: #FFFFFF ! XTerm @@ -46,7 +46,7 @@ XTerm*visualBell: true XTerm*bellIsUrgent: true XTerm*highlightColorMode: true XTerm*highlightReverse: false -XTerm*highlightColor: #8FAFD7 +XTerm*highlightColor: #bcbcbc XTerm*metaSendsEscape: true XTerm*pointerMode: 2 @@ -62,8 +62,8 @@ URxvt.scrollBar: false URxvt.secondaryScreen: 1 URxvt.secondaryScroll: 0 URxvt.secondaryWheel: 1 -URxvt.highlightColor: #8FAFD7 -URxvt.highlightTextColor: #262626 +URxvt.highlightColor: #bcbcbc +URxvt.highlightTextColor: #000000 URxvt.meta8: false URxvt.visualBell: true URxvt.urgentOnBell: true @@ -72,8 +72,6 @@ URxvt.pointerBlank: true URxvt.pointerBlankDelay: 4 ! XDvi -XDvi.background: #BCBCBC -XDvi.foreground: #262626 XDvi.editor: gvim --servername xdvi --remote +%l %f XDvi.wwwBrowser: my-open XDvi.expertMode: 31 diff --git a/.bashrc b/.bashrc @@ -12,14 +12,7 @@ GIT_PS1_SHOWDIRTYSTATE=1 GIT_PS1_SHOWUNTRACKEDFILES=1 source "$HOME/.local/lib/sh/git-prompt.sh" -if [[ $TERM = *256color ]] -then - usercolor='\[\033[34m\]' -else - usercolor='\[\033[01;34m\]' -fi - -export PS1=$usercolor'\u\[\033[m\]@\[\033[32m\]\h:\[\033[m\]\W\[\033[31m\]$(__git_ps1 " (%s)")\[\033[m\]\$ ' +export PS1='\u@\h:\W$(__git_ps1 " (%s)")\$ ' export PROMPT_COMMAND='echo -ne "\033]0;${USER}@${HOSTNAME}:${PWD}\007"' [ -r "$BASH_COMPLETION" ] && source "$BASH_COMPLETION" diff --git a/.config/awesome/theme.lua b/.config/awesome/theme.lua @@ -10,92 +10,50 @@ local gfs = require("gears.filesystem") local awful = require("awful") local themes_path = gfs.get_themes_dir() -local theme = {} +local theme = dofile(themes_path.."default/theme.lua") theme.font = "sans 9" -theme.bg_normal = xtheme.background +theme.bg_normal = xtheme.color8 theme.bg_focus = xtheme.color7 -theme.bg_urgent = xtheme.color3 +theme.bg_urgent = xtheme.color4 theme.bg_minimize = xtheme.color0 -theme.bg_systray = xtheme.background +theme.bg_systray = xtheme.color8 -theme.fg_normal = xtheme.foreground +theme.fg_normal = xtheme.background theme.fg_focus = xtheme.foreground theme.fg_urgent = xtheme.background -theme.fg_minimize = xtheme.foreground +theme.fg_minimize = xtheme.background theme.useless_gap = dpi(0) theme.border_width = dpi(1) theme.border_normal = xtheme.color8 -theme.border_focus = xtheme.color6 +theme.border_focus = xtheme.color4 theme.border_marked = xtheme.color5 -theme.hotkeys_bg = xtheme.background -theme.hotkeys_fg = xtheme.foregound +theme.hotkeys_bg = xtheme.color8 +theme.hotkeys_fg = xtheme.background theme.hotkeys_modifiers_fg = xtheme.color6 -- Generate taglist squares: local taglist_square_size = dpi(4) theme.taglist_squares_sel = theme_assets.taglist_squares_sel( - taglist_square_size, theme.fg_normal + taglist_square_size, theme.fg_focus ) theme.taglist_squares_unsel = theme_assets.taglist_squares_unsel( taglist_square_size, theme.fg_normal ) +theme = theme_assets.recolor_layout(theme, theme.fg_normal) +theme = theme_assets.recolor_titlebar(theme, theme.fg_normal, "normal") +theme = theme_assets.recolor_titlebar(theme, theme.bg_normal, "focus") + -- Variables set for theming the menu: -theme.menu_submenu_icon = themes_path.."default/submenu.png" theme.menu_height = dpi(15) theme.menu_width = dpi(100) --- Define the image to load -theme.titlebar_close_button_normal = themes_path.."default/titlebar/close_normal.png" -theme.titlebar_close_button_focus = themes_path.."default/titlebar/close_focus.png" - -theme.titlebar_minimize_button_normal = themes_path.."default/titlebar/minimize_normal.png" -theme.titlebar_minimize_button_focus = themes_path.."default/titlebar/minimize_focus.png" - -theme.titlebar_ontop_button_normal_inactive = themes_path.."default/titlebar/ontop_normal_inactive.png" -theme.titlebar_ontop_button_focus_inactive = themes_path.."default/titlebar/ontop_focus_inactive.png" -theme.titlebar_ontop_button_normal_active = themes_path.."default/titlebar/ontop_normal_active.png" -theme.titlebar_ontop_button_focus_active = themes_path.."default/titlebar/ontop_focus_active.png" - -theme.titlebar_sticky_button_normal_inactive = themes_path.."default/titlebar/sticky_normal_inactive.png" -theme.titlebar_sticky_button_focus_inactive = themes_path.."default/titlebar/sticky_focus_inactive.png" -theme.titlebar_sticky_button_normal_active = themes_path.."default/titlebar/sticky_normal_active.png" -theme.titlebar_sticky_button_focus_active = themes_path.."default/titlebar/sticky_focus_active.png" - -theme.titlebar_floating_button_normal_inactive = themes_path.."default/titlebar/floating_normal_inactive.png" -theme.titlebar_floating_button_focus_inactive = themes_path.."default/titlebar/floating_focus_inactive.png" -theme.titlebar_floating_button_normal_active = themes_path.."default/titlebar/floating_normal_active.png" -theme.titlebar_floating_button_focus_active = themes_path.."default/titlebar/floating_focus_active.png" - -theme.titlebar_maximized_button_normal_inactive = themes_path.."default/titlebar/maximized_normal_inactive.png" -theme.titlebar_maximized_button_focus_inactive = themes_path.."default/titlebar/maximized_focus_inactive.png" -theme.titlebar_maximized_button_normal_active = themes_path.."default/titlebar/maximized_normal_active.png" -theme.titlebar_maximized_button_focus_active = themes_path.."default/titlebar/maximized_focus_active.png" - theme.wallpaper = function (s) awful.spawn('my wallpaper') end --- You can use your own layout icons like this: -theme.layout_fairh = themes_path.."default/layouts/fairhw.png" -theme.layout_fairv = themes_path.."default/layouts/fairvw.png" -theme.layout_floating = themes_path.."default/layouts/floatingw.png" -theme.layout_magnifier = themes_path.."default/layouts/magnifierw.png" -theme.layout_max = themes_path.."default/layouts/maxw.png" -theme.layout_fullscreen = themes_path.."default/layouts/fullscreenw.png" -theme.layout_tilebottom = themes_path.."default/layouts/tilebottomw.png" -theme.layout_tileleft = themes_path.."default/layouts/tileleftw.png" -theme.layout_tile = themes_path.."default/layouts/tilew.png" -theme.layout_tiletop = themes_path.."default/layouts/tiletopw.png" -theme.layout_spiral = themes_path.."default/layouts/spiralw.png" -theme.layout_dwindle = themes_path.."default/layouts/dwindlew.png" -theme.layout_cornernw = themes_path.."default/layouts/cornernww.png" -theme.layout_cornerne = themes_path.."default/layouts/cornernew.png" -theme.layout_cornersw = themes_path.."default/layouts/cornersww.png" -theme.layout_cornerse = themes_path.."default/layouts/cornersew.png" - -- Generate Awesome icon: theme.awesome_icon = theme_assets.awesome_icon( theme.menu_height, theme.bg_focus, theme.fg_focus diff --git a/.config/gtk-3.0/settings.ini b/.config/gtk-3.0/settings.ini @@ -1,4 +1,4 @@ [Settings] -gtk-application-prefer-dark-theme = true +gtk-application-prefer-dark-theme = false gtk-can-change-accels = 1 gtk-font-name = "sans 9" diff --git a/.config/nncli/config b/.config/nncli/config @@ -4,14 +4,14 @@ cfg_nn_password_eval=my-netrc nextcloud.djmoch.org password cfg_nn_host=nextcloud.djmoch.org clr_default_fg=default clr_default_bg=default -clr_status_bar_fg=black -clr_status_bar_bg=brown +clr_status_bar_fg=white +clr_status_bar_bg=dark blue clr_log_fg=black clr_log_bg=brown clr_user_input_bar_fg=default clr_user_input_bar_bg=default clr_note_focus_fg=black -clr_note_focus_bg=light blue +clr_note_focus_bg=light gray clr_note_title_day_fg=light blue ; clr_note_title_day_bg clr_note_title_week_fg=dark green diff --git a/.config/qutebrowser/config.py b/.config/qutebrowser/config.py @@ -3,23 +3,23 @@ c.aliases['o'] = 'open' c.aliases['h'] = 'help' -c.colors.tabs.odd.bg = '#262626' -c.colors.tabs.odd.fg = '#BCBCBC' -c.colors.tabs.even.bg = '#262626' -c.colors.tabs.even.fg = '#BCBCBC' -c.colors.tabs.selected.odd.bg = '#6C6C6C' -c.colors.tabs.selected.odd.fg = '#BCBCBC' -c.colors.tabs.selected.even.bg = '#6C6C6C' -c.colors.tabs.selected.even.fg = '#BCBCBC' - -c.colors.tabs.pinned.odd.bg = '#262626' -c.colors.tabs.pinned.odd.fg = '#BCBCBC' -c.colors.tabs.pinned.even.bg = '#262626' -c.colors.tabs.pinned.even.fg = '#BCBCBC' -c.colors.tabs.pinned.selected.odd.bg = '#6C6C6C' -c.colors.tabs.pinned.selected.odd.fg = '#BCBCBC' -c.colors.tabs.pinned.selected.even.bg = '#6C6C6C' -c.colors.tabs.pinned.selected.even.fg = '#BCBCBC' +c.colors.tabs.odd.bg = '#3A3A3A' +c.colors.tabs.odd.fg = '#FFFFFF' +c.colors.tabs.even.bg = '#3A3A3A' +c.colors.tabs.even.fg = '#FFFFFF' +c.colors.tabs.selected.odd.bg = '#BCBCBC' +c.colors.tabs.selected.odd.fg = '#000000' +c.colors.tabs.selected.even.bg = '#BCBCBC' +c.colors.tabs.selected.even.fg = '#000000' + +c.colors.tabs.pinned.odd.bg = '#3A3A3A' +c.colors.tabs.pinned.odd.fg = '#FFFFFF' +c.colors.tabs.pinned.even.bg = '#3A3A3A' +c.colors.tabs.pinned.even.fg = '#FFFFFF' +c.colors.tabs.pinned.selected.odd.bg = '#BCBCBC' +c.colors.tabs.pinned.selected.odd.fg = '#000000' +c.colors.tabs.pinned.selected.even.bg = '#BCBCBC' +c.colors.tabs.pinned.selected.even.fg = '#000000' c.content.cookies.accept = 'no-3rdparty' c.content.default_encoding = 'utf-8' diff --git a/.irssi/config b/.irssi/config @@ -291,7 +291,7 @@ settings = { "fe-common/core" = { hilight_nick_matches_everywhere = "yes"; use_status_window = "yes"; - theme = "apprentice"; + theme = "djmoch"; }; "perl/core/scripts" = { nicklist_height = "46"; nicklist_width = "29"; }; }; diff --git a/.irssi/djmoch.theme b/.irssi/djmoch.theme @@ -0,0 +1,295 @@ +# When testing changes, the easiest way to reload the theme is with /RELOAD. +# This reloads the configuration file too, so if you did any changes remember +# to /SAVE it first. Remember also that /SAVE overwrites the theme file with +# old data so keep backups :) + +# TEMPLATES: + +# The real text formats that irssi uses are the ones you can find with +# /FORMAT command. Back in the old days all the colors and texts were mixed +# up in those formats, and it was really hard to change the colors since you +# might have had to change them in tens of different places. So, then came +# this templating system. + +# Now the /FORMATs don't have any colors in them, and they also have very +# little other styling. Most of the stuff you need to change is in this +# theme file. If you can't change something here, you can always go back +# to change the /FORMATs directly, they're also saved in these .theme files. + +# So .. the templates. They're those {blahblah} parts you see all over the +# /FORMATs and here. Their usage is simply {name parameter1 parameter2}. +# When irssi sees this kind of text, it goes to find "name" from abstracts +# block below and sets "parameter1" into $0 and "parameter2" into $1 (you +# can have more parameters of course). Templates can have subtemplates. +# Here's a small example: +# /FORMAT format hello {colorify {underline world}} +# abstracts = { colorify = "%G$0-%n"; underline = "%U$0-%U"; } +# When irssi expands the templates in "format", the final string would be: +# hello %G%Uworld%U%n +# ie. underlined bright green "world" text. +# and why "$0-", why not "$0"? $0 would only mean the first parameter, +# $0- means all the parameters. With {underline hello world} you'd really +# want to underline both of the words, not just the hello (and world would +# actually be removed entirely). + +# COLORS: + +# You can find definitions for the color format codes in docs/formats.txt. + +# There's one difference here though. %n format. Normally it means the +# default color of the terminal (white mostly), but here it means the +# "reset color back to the one it was in higher template". For example +# if there was /FORMAT test %G{foo}bar, and foo = "%Y$0%n", irssi would +# print yellow "foo" (as set with %Y) but "bar" would be green, which was +# set at the beginning before the {foo} template. If there wasn't the %G +# at start, the normal behaviour of %n would occur. If you _really_ want +# to use the terminal's default color, use %n. + +############################################################################# + +# default foreground color (%n) - -1 is the "default terminal color" +default_color = "-1"; + +# print timestamp/servertag at the end of line, not at beginning +info_eol = "false"; + +# these characters are automatically replaced with specified color +# (dark grey by default) +replaces = { "[]=" = "$*"; }; + +abstracts = { + ## + ## generic + ## + + # text to insert at the beginning of each non-message line + line_start = "-!- "; + + # timestamp styling, nothing by default + timestamp = "%n$*"; + + # any kind of text that needs hilighting, default is to bold + hilight = "$*"; + + # any kind of error message, default is bright red + error = "%r$*%n"; + + # channel name is printed + channel = "$*"; + + # nick is printed + nick = "$*"; + + # nick host is printed + nickhost = "%n[$*]"; + + # server name is printed + server = "$*"; + + # some kind of comment is printed + comment = "%n[$*]"; + + # reason for something is printed (part, quit, kick, ..) + reason = "{comment $*}"; + + # mode change is printed ([+o nick]) + mode = "{comment $*}"; + + ## + ## channel specific messages + ## + + # highlighted nick/host is printed (joins) + channick_hilight = "$*"; + chanhost_hilight = "{nickhost $*}"; + + # nick/host is printed (parts, quits, etc.) + channick = "$*"; + chanhost = "{nickhost $*}"; + + # highlighted channel name is printed + channelhilight = "%M$*%n"; + + # ban/ban exception/invite list mask is printed + ban = "$*"; + + ## + ## messages + ## + + # the basic styling of how to print message, $0 = nick mode, $1 = nick + msgnick = "<$0$1-> %|"; + + # message from you is printed. "ownnick" specifies the styling of the + # nick ($0 part in msgnick) and "ownmsgnick" specifies the styling of the + # whole line. + + # Example1: You want the message text to be green: + # ownmsgnick = "{msgnick $0 $1-}%G"; + # Example2.1: You want < and > chars to be yellow: + # ownmsgnick = "%Y{msgnick $0 $1-%Y}%n"; + # (you'll also have to remove <> from replaces list above) + # Example2.2: But you still want to keep <> grey for other messages: + # pubmsgnick = "%G{msgnick $0 $1-%G}%n"; + # pubmsgmenick = "%G{msgnick $0 $1-%G}%n"; + # pubmsghinick = "%G{msgnick $1 $0$2-%n%G}%n"; + # ownprivmsgnick = "%G{msgnick $*%G}%n"; + # privmsgnick = "%G{msgnick %R$*%G}%n"; + + # $0 = nick mode, $1 = nick + ownmsgnick = "{msgnick $0 $1-}"; + ownnick = "%_$*%_"; + + # public message in channel, $0 = nick mode, $1 = nick + pubmsgnick = "{msgnick $0 $1-}"; + pubnick = "%_$*%_"; + + # public message in channel meant for me, $0 = nick mode, $1 = nick + pubmsgmenick = "{msgnick $0 $1-}"; + menick = "%y$*%n"; + + # public highlighted message in channel + # $0 = highlight color, $1 = nick mode, $2 = nick + pubmsghinick = "{msgnick $1 $0$2-%n}"; + + # channel name is printed with message + msgchannel = "%G:%m$*%n"; + + # private message, $0 = nick, $1 = host + privmsg = "[%R$0%G(%r$1-%G)%n] "; + + # private message from you, $0 = "msg", $1 = target nick + ownprivmsg = "[%r$0%G(%R$1-%G)%n] "; + + # own private message in query + ownprivmsgnick = "{msgnick $*}"; + ownprivnick = "%_$*%_"; + + # private message in query + privmsgnick = "{msgnick %R$*%n}"; + + ## + ## Actions (/ME stuff) + ## + + # used internally by this theme + action_core = " * $*"; + + # generic one that's used by most actions + action = "{action_core $*} "; + + # own action, both private/public + ownaction = "{action $*}"; + + # own action with target, both private/public + ownaction_target = "{action_core $0}%G:%m$1%n "; + + # private action sent by others + pvtaction = "%_ (*) $*%_ "; + pvtaction_query = "{action $*}"; + + # public action sent by others + pubaction = "{action $*}"; + + + ## + ## other IRC events + ## + + # whois + whois = "%# $[8]0 : $1-"; + + # notices + ownnotice = "[%r$0%G(%R$1-%G)]%n "; + notice = "%G-%C$*%G-%n "; + pubnotice_channel = "%G:%C$*"; + pvtnotice_host = "%G(%C$*%G)"; + servernotice = "%G!$*%n "; + + # CTCPs + ownctcp = "[%r$0%G(%R$1-%G)] "; + ctcp = "%G$*%n"; + + # wallops + wallop = "%_$*%_: "; + wallop_nick = "%n$*"; + wallop_action = "%_ * $*%_ "; + + # netsplits + netsplit = "%R$*%n"; + netjoin = "%M$*%n"; + + # /names list + names_prefix = ""; + names_nick = "[$0$1-] "; + names_nick_op = "{names_nick $*}"; + names_nick_halfop = "{names_nick $*}"; + names_nick_voice = "{names_nick $*}"; + names_users = "[%G$*%n]"; + names_channel = "%G$*%n"; + + # DCC + dcc = "%$*%n"; + dccfile = "%_$*%_"; + + # DCC chat, own msg/action + dccownmsg = "[%r$0%G($1-%G)%n] "; + dccownnick = "%R$*%n"; + dccownquerynick = "%_$*%_"; + dccownaction = "{action $*}"; + dccownaction_target = "{action_core $0}%G:%m$1%n "; + + # DCC chat, others + dccmsg = "[%G$1-%G(%G$0%G)%n] "; + dccquerynick = "%G$*%n"; + dccaction = "%_ (*dcc*) $*%_ %|"; + + ## + ## statusbar + ## + + # default background for all statusbars. You can also give + # the default foreground color for statusbar items. + sb_background = "%4%W"; + + # default backround for "default" statusbar group + #sb_default_bg = "%4"; + # background for prompt / input line + sb_prompt_bg = "%n"; + # background for info statusbar + sb_info_bg = "%n"; + # background for topicbar (same default) + #sb_topic_bg = "%4"; + + # text at the beginning of statusbars. sb-item already puts + # space there,so we don't use anything by default. + sbstart = "%_"; + # text at the end of statusbars. Use space so that it's never + # used for anything. + sbend = " "; + + topicsbstart = "{sbstart $*}"; + topicsbend = "{sbend $*}"; + + prompt = "[$*] "; + + sb = " [$*]"; + sbmode = "(+$*)"; + sbaway = " (zZzZ)"; + sbservertag = ":$0 (change with ^X)"; + sbnickmode = "$0"; + + # activity in statusbar + + # ',' separator + sb_act_sep = "%W$*"; + # normal text + sb_act_text = "%w$*%W"; + # public message + sb_act_msg = "%W$*%W"; + # hilight + sb_act_hilight = "%y$*%W"; + # hilight with specified color, $0 = color, $1 = text + sb_act_hilight_color = "$0$1-%n"; +}; +settings = { "fe-text" = { actlist_sort = "refnum"; }; }; diff --git a/.local/lib/tmux/battery_indicator.sh b/.local/lib/tmux/battery_indicator.sh @@ -7,11 +7,11 @@ SMILE='☻ ' charged_slots=$((`my battery percent` / 25)) [ $charged_slots -gt 3 ] && charged_slots=3 -echo -n '#[fg=colour108]' +echo -n '#[fg=green]' for i in `seq 1 $charged_slots`; do echo -n "$SMILE"; done if [ $charged_slots -lt 3 ]; then - echo -n '#[fg=colour131]' + echo -n '#[fg=red]' uncharged_slots=$((3-$charged_slots)) for i in `seq 1 $uncharged_slots`; do echo -n "$SMILE"; done fi diff --git a/.minttyrc b/.minttyrc @@ -7,24 +7,24 @@ Term=xterm-256color FontSmoothing=full CursorType=block CursorBlinks=no -CursorColour=188,188,188 -ForegroundColour=188,188,188 -BackgroundColour=38,38,38 -Black=28,28,28 -Red=175,95,95 -Green=95,135,95 -Yellow=135,135,95 -Blue=95,135,175 -Magenta=95,95,135 -Cyan=95,135,135 -White=108,108,108 -BoldBlack=68,68,68 -BoldRed=255,135,0 -BoldGreen=135,175,135 -BoldYellow=255,255,175 -BoldBlue=143,175,215 -BoldMagenta=135,135,175 -BoldCyan=95,175,175 +CursorColour=0,0,0 +ForegroundColour=0,0,0 +BackgroundColour=255,255,255 +Black=0,0,0 +Red=135,0,0 +Green=0,135,95 +Yellow=135,135,0 +Blue=0,95,175 +Magenta=135,87,175 +Cyan=0,128,128 +White=188,188,188 +BoldBlack=58,58,58 +BoldRed=215,0,95 +BoldGreen=135,255,95 +BoldYellow=255,255,95 +BoldBlue=95,175,255 +BoldMagenta=215,135,255 +BoldCyan=135,255,135 BoldWhite=255,255,255 BellType=0 BellFlash=yes diff --git a/.muttrc b/.muttrc @@ -131,79 +131,79 @@ openssl smime -verify -inform DER -in %s -noverify 2>/dev/null" # }}} # {{{ Colors -color normal default default -color error brightred default -color tilde default default -color message default default -color markers default default -color attachment brightmagenta default -color search default default -color status black yellow -color indicator black brightblue -color tree brightgreen default - -mono bold bold -mono underline underline -mono indicator reverse -mono error bold - -color index white default "~A" # all messages -color index red default "~E" # expired messages -color index default default "~N" # new messages -color index default default "~O" # old messages -color index brightmagenta default "~Q" # messages that have been replied to -color index white default "~R" # read messages -color index default default "~U" # unread messages -color index default default "~U~$" # unread, unreferenced messages -color index white default "~v" # messages part of a collapsed thread -color index white default "~P" # messages from me -color index brightblue default "~p!~F" # messages to me -color index brightblue default "~N~p!~F" # new messages to me -color index brightblue default "~U~p!~F" # unread messages to me -color index white default "~R~p!~F" # messages to me -color index brightgreen default "~F" # flagged messages -color index brightgreen default "~F~p" # flagged messages to me -color index brightgreen default "~N~F" # new flagged messages -color index brightgreen default "~N~F~p" # new flagged messages to me -color index brightgreen default "~U~F~p" # new flagged messages to me -color index black red "~D" # deleted messages -color index white default "~v~(!~N)" # collapsed thread with no unread -color index default default "~v~(~N)" # collapsed thread with some unread -color index white default "~N~v~(~N)" # collapsed thread with unread parent -color index brightgreen default "~v~(~F)!~N" # collapsed thread with flagged, no unread -color index default default "~v~(~F~N)" # collapsed thread with some unread & flagged -color index brightgreen default "~N~v~(~F~N)" # collapsed thread with unread parent & flagged -color index brightgreen default "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged -color index white default "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly -color index black red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) -color hdrdefault default default -color header brightwhite default "^(From)" -color header brightwhite default "^(Subject)" -color quoted brightgreen default -color quoted1 brightmagenta default -color quoted2 brightgreen default -color quoted3 red default -color quoted4 brightyellow default -color signature default default -color bold brightwhite default -color underline brightwhite default -color normal default default -color body default default "[;:][-o][)/(|]" # emoticons -color body brightwhite default "[;:][)(|]" # emoticons -color body brightwhite default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\ - |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\ - |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?" -color body brightwhite default "[ ][*][^*]*[*][ ]?" # more emoticon? -color body brightwhite default "[ ]?[*][^*]*[*][ ]" # more emoticon? -color body brightwhite red "(BAD signature)" -color body brightmagenta default "(Good signature)" -color body brightmagenta default "^gpg: Good signature .*" -color body white default "^gpg: " -color body brightwhite red "^gpg: BAD signature from.*" -mono body bold "^gpg: Good signature" -mono body bold "^gpg: BAD signature from.*" -color body brightblue default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" -color body brightblue default "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])" +color normal default default +color error brightred default +color tilde default default +color message default default +color markers default default +color attachment default default +color search default default +color status brightwhite blue +color indicator default white +color tree blue default + +mono bold bold +mono underline underline +mono indicator reverse +mono error bold + +color index default default "~A" # all messages +color index red default "~E" # expired messages +color index default default "~N" # new messages +color index default default "~O" # old messages +color index default default "~Q" # messages that have been replied to +color index default default "~R" # read messages +color index default default "~U" # unread messages +color index default default "~U~$" # unread, unreferenced messages +color index default default "~v" # messages part of a collapsed thread +color index white default "~P" # messages from me +color index blue default "~p!~F" # messages to me +color index blue default "~N~p!~F" # new messages to me +color index blue default "~U~p!~F" # unread messages to me +color index blue default "~R~p!~F" # messages to me +color index brightgreen default "~F" # flagged messages +color index brightgreen default "~F~p" # flagged messages to me +color index brightgreen default "~N~F" # new flagged messages +color index brightgreen default "~N~F~p" # new flagged messages to me +color index brightgreen default "~U~F~p" # new flagged messages to me +color index brightwhite red "~D" # deleted messages +color index white default "~v~(!~N)" # collapsed thread with no unread +color index default default "~v~(~N)" # collapsed thread with some unread +color index white default "~N~v~(~N)" # collapsed thread with unread parent +color index brightgreen default "~v~(~F)!~N" # collapsed thread with flagged, no unread +color index default default "~v~(~F~N)" # collapsed thread with some unread & flagged +color index brightgreen default "~N~v~(~F~N)" # collapsed thread with unread parent & flagged +color index brightgreen default "~N~v~(~F)" # collapsed thread with unread parent, no unread inside, but some flagged +color index white default "~v~(~p)" # collapsed thread with unread parent, no unread inside, some to me directly +color index black red "~v~(~D)" # thread with deleted (doesn't differentiate between all or partial) +color hdrdefault default default +color header default default "^(From)" +color header default default "^(Subject)" +color quoted green default +color quoted1 magenta default +color quoted2 green default +color quoted3 red default +color quoted4 yellow default +color signature default default +color bold default default +color underline underline default default +color normal default default +color body bold default default "[;:][-o][)/(|]" # emoticons +color body bold default default "[;:][)(|]" # emoticons +color body bold default default "[*]?((N)?ACK|CU|LOL|SCNR|BRB|BTW|CWYL|\ + |FWIW|vbg|GD&R|HTH|HTHBE|IMHO|IMNSHO|\ + |IRL|RTFM|ROTFL|ROFL|YMMV)[*]?" +color body bold default default "[ ][*][^*]*[*][ ]?" # more emoticon? +color body bold default default "[ ]?[*][^*]*[*][ ]" # more emoticon? +color body brightwhite red "(BAD signature)" +color body default default "(Good signature)" +color body default default "^gpg:Good signature .*" +color body default default "^gpg: " +color body brightwhite red "^gpg:BAD signature from.*" +mono body bold "^gpg: Good signature" +mono body bold "^gpg: BAD signature from.*" +color body blue default "([a-z][a-z0-9+-]*://(((([a-z0-9_.!~*'();:&=+$,-]|%[0-9a-f][0-9a-f])*@)?((([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?|[0-9]+\\.[0-9]+\\.[0-9]+\\.[0-9]+)(:[0-9]+)?)|([a-z0-9_.!~*'()$,;:@&=+-]|%[0-9a-f][0-9a-f])+)(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*(/([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*(;([a-z0-9_.!~*'():@&=+$,-]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?(#([a-z0-9_.!~*'();/?:@&=+$,-]|%[0-9a-f][0-9a-f])*)?|(www|ftp)\\.(([a-z0-9]([a-z0-9-]*[a-z0-9])?)\\.)*([a-z]([a-z0-9-]*[a-z0-9])?)\\.?(:[0-9]+)?(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*(/([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*(;([-a-z0-9_.!~*'():@&=+$,]|%[0-9a-f][0-9a-f])*)*)*)?(\\?([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?(#([-a-z0-9_.!~*'();/?:@&=+$,]|%[0-9a-f][0-9a-f])*)?)[^].,:;!)? \t\r\n<>\"]" +color body blue default "((@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]),)*@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\.[0-9]?[0-9]?[0-9]\\]):)?[0-9a-z_.+%$-]+@(([0-9a-z-]+\\.)*[0-9a-z-]+\\.?|#[0-9]+|\\[[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\.[0-2]?[0-9]?[0-9]\\])" # }}} source ~/.config/mutt/account.default diff --git a/.newsboat/config b/.newsboat/config @@ -11,9 +11,9 @@ bind-key j down bind-key k up color background default default -color listnormal white default -color listfocus blue default bold reverse -color listnormal_unread default default -color listfocus_unread blue default bold reverse -color info yellow default reverse +color listnormal default default +color listfocus default white +color listnormal_unread default default bold +color listfocus_unread default white bold +color info blue default reverse color article default default diff --git a/.tmux.conf b/.tmux.conf @@ -71,7 +71,7 @@ bind C-v run "tmux set-buffer \"`my paste`\"; tmux paste-buffer" # {{{ Theme tm_color_active=brightblue -tm_color_inactive=white +tm_color_inactive=brightblack tm_color_feature=red tm_active_border_color=brightblue @@ -89,6 +89,7 @@ set-window-option -g window-status-current-format "#[bold]#I #W" set-option -g pane-border-style fg=$tm_color_inactive set-option -g pane-active-border-style fg=$tm_active_border_color +set-option -g mode-style fg=black,bg=white set-option -g message-style bg=default,fg=$tm_color_active diff --git a/.vim/vimrc b/.vim/vimrc @@ -320,7 +320,7 @@ set statusline=%{MyShowMode()}%{MySpellStatus()}%{MyPasteStatus()}%<%f%m set statusline+=%r%h%q%w%{OptStatus('fugitive#statusline')}%=[%{&ff}] set statusline+=%{MyFileEncoding()}%y%{OptStatus('ObsessionStatus')} set statusline+=[%p%%][Ln:%l/%L,Col:%v] -colorscheme apprentice +colorscheme djmoch set ttyfast set nowrap set noshowmode diff --git a/.zshrc b/.zshrc @@ -24,19 +24,8 @@ GIT_PS1_SHOWDIRTYSTATE=1 GIT_PS1_SHOWUNTRACKEDFILES=1 source "$HOME/.local/lib/sh/git-prompt.sh" -autoload -Uz colors && colors - -if [[ $TERM = *256color ]] -then - usercolor="$fg[blue]" -else - usercolor="$fg_bold[blue]" -fi - -reset=$'\e[00m' - RPS1="[%?]" -PS1="%{$usercolor%}%n%{$reset%}@%{$fg[green]%}%m:%{$reset%}%c%{$fg[red]%}\$(__git_ps1 \" (%s)\")%{$reset%}%(!.#.\$) " +PS1="%n@%m:%c\$(__git_ps1 \" (%s)\")%(!.#.\$) " unset usercolor reset set_title() { print -Pn "\033]0;%n@%m:$1\007" }