Mercurial > dotfiles

changeset 383:ff48d206d1f1

Find changesets by keywords (author, files, the commit message), revision number or hash, or revset expression.
Miscellaneous tweaks.
author Ludovic Chabant <ludovic@chabant.com>
date Sat, 05 Aug 2017 22:11:13 -0700
parents c3a863440b1a
children 92ae7310bb1b
files .hgsubstate fish/config.fish git/gitconfig mutt/muttrc qutebrowser/keys.conf
diffstat 5 files changed, 18 insertions(+), 11 deletions(-) [+]
line wrap: on
line diff
--- a/.hgsubstate	Mon Apr 03 13:08:08 2017 -0700
+++ b/.hgsubstate	Sat Aug 05 22:11:13 2017 -0700
@@ -1,10 +1,10 @@
 80a44033b7facf069ddb734fb4e908a95e681b6c lib/fish/virtualfish
-3f8c4b4a5cc6e81c02974bd11126eae102eecb0a lib/hg/allpaths
-fec6e12dedd8811869d1bb520cd26ce43cfd28ef lib/hg/hg-git
+03cc0603800e39d4c73ab965aca7f306e80ca8e1 lib/hg/allpaths
+4d63f2eb60fd6399d5f50d4703d8ced8132ce359 lib/hg/hg-git
 7d99080f276f49e3638ba13b4f5c1cd2dc4cc21f lib/hg/hg-git-sync
 5334581e231a5167d03689ff47b3a6fdf082011c lib/hg/hg-prompt
 1fc4a9fbead7e0acc4c828b346f3be2658ec3df9 lib/hg/mercurial-cli-templates
-e723a35599f3636cb060cefc5ebb79788ce1c7dc lib/hg/mutable-history
+21f06d9322316c9cc17eaebf5d4f40b9f24304f6 lib/hg/mutable-history
 d920e3425db554497a2cfaf1a2548eafbdc8b0e7 lib/hg/onsub
 8e91a585024cdf2d14adaf548c21799edce0d6c0 lib/hg/path-pattern
 2d9820cf595263bc7c651295b83f02525a23ca4a lib/hg/terse-status
@@ -20,7 +20,7 @@
 af9786ee5780bf0cbafbd7b341c2b5234d18c1c0 vim/bundle/easymotion
 f44845e4408aae03e018e98afb7fbf0c2ee87dd5 vim/bundle/fugitive
 9dd2d48255fcc3ac5122f6028dc238fabcccd861 vim/bundle/gundo
-0b4ccd0deceb58e1ae108ee5f6e181a5f740d04f vim/bundle/gutentags
+f7a417234deadb6283bfb2c437d4f11cd2f7ab55 vim/bundle/gutentags
 1f2e47c78c2faf90ff419c2f4e1241094844678c vim/bundle/haml
 adebc6ceae0aed69bb1cde7fb89058fb1546129e vim/bundle/interestingwords
 8a8f0ed97c1751d304cf5b7241f2fe27b0e61f81 vim/bundle/jinja
--- a/fish/config.fish	Mon Apr 03 13:08:08 2017 -0700
+++ b/fish/config.fish	Sat Aug 05 22:11:13 2017 -0700
@@ -128,7 +128,7 @@
 
 # Virtualenv wrapper for Fish {{{
 
-eval (python -m virtualfish)
+eval (/usr/local/bin/python2.7 -m virtualfish)
 
 #set -g VIRTUALFISH_COMPAT_ALIASES # uncomment for virtualenvwrapper-style commands
 #. $HOME/.config/fish/virtualfish/virtual.fish
--- a/git/gitconfig	Mon Apr 03 13:08:08 2017 -0700
+++ b/git/gitconfig	Sat Aug 05 22:11:13 2017 -0700
@@ -12,3 +12,9 @@
 
 [include]
 path = gitconfig-local
+[difftool "sourcetree"]
+	cmd = opendiff \"$LOCAL\" \"$REMOTE\"
+	path = 
+[mergetool "sourcetree"]
+	cmd = /Applications/SourceTree.app/Contents/Resources/opendiff-w.sh \"$LOCAL\" \"$REMOTE\" -ancestor \"$BASE\" -merge \"$MERGED\"
+	trustExitCode = true
--- a/mutt/muttrc	Mon Apr 03 13:08:08 2017 -0700
+++ b/mutt/muttrc	Sat Aug 05 22:11:13 2017 -0700
@@ -40,6 +40,7 @@
 set date_format = "%d/%m/%Y"  # Show the date like you're civilized
 set index_format = "[%Z]  %D  %-20.20F  %s"
 set collapse_unread
+set text_flowed
 
 ignore "Authentication-Results:"
 ignore "DomainKey-Signature:"
--- a/qutebrowser/keys.conf	Mon Apr 03 13:08:08 2017 -0700
+++ b/qutebrowser/keys.conf	Sat Aug 05 22:11:13 2017 -0700
@@ -173,12 +173,6 @@
 scroll left
     h
 
-scroll down
-    j
-
-scroll up
-    k
-
 scroll right
     l
 
@@ -439,6 +433,12 @@
 set-cmd-text :open -w {url:pretty}
     W
 
+run-with-count 3 scroll down
+    j
+
+run-with-count 3 scroll up
+    k
+
 [insert]
 # Keybindings for insert mode.
 # Since normal keypresses are passed through, only special keys are