diff options
| -rw-r--r-- | .env.example | 7 | ||||
| -rw-r--r-- | .gitignore | 1 | ||||
| -rw-r--r-- | README.md | 8 | ||||
| -rw-r--r-- | custom.el | 2 | ||||
| -rw-r--r-- | init.el | 3 | ||||
| -rw-r--r-- | modules/init-linter.el | 6 | ||||
| -rw-r--r-- | modules/init-load-env-vars.el | 12 | ||||
| -rw-r--r-- | settings.el | 5 |
8 files changed, 32 insertions, 12 deletions
diff --git a/.env.example b/.env.example new file mode 100644 index 0000000..a7bd050 --- /dev/null +++ b/.env.example @@ -0,0 +1,7 @@ +# General configuration +EMACS_USER="LibreUser." +EMACS_EMAIL="user@example.org" + +# Angular configuration +ANGULAR_SERVER_DIR="/usr/local/lib/node_modules/@angular/language-server" +NODEJS_MODULE_DIR="/usr/local/lib/node_modules" @@ -10,6 +10,7 @@ .session .smex-items *.eld +.env *~ /.mc-lists.el \#*\# @@ -12,14 +12,14 @@ First step: #### Main mirror 1. `git clone https://hgit.conocimientoslibres.ga/software/emacs-personal.git ~/.emacs.d/` - -2. `emacs --batch --eval='(load-file "~/.emacs.d/init.el")'` +2. `cp -v ~/.emacs.d/.env.example ~/.emacs.d/.env` +3. `emacs --batch --eval='(load-file "~/.emacs.d/init.el")'` #### Secundary mirror 1. `git clone https://notabug.org/heckyel/emacs-personal.git ~/.emacs.d/` - -2. `emacs --batch --eval='(load-file "~/.emacs.d/init.el")'` +2. `cp -v ~/.emacs.d/.env.example ~/.emacs.d/.env` +3. `emacs --batch --eval='(load-file "~/.emacs.d/init.el")'` ### Fonts @@ -9,7 +9,7 @@ '(anzu-replace-to-string-separator " => ") '(anzu-search-threshold 1000) '(package-selected-packages - '(git-gutter-fringe yaml-mode whitespace-cleanup-mode which-key web-mode vue-mode use-package undo-tree tide smartparens sass-mode rainbow-mode py-autopep8 projectile prettier-js pkgbuild-mode pip-requirements php-refactor-mode nginx-mode neotree lua-mode lsp-ui log4j-mode json-mode js2-refactor ivy-rich ivy-hydra highlight-indent-guides go-mode git-timemachine git-modes eslintd-fix emmet-mode elpy editorconfig dotenv-mode doom-themes doom-modeline dokuwiki-mode dockerfile-mode diminish dashboard dap-mode crystal-mode counsel company-quickhelp company-php apache-mode anzu))) + '(git-gutter-fringe yaml-mode whitespace-cleanup-mode which-key web-mode vue-mode use-package undo-tree tide smartparens sass-mode rainbow-mode py-autopep8 projectile prettier-js pkgbuild-mode pip-requirements php-refactor-mode nginx-mode neotree lua-mode lsp-ui log4j-mode load-env-vars json-mode js2-refactor ivy-rich ivy-hydra highlight-indent-guides go-mode git-timemachine git-modes eslintd-fix emmet-mode elpy editorconfig dotenv-mode doom-themes doom-modeline dokuwiki-mode dockerfile-mode diminish dashboard dap-mode crystal-mode counsel company-quickhelp company-php apache-mode anzu))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. @@ -119,7 +119,8 @@ (require 'init-dotenv) (require 'init-dockerfile) (require 'init-dokuwiki) - (require 'init-linter)) + (require 'init-linter) + (require 'init-load-env-vars)) ;;; Custom variables (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) diff --git a/modules/init-linter.el b/modules/init-linter.el index 17a2d61..a11e880 100644 --- a/modules/init-linter.el +++ b/modules/init-linter.el @@ -16,11 +16,11 @@ :custom (lsp-clients-angular-language-server-command '("node" - ("~/virtualenvs/ndjs/lib/node_modules/@angular/language-server") + (getenv "ANGULAR_SERVER_DIR") "--ngProbeLocations" - ("~/virtualenvs/ndjs/lib/node_modules") + (getenv "NODEJS_MODULE_DIR") "--tsProbeLocations" - ("~/virtualenvs/ndjs/lib/node_modules") + (getenv "NODEJS_MODULE_DIR") "--stdio")) (lsp-diagnostics-provider :none) :commands (lsp lsp-deferred)) diff --git a/modules/init-load-env-vars.el b/modules/init-load-env-vars.el new file mode 100644 index 0000000..e0e5fdf --- /dev/null +++ b/modules/init-load-env-vars.el @@ -0,0 +1,12 @@ +;;; init-load-env-vars.el --- .Emacs Configuration -*- lexical-binding: t -*- +;;; Commentary: +;; + +;;; Code: +;; load-env-vars +(use-package load-env-vars + :config + (load-env-vars "~/.emacs.d/.env")) + +(provide 'init-load-env-vars) +;;; init-load-env-vars.el ends here diff --git a/settings.el b/settings.el index ae8938e..7604500 100644 --- a/settings.el +++ b/settings.el @@ -3,9 +3,8 @@ ;; custom settings!!! ;;; Code: -(setq user-full-name "LibreUser.") -(setq user-mail-address "name@domain.com") - +(setq user-full-name (getenv "EMACS_USER")) +(setq user-mail-address (getenv "EMACS_EMAIL")) ;; Local Variables: ;; byte-compile-warnings: (not free-vars) ;; End: |