8 files changed, 66 insertions, 9 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua
index 08a2b8c..46a7af5 100644
--- a/awesome/.config/awesome/rc.lua
+++ b/awesome/.config/awesome/rc.lua
@@ -525,8 +525,8 @@ local globalkeys = awful.util.table.join(
   awful.key({modkey},
             "XF86Display",
             function ()
-              awful.spawn".screenlayout/single.sh"
-              awesome.restart()
+              awful.spawn.easy_async(".screenlayout/single.sh",
+                                     function () awesome.restart() end)
             end,
             {description = "switch to single display", group = "multimedia"}),
   awful.key({}, "Print", nil, spawner(scrot_select),
diff --git a/dev/.hgrc b/dev/.hgrc
new file mode 100644
index 0000000..5d9678b
--- /dev/null
+++ b/dev/.hgrc
@@ -0,0 +1,55 @@
+[ui]
+username = Nguyễn Gia Phong <vn.mcsinyx@gmail.com>
+
+[extensions]
+color =
+histedit =
+pager =
+rebase =
+strip =
+
+[pager]
+pager = LESS='FSRX' less
+attend = help, annotate, cat, diff, export, glog, log, outgoing, incoming
+
+[diff]
+showfunc = True
+
+[color]
+mode = terminfo
+
+## Custom colors
+color.gray = 244
+color.orange = 202
+color.lightyellow = 191
+color.darkorange = 220
+color.brightyellow = 226
+
+status.modified = magenta bold
+status.added = green bold
+status.removed = red bold
+status.deleted = cyan bold
+status.unknown = gray bold
+status.ignored = gray bold
+
+## Colours for each label
+log.branch = cyan
+log.summary = lightyellow
+log.description = lightyellow
+log.bookmark = green
+log.tag = darkorange
+log.graph = blue
+
+## Colors for each phase
+changeset.secret = blue bold
+changeset.draft  = red bold
+changeset.public = orange
+
+desc.here = bold blue_background
+
+[bookmarks]
+track.current = True
+
+[alias]
+glog = log --graph
+top = log --graph -l
diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el
index cfa0d7b..1b461b7 100644
--- a/emacs/.emacs.d/init.el
+++ b/emacs/.emacs.d/init.el
@@ -24,14 +24,12 @@
  '(ac-auto-start nil)
  '(ac-expand-on-auto-complete nil)
  '(ac-trigger-key "M-RET")
- '(ansi-color-names-vector
-   ["#2e3436" "#a40000" "#4e9a06" "#c4a000" "#204a87" "#5c3566" "#729fcf" "#eeeeec"])
  '(column-number-mode t)
- '(custom-enabled-themes (quote (tango)))
  '(erc-nick "cnx")
  '(package-selected-packages
    (quote
-    (glsl-mode perl6-mode fireplace lua-mode markdown-mode smart-tabs-mode auctex wordnut magit geiser slime pdf-tools)))
+    (glsl-mode perl6-mode fireplace lua-mode markdown-mode smart-tabs-mode
+     auctex wordnut magit geiser slime pdf-tools)))
  '(safe-local-variable-values (quote ((Syntax . Common-Lisp))))
  '(scroll-bar-mode nil)
  '(show-paren-mode t)
@@ -50,6 +48,7 @@
 (savehist-mode 1)
 (setq-default inhibit-splash-screen t)
 (find-file-noselect "/usr/share/dict/words")
+(when (fboundp 'electric-indent-mode) (electric-indent-mode -1))
 (setq-default fill-column 79)
 (add-hook 'prog-mode-hook 'ruler-mode)
 (setq-default indent-tabs-mode nil)
@@ -60,6 +59,7 @@
 (smart-tabs-insinuate 'c)
 (setq c-default-style "linux")
 (add-hook 'python-mode-hook (lambda () (setq comment-fill-column 72)))
+(add-hook 'LaTeX-mode-hook 'prettify-symbols-mode)
 (add-hook 'pdf-tools-enabled-hook 'auto-revert-mode)
 
 (when window-system (set-frame-size (selected-frame) 80 25))
diff --git a/vim/.vim/initialize.py b/vim/.vim/initialize.py
deleted file mode 120000
index 15d8b35..0000000
--- a/vim/.vim/initialize.py
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vim/addons/initialize.py
\ No newline at end of file
diff --git a/vim/.vim/jedi_vim.py b/vim/.vim/jedi_vim.py
deleted file mode 120000
index c374365..0000000
--- a/vim/.vim/jedi_vim.py
+++ /dev/null
@@ -1 +0,0 @@
-/usr/share/vim/addons/jedi_vim.py
\ No newline at end of file
diff --git a/vim/.vim/pythonx/jedi_vim.py b/vim/.vim/pythonx/jedi_vim.py
new file mode 120000
index 0000000..5d7fd99
--- /dev/null
+++ b/vim/.vim/pythonx/jedi_vim.py
@@ -0,0 +1 @@
+/usr/share/vim/addons/pythonx/jedi_vim.py
\ No newline at end of file
diff --git a/vim/.vim/pythonx/jedi_vim_debug.py b/vim/.vim/pythonx/jedi_vim_debug.py
new file mode 120000
index 0000000..187dfe7
--- /dev/null
+++ b/vim/.vim/pythonx/jedi_vim_debug.py
@@ -0,0 +1 @@
+/usr/share/vim/addons/pythonx/jedi_vim_debug.py
\ No newline at end of file
diff --git a/vim/.vim/vimrc b/vim/.vim/vimrc
index 782786c..f2a5003 100755
--- a/vim/.vim/vimrc
+++ b/vim/.vim/vimrc
@@ -21,6 +21,7 @@ autocmd FileType c,h,go,glsl setlocal cindent cinoptions=(0 noexpandtab shiftwid
 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
 let g:jedi#popup_on_dot = 0
 let g:jedi#popup_select_first = 0
 let g:jedi#show_call_signatures = 2
@@ -37,7 +38,8 @@ Plug 'https://github.com/tpope/vim-abolish.git'
 Plug 'https://github.com/alx741/vinfo.git'
 Plug 'https://github.com/drmikehenry/vim-fontsize.git'
 Plug 'https://github.com/lervag/vimtex.git', {'for': 'tex'}
-Plug 'https://github.com/kovisoft/slimv', {'for': 'lisp'}
+Plug 'https://github.com/kovisoft/slimv.git', {'for': 'lisp'}
+Plug 'https://github.com/artur-shaik/vim-javacomplete2.git', {'for': 'java'}
 call plug#end()
 
 set t_Co=256