Mercurial > dotfiles
changeset 503:35094cf31de4
Merged changes.
author | Ludovic Chabant <ludovic@chabant.com> |
---|---|
date | Mon, 20 Apr 2020 16:24:08 -0700 |
parents | 2aede5c6c4e3 (diff) 8f36fc391ddf (current diff) |
children | 015e94f44cc0 |
files | tridactyl/tridactylrc |
diffstat | 9 files changed, 24 insertions(+), 3 deletions(-) [+] |
line wrap: on
line diff
--- a/.hgignore Fri Apr 10 17:12:43 2020 -0700 +++ b/.hgignore Mon Apr 20 16:24:08 2020 -0700 @@ -14,10 +14,10 @@ vim/vimrc-local-pre vim/bundle/ vim/local/ +vim/fzf-history/ weechat/logs weechat/*.log -mutt/*.gpg -mutt/variables +mutt/variables* pentadactyl/.pentadactyl pentadactyl/info qutebrowser/data
--- a/fish/config.fish Fri Apr 10 17:12:43 2020 -0700 +++ b/fish/config.fish Mon Apr 20 16:24:08 2020 -0700 @@ -87,6 +87,8 @@ if git branch >/dev/null 2>/dev/null printf '±' ; return end + end + if set -q __local_has_hg if hg root >/dev/null 2>/dev/null printf '☿' ; return end
--- a/hgrc/hgignore Fri Apr 10 17:12:43 2020 -0700 +++ b/hgrc/hgignore Mon Apr 20 16:24:08 2020 -0700 @@ -5,6 +5,9 @@ *.orig *.egg-info tags +tags.files +tags.lock +tags.temp .DS_Store Thumbs.db __pycache__
--- a/hgrc/hgrc Fri Apr 10 17:12:43 2020 -0700 +++ b/hgrc/hgrc Mon Apr 20 16:24:08 2020 -0700 @@ -19,6 +19,7 @@ purge = rebase = schemes = +shelve = strip = [alias]
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/iterm2/tmux-256color-italic.terminfo Mon Apr 20 16:24:08 2020 -0700 @@ -0,0 +1,4 @@ +# Borrowed from: https://alexpearce.me/2014/05/italics-in-iterm2-vim-tmux/ +tmux-256color-italic|screen with 256 colors and italic, + ritm=\E[23m, rmso=\E[27m, sitm=\E[3m, smso=\E[7m, + use=xterm-256color,
--- /dev/null Thu Jan 01 00:00:00 1970 +0000 +++ b/iterm2/xterm-256color-italic.terminfo Mon Apr 20 16:24:08 2020 -0700 @@ -0,0 +1,4 @@ +# Borrowed from: https://alexpearce.me/2014/05/italics-in-iterm2-vim-tmux/ +xterm-256color-italic|xterm with 256 colors and italic, + sitm=\E[3m, ritm=\E[23m, + use=xterm-256color,
--- a/mutt/fastmailrc Fri Apr 10 17:12:43 2020 -0700 +++ b/mutt/fastmailrc Mon Apr 20 16:24:08 2020 -0700 @@ -30,7 +30,9 @@ set ssl_starttls = no set imap_check_subscribed +set imap_list_subscribed + set imap_idle - +#unset imap_passive # vim: ft=muttrc