From dba20052209574ed866650f60f7bc0d5cc8c8b90 Mon Sep 17 00:00:00 2001 From: Henrik Lissner Date: Thu, 7 Aug 2014 19:50:33 -0400 Subject: [PATCH] Split mod-gamedev into mod-love and mod-cpp --- init.el | 10 ++++++---- init/mod-cpp.el | 7 +++++++ init/mod-gamedev.el | 22 ---------------------- init/mod-love.el | 32 ++++++++++++++++++++++++++++++++ 4 files changed, 45 insertions(+), 26 deletions(-) create mode 100644 init/mod-cpp.el delete mode 100644 init/mod-gamedev.el create mode 100644 init/mod-love.el diff --git a/init.el b/init.el index 129553478..31cdda550 100644 --- a/init.el +++ b/init.el @@ -32,7 +32,7 @@ (mapc 'require '(core ; Just the... bear necessities... - ;; Modules to improve on emacs' heresy + ;; Modules to improve on emacs' heresy init-project ; Project navigation tools & settings init-ac ; Auto-complete engine & settings init-snippets ; Snippet engine @@ -43,6 +43,8 @@ mod-org ; Org-mode: personal gtd/notes mod-dev ; Generic environment for all programming mod-webdev ; Environment for webdev (SCSS, PHP, Rails, Jekyll) - mod-gamedev ; Environment for gamedev (C++, Lua, HTML5, etc) - mod-eclim ; Integration into eclipse (for Java) - )) + mod-love ; Love.app gamedev + mod-cpp ; C++ gamedev + ;; mod-eclim ; Integration into eclipse (for Java) + ;; mod-csharp ; Emacs as a Csharp IDE + )) diff --git a/init/mod-cpp.el b/init/mod-cpp.el new file mode 100644 index 000000000..c8eb13078 --- /dev/null +++ b/init/mod-cpp.el @@ -0,0 +1,7 @@ + +(use-package c++-mode :mode "\\.h\\'") + +;; TODO Better SFML & build settings + +;; +(provide 'mod-cpp) diff --git a/init/mod-gamedev.el b/init/mod-gamedev.el deleted file mode 100644 index 8c29ddb90..000000000 --- a/init/mod-gamedev.el +++ /dev/null @@ -1,22 +0,0 @@ - -(mapc 'my/install-package '(lua-mode)) - -(use-package lua-mode - :mode "\\.lua\\'" - :interpreter "lua" - :init - (add-hook 'lua-mode-hook - (lambda() - (nmap lua-mode-map (kbd "s-r") - (lambda() (interactive) (shell-command-on-region (point-min) (point-max) "lua"))) - (vmap lua-mode-map (kbd "s-r") - (lambda() (interactive) (shell-command-on-region (region-beginning) (region-end) "lua"))) - - (define-key lua-mode-map (kbd "s-b") - (lambda() (shell-command (concat "love " default-directory))) - )))) - -(use-package c++-mode :mode "\\.h\\'") - -;; -(provide 'mod-gamedev) diff --git a/init/mod-love.el b/init/mod-love.el new file mode 100644 index 000000000..f51b81ae4 --- /dev/null +++ b/init/mod-love.el @@ -0,0 +1,32 @@ + +(mapc 'my/install-package '(lua-mode)) + +(use-package lua-mode + :mode "\\.lua\\'" + :interpreter "lua" + :init + (progn + (define-minor-mode love-mode + "Buffer local minor mode for evil-org" + :init-value nil + :lighter " <3" + :keymap (make-sparse-keymap) ; defines love-mode-map + :group lua) + + (define-key love-mode-map (kbd "s-b") + (lambda() (shell-command (concat "love " default-directory)))) + + (add-hook 'lua-mode-hook + (lambda() + (if (string-match "\\.love/.+\\.lua" default-directory) + (love-mode t)) + + (nmap lua-mode-map (kbd "s-r") + (lambda() (interactive) (shell-command-on-region (point-min) (point-max) "lua"))) + (vmap lua-mode-map (kbd "s-r") + (lambda() (interactive) (shell-command-on-region (region-beginning) (region-end) "lua"))) + + )))) + +;; +(provide 'mod-love)