Update 2020-02-25

4 files changed, 19 insertions, 12 deletions

diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 983504b..1bf8ec3 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -482,7 +482,7 @@ local globalkeys = awful.util.table.join(
             {description = "open GIMP", group = "launcher"}),
   awful.key({modkey}, "r", spawner(ranger),
             {description = "open ranger file manager", group = "launcher"}),
-  awful.key({modkey, "Shift"}, "r", spawner(ranger .. " Documents/B2"),
+  awful.key({modkey, "Shift"}, "r", spawner(ranger .. " /data"),
             {description = "open Riboflavin", group = "launcher"}),
   awful.key({modkey}, "p", spawner(python3),
             {description = "open Python 3 interpreter", group = "launcher"}),
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index 9c5adfe..74b4e69 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -32,8 +32,8 @@
  '(erc-nick "cnx")
  '(package-selected-packages
    (quote
-    (sane-term glsl-mode nix-mode perl6-mode fireplace lua-mode markdown-mode
-     smart-tabs-mode auctex wordnut magit geiser slime pdf-tools)))
+    (sane-term fireplace wordnut magit smart-tabs-mode yaml-mode glsl-mode
+     nix-mode perl6-mode lua-mode markdown-mode geiser slime auctex pdf-tools)))
  '(safe-local-variable-values (quote ((Syntax . Common-Lisp))))
  '(scroll-bar-mode nil)
  '(show-paren-mode t)
diff --git a/nix/.config/systemd/user/default.target.wants/emacs.service b/nix/.config/systemd/user/default.target.wants/emacs.service
new file mode 120000
index 0000000..bb810be
--- /dev/null
+++ b/nix/.config/systemd/user/default.target.wants/emacs.service
@@ -0,0 +1 @@
+/home/cee/.config/systemd/user/emacs.service
\ No newline at end of file
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index e544c5a..5f5751b 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -9,28 +9,31 @@ set nostartofline
 if has("patch-7.4.710")
   set list listchars+=space:·,tab:\ \ 
 endif
-set tabstop=8 expandtab shiftwidth=2 softtabstop=-1 smarttab
+set tabstop=8 expandtab shiftwidth=4 softtabstop=-1 smarttab
 set ignorecase infercase dictionary=/usr/share/dict/words
 set keymap=vietnamese-telex imdisable iminsert=0 imsearch=-1
 set omnifunc=syntaxcomplete#Complete
 set diffopt+=algorithm:patience
+
+autocmd!
 autocmd BufNewFile,BufRead *.PAS setlocal filetype=pascal
 autocmd BufNewFile,BufRead *.m setlocal filetype=octave
-autocmd BufWinEnter * let w:m1=matchadd('ColorColumn', '\%<81v.\%>80v', -1)
-autocmd FileType python,cython let w:m1=matchadd('ColorColumn', '\%<80v.\%>73v', -1)
-autocmd FileType c,h,go,glsl setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8
+autocmd FileType asm,c,h,go,glsl
+\ setlocal cindent cinoptions=(0 noexpandtab shiftwidth=8
+autocmd FileType vim,sh,lua,tex,cpp,html,octave,pascal setlocal shiftwidth=2
 autocmd FileType rst setlocal shiftwidth=3
-autocmd FileType css,javascript,python,perl6 setlocal shiftwidth=4
-autocmd FileType python syntax keyword pythonBoolean False True None
 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
+
+let g:srcery_italic=1
 let g:jedi#popup_on_dot = 0
 let g:jedi#popup_select_first = 0
 let g:jedi#show_call_signatures = 2
 let g:jedi#smart_auto_mappings = 0
 let g:polyglot_disabled = ['latex']
-map Q gq
-command Q q
-command W w
 
 call plug#begin('~/.vim/plugged')
 Plug 'https://github.com/vim/killersheep.git'
@@ -47,3 +50,6 @@ source /usr/share/doc/fzf/examples/fzf.vim
 
 set t_Co=256
 colorscheme srcery
+map Q gq
+command Q q
+command W w