From 200b2343dd47b0f4b8cef1e917f1a9dab216ea88 Mon Sep 17 00:00:00 2001 From: Nguyễn Gia Phong Date: Thu, 12 Apr 2018 21:15:03 +0700 Subject: Update 2018-04-12 --- awesome/.config/awesome/rc.lua | 5 ++++- emacs/.emacs.d/init.el | 22 ++++++++++++++++++---- meta/.xinitrc | 1 + 3 files changed, 23 insertions(+), 5 deletions(-) diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index cf31546..647e57c 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -48,6 +48,7 @@ beautiful.init"~/.config/awesome/themes/gruvbox/theme.lua" terminal = "x-terminal-emulator -e dvtm" editor = "gvim" -- And some additional applications +emacserver = "emacs --daemon" root_terminal = "x-terminal-emulator -e sudo -i dvtm" ranger = "x-terminal-emulator -e ranger" ipython = "x-terminal-emulator -e ipython" @@ -373,7 +374,9 @@ globalkeys = awful.util.table.join( {description = "open a root terminal", group = "launcher"}), awful.key({modkey}, "v", function() awful.spawn(editor) end, {description = "open GVim", group = "launcher"}), - awful.key({modkey}, "e", function() awful.spawn("emacs") end, + awful.key({modkey}, "e", function() awful.spawn("emacsclient -c") end, + {description = "open Emacs", group = "launcher"}), + awful.key({modkey, 'Shift'}, "e", function() awful.spawn(emacserver) end, {description = "open Emacs", group = "launcher"}), awful.key({modkey}, "b", function() awful.spawn"luakit" end, {description = "open Luakit", group = "launcher"}), diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index a493d7c..19c356d 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -13,16 +13,30 @@ ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(ansi-color-names-vector - ["#2e3436" "#a40000" "#4e9a06" "#c4a000" "#204a87" "#5c3566" "#729fcf" "#eeeeec"]) - '(blink-cursor-mode nil) + ["#2e3436" "#a40000" "#4e9a06" "#c4a000" + "#204a87" "#5c3566" "#729fcf" "#eeeeec"]) '(column-number-mode t) '(custom-enabled-themes (quote (tango))) '(scroll-bar-mode nil) '(show-paren-mode t) - '(tool-bar-mode nil)) + '(tool-bar-mode nil) + '(whitespace-style + (quote (face trailing spaces newline space-mark newline-mark)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(default ((t (:family "Space Mono" :foundry "CF " :slant normal :weight normal :height 98 :width normal))))) + '(default ((t (:family "Space Mono" + :foundry "CF " + :slant normal + :weight normal + :height 98 + :width normal)))) + '(whitespace-space ((t (:foreground "gray"))))) + +(setq-default indent-tabs-mode nil) +(add-hook 'find-file-hook 'whitespace-mode) +(add-hook 'find-file-hook 'ruler-mode) + +(setq inhibit-splash-screen t) diff --git a/meta/.xinitrc b/meta/.xinitrc index e897a24..33a1b01 100644 --- a/meta/.xinitrc +++ b/meta/.xinitrc @@ -9,5 +9,6 @@ redshift-gtk & ibus-daemon -drx connman-ui-gtk & clipit & +emacs --daemon exec awesome cd - -- cgit 1.4.1