about summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--awesome/.config/awesome/rc.lua2
-rw-r--r--dev/.ackrc1
-rwxr-xr-xvim/.vim/vimrc10
3 files changed, 7 insertions, 6 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 1a4bc1c..2994aaa 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -471,8 +471,6 @@ local globalkeys = awful.util.table.join(
             {description = "open Emacs", group = "launcher"}),
   awful.key({modkey}, "b", spawner"qutebrowser",
             {description = "open qutebrowser", group = "launcher"}),
-  awful.key({modkey, "Shift"}, "b", spawner"torify luakit --nounique",
-            {description = "open torified Luakit", group = "launcher"}),
   awful.key({modkey}, "f", spawner"firefox",
             {description = "open Firefox", group = "launcher"}),
   awful.key({modkey, "Shift"}, "f", spawner"torbrowser-launcher",
diff --git a/dev/.ackrc b/dev/.ackrc
index 7ea8091..4be3cdd 100644
--- a/dev/.ackrc
+++ b/dev/.ackrc
@@ -1,2 +1,3 @@
 --color
 --ignore-directory=is:.tox
+--ignore-directory=is:.mypy_cache
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 56a99fe..c350000 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -24,10 +24,12 @@ autocmd FileType vim,sh,lua,tex,cmake,cpp,html,octave,pascal
       \ setlocal shiftwidth=2
 autocmd FileType rst setlocal shiftwidth=3
 autocmd FileType java setlocal omnifunc=javacomplete#Complete
-autocmd FileType python,cython
-      \ let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1)
-autocmd BufWinEnter * if !exists('w:m1') |
-      \ let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) | endif
+autocmd BufWinEnter *
+      \ if &filetype ==# 'python' || &filetype ==# 'cython'
+      \ | let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1) |
+      \ else
+      \ | let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1) |
+      \ endif
 
 let g:srcery_italic=1
 let g:jedi#popup_on_dot = 0