about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--awesome/.config/awesome/rc.lua3
-rw-r--r--debian/.mailcap4
-rw-r--r--emacs/.emacs.d/init.el2
-rwxr-xr-xvim/.vim/vimrc1
4 files changed, 7 insertions, 3 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 5957112..76270c0 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -373,6 +373,9 @@ globalkeys = awful.util.table.join(
   awful.key({modkey}, "0",
             function() awful.screen.focus_relative(1) end,
             {description = "focus the next screen", group = "screen"}),
+  awful.key({modkey}, "`",
+            function() awful.screen.focus_relative(-1) end,
+            {description = "focus the previous screen", group = "screen"}),
   awful.key({modkey}, "u", awful.client.urgent.jumpto,
             {description = "jump to urgent client", group = "client"}),
   awful.key({modkey}, "Tab",
diff --git a/debian/.mailcap b/debian/.mailcap
index b54b674..6cca665 100644
--- a/debian/.mailcap
+++ b/debian/.mailcap
@@ -27,7 +27,7 @@
 # around the `%s`
 image/x-imgur-album; feh %s; test=test -n "$DISPLAY"
 image/gif; mpv '%s' --loop=inf; test=test -n "$DISPLAY"
-#image/*; feh '%s'; test=test -n "$DISPLAY"
+image/*; feh '%s'; test=test -n "$DISPLAY"
 
 # Youtube videos are assigned a custom mime-type, which can be streamed with
 # vlc or youtube-dl.
@@ -55,7 +55,7 @@ image/x-imgur-album; echo
 # 256 color images using half-width unicode characters
 # Much higher quality that img2txt, but must be built from source
 # https://github.com/rossy/img2xterm
-image/*; curl -s '%s' | convert -resize 80x80 - jpg:/tmp/rtv.jpg && img2xterm /tmp/rtv.jpg; needsterminal; copiousoutput
+#image/*; curl -s '%s' | convert -resize 80x80 - jpg:/tmp/rtv.jpg && img2xterm /tmp/rtv.jpg; needsterminal; copiousoutput
 
 # Display images in classic ascii using img2txt and lib-caca
 image/*; curl -s '%s' | convert - jpg:/tmp/rtv.jpg && img2txt -f utf8 /tmp/rtv.jpg; needsterminal; copiousoutput
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 8448f17..3d9101d 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -31,7 +31,7 @@
  '(erc-nick "cnx")
  '(package-selected-packages
    (quote
-    (markdown-mode smart-tabs-mode auctex wordnut magit geiser slime pdf-tools)))
+    (lua-mode markdown-mode smart-tabs-mode auctex wordnut magit geiser slime pdf-tools)))
  '(scroll-bar-mode nil)
  '(show-paren-mode t)
  '(tool-bar-mode nil)
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index ac9bf51..a0f9965 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -11,6 +11,7 @@ set tabstop=8 expandtab shiftwidth=2 softtabstop=-1 smarttab
 set dictionary=/usr/share/dict/words
 set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1
 set omnifunc=syntaxcomplete#Complete
+set diffopt+=algorithm:patience
 autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
 autocmd FileType c,h,go setlocal cindent noexpandtab shiftwidth=8