From 1f857a0a251d83a8e98cc308af4a4798f1a6ae4b Mon Sep 17 00:00:00 2001 From: Zedhugh Chen Date: Sun, 30 Oct 2022 23:06:09 +0800 Subject: [PATCH] add lua/vimrc/yaml/nginx mode --- .gitmodules | 12 ++++++++++++ init.el | 1 + lisp/init-file.el | 37 +++++++++++++++++++++++++++++++++++++ site-lisp/lua-mode | 1 + site-lisp/nginx-mode | 1 + site-lisp/vimrc-mode | 1 + site-lisp/yaml-mode | 1 + 7 files changed, 54 insertions(+) create mode 100644 lisp/init-file.el create mode 160000 site-lisp/lua-mode create mode 160000 site-lisp/nginx-mode create mode 160000 site-lisp/vimrc-mode create mode 160000 site-lisp/yaml-mode diff --git a/.gitmodules b/.gitmodules index d0c1b7f..a68a649 100644 --- a/.gitmodules +++ b/.gitmodules @@ -148,3 +148,15 @@ [submodule "site-lisp/gntp"] path = site-lisp/gntp url = https://github.com/tekai/gntp.el.git +[submodule "site-lisp/vimrc-mode"] + path = site-lisp/vimrc-mode + url = https://github.com/mcandre/vimrc-mode.git +[submodule "site-lisp/yaml-mode"] + path = site-lisp/yaml-mode + url = https://github.com/yoshiki/yaml-mode.git +[submodule "site-lisp/lua-mode"] + path = site-lisp/lua-mode + url = https://github.com/immerrr/lua-mode.git +[submodule "site-lisp/nginx-mode"] + path = site-lisp/nginx-mode + url = https://github.com/ajc/nginx-mode.git diff --git a/init.el b/init.el index 6d51e2e..2324238 100644 --- a/init.el +++ b/init.el @@ -124,6 +124,7 @@ If freezing sometimes, decrease it. If stuttering, increase it.") (require 'init-emmet) (require 'init-flymake) (require 'init-org) +(require 'init-file) (setq custom-file (expand-file-name "custom.el" creature/cache-dir)) diff --git a/lisp/init-file.el b/lisp/init-file.el new file mode 100644 index 0000000..c483c5c --- /dev/null +++ b/lisp/init-file.el @@ -0,0 +1,37 @@ +;; -*- coding: utf-8; lexical-binding: t; -*- + +(autoload 'vimrc-mode "vimrc-mode" "" t) +(add-to-list 'auto-mode-alist '("\\.vim\\(rc\\)?\\'" . vimrc-mode)) + + +(autoload 'yaml-mode "yaml-mode" "" t) +(add-to-list 'auto-mode-alist '("\\.\\(e?ya?\\|ra\\)ml\\'" . yaml-mode)) +(add-to-list 'magic-mode-alist + '("^%YAML\\s-+[0-9]+\\.[0-9]+\\(\\s-+#\\|\\s-*$\\)" . yaml-mode)) + + +(autoload 'lua-mode "lua-mode" "" t) +(add-to-list 'auto-mode-alist '("\\.lua$" . lua-mode)) +(add-to-list 'interpreter-mode-alist '("lua" . lua-mode)) + + +(autoload 'nginx-mode "nginx-mode" "" t) +(add-to-list 'auto-mode-alist '("nginx\\.conf\\'" . nginx-mode)) +(add-to-list 'auto-mode-alist '("/nginx/.+\\.conf\\'" . nginx-mode)) +(add-to-list 'auto-mode-alist + '("/nginx/sites-\\(?:available\\|enabled\\)/" . nginx-mode)) +(add-to-list + 'magic-fallback-mode-alist + '("\\(?:.*\n\\)*\\(?:http\\|server\\|location .+\\|upstream .+\\)[ \n\t]+{" + . nginx-mode)) + + +(add-to-list 'auto-mode-alist '("package\\.env\\'" . conf-mode)) +(add-to-list 'auto-mode-alist '("package\\.use\\'" . conf-mode)) +(add-to-list 'auto-mode-alist '("package\\.mask\\'" . conf-mode)) +(add-to-list 'auto-mode-alist '("package\\.license\\'" . conf-mode)) +(add-to-list 'auto-mode-alist '("package\\.keywords\\'" . conf-mode)) +(add-to-list 'auto-mode-alist '("package\\.accept_keywords\\'" . conf-mode)) + + +(provide 'init-file) diff --git a/site-lisp/lua-mode b/site-lisp/lua-mode new file mode 160000 index 0000000..3e783c9 --- /dev/null +++ b/site-lisp/lua-mode @@ -0,0 +1 @@ +Subproject commit 3e783c93aa8a3d3ca985686438aa8d140cbddae6 diff --git a/site-lisp/nginx-mode b/site-lisp/nginx-mode new file mode 160000 index 0000000..6e9d96f --- /dev/null +++ b/site-lisp/nginx-mode @@ -0,0 +1 @@ +Subproject commit 6e9d96f58eddd69f62f7fd443d9b9753e16e0e96 diff --git a/site-lisp/vimrc-mode b/site-lisp/vimrc-mode new file mode 160000 index 0000000..13bc150 --- /dev/null +++ b/site-lisp/vimrc-mode @@ -0,0 +1 @@ +Subproject commit 13bc150a870d5d4a95f1111e4740e2b22813c30e diff --git a/site-lisp/yaml-mode b/site-lisp/yaml-mode new file mode 160000 index 0000000..3fcb36d --- /dev/null +++ b/site-lisp/yaml-mode @@ -0,0 +1 @@ +Subproject commit 3fcb36d6039bef57e2a0f6e24c51f623c0bf5fb7