diff options
| -rw-r--r-- | awesome/.config/awesome/rc.lua | 6 | ||||
| -rw-r--r-- | emacs/.emacs.d/init.el | 16 | ||||
| -rw-r--r-- | vim/.vim/after/ftplugin/markdown.vim | 2 |
3 files changed, 18 insertions, 6 deletions
diff --git a/awesome/.config/awesome/rc.lua b/awesome/.config/awesome/rc.lua index 46a7af5..0052f03 100644 --- a/awesome/.config/awesome/rc.lua +++ b/awesome/.config/awesome/rc.lua @@ -55,6 +55,8 @@ local python3 = terminal .. " -e python3" local perl6 = terminal .. " -e perl6" local octave = terminal .. " -e octave" local guile = terminal .. " -e guile" +local clojure = terminal .. " -e clojure" +local emacs = terminal .. " -e emacsclient -nw" local slock_suspend = "slock systemctl --ignore-inhibitors suspend" -- Audacious media player @@ -466,7 +468,7 @@ local globalkeys = awful.util.table.join( {description = "open a root terminal", group = "launcher"}), awful.key({modkey}, "v", spawner(editor), {description = "open GVim", group = "launcher"}), - awful.key({modkey}, "e", spawner"emacsclient -c", + awful.key({modkey}, "e", spawner(emacs), {description = "open Emacs", group = "launcher"}), awful.key({modkey}, "b", spawner"qutebrowser", {description = "open qutebrowser", group = "launcher"}), @@ -488,6 +490,8 @@ local globalkeys = awful.util.table.join( {description = "open Python 3 interpreter", group = "launcher"}), awful.key({modkey, "Shift"}, "p", spawner(perl6), {description = "open Perl 6", group = "launcher"}), + awful.key({modkey}, "c", spawner(clojure), + {description = "open Clojure interpreter", group = "launcher"}), awful.key({modkey}, "g", spawner(guile), {description = "open Guile interpreter", group = "launcher"}), awful.key({modkey}, "o", spawner(octave), diff --git a/emacs/.emacs.d/init.el b/emacs/.emacs.d/init.el index 1b461b7..c7bc43d 100644 --- a/emacs/.emacs.d/init.el +++ b/emacs/.emacs.d/init.el @@ -24,12 +24,16 @@ '(ac-auto-start nil) '(ac-expand-on-auto-complete nil) '(ac-trigger-key "M-RET") + '(ansi-color-names-vector + ["#242424" "#e5786d" "#95e454" "#cae682" + "#8ac6f2" "#333366" "#ccaa8f" "#f6f3e8"]) '(column-number-mode t) + '(custom-enabled-themes (quote (whiteboard))) '(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))) + (sane-term 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) @@ -42,7 +46,8 @@ ;; 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 "Latin Modern Mono" :foundry "UKWN" :slant normal :weight normal :height 120 :width normal)))) + '(default ((t (:family "Latin Modern Mono" :foundry "UKWN" + :slant normal :weight normal :height 120 :width normal)))) '(whitespace-space ((t (:foreground "gray"))))) (savehist-mode 1) @@ -57,8 +62,11 @@ (global-set-key (kbd "C-<return>") #'cua-rectangle-mark-mode) (smart-tabs-insinuate 'c) -(setq c-default-style "linux") +(setq c-default-style '((c-mode-hook "linux") + (c++-mode-hook "gnu") + (java-mode-hook "gnu"))) (add-hook 'python-mode-hook (lambda () (setq comment-fill-column 72))) +(add-hook 'lua-mode-hook (lambda () (setq lua-indent-level 4))) (add-hook 'LaTeX-mode-hook 'prettify-symbols-mode) (add-hook 'pdf-tools-enabled-hook 'auto-revert-mode) diff --git a/vim/.vim/after/ftplugin/markdown.vim b/vim/.vim/after/ftplugin/markdown.vim index 6cbbf03..b0603c5 100644 --- a/vim/.vim/after/ftplugin/markdown.vim +++ b/vim/.vim/after/ftplugin/markdown.vim @@ -1,4 +1,4 @@ setlocal shiftwidth=4 inoremap <M-,> ≤ inoremap <M-.> ≥ -inoremap ... … +"inoremap ... … |