From 87503dda8c41983b71cf3160f5eab1c979ed10a4 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Raymundo=20V=C3=A1squez=20Ruiz?= Date: Sat, 14 Jan 2023 14:59:44 +0100 Subject: [PATCH] last update --- .gitignore | 3 +++ init.el | 10 ++++------ lib/init-editor.el | 20 +++++++++++++++++++- lib/init-js-ts.el | 1 + lib/init-pkg.el | 2 +- lib/init-web.el | 5 +++++ transient/history.el | 8 +++++++- 7 files changed, 40 insertions(+), 9 deletions(-) diff --git a/.gitignore b/.gitignore index 9d369d1..0d4d609 100644 --- a/.gitignore +++ b/.gitignore @@ -4,3 +4,6 @@ projectile-bookmarks.eld /elpa/ /themes/ network-security.data +/rust-playgound/ +*.cache +session* diff --git a/init.el b/init.el index bf0424b..f9f1aff 100644 --- a/init.el +++ b/init.el @@ -25,23 +25,21 @@ There are two things you can do about this warning: ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. '(custom-safe-themes - (quote - ("68fb87a1805393d7a00ba5064d28b8277de5a75addf0d34094012408cfcf2eea" "23ba4b4ba4d1c989784475fed58919225db8d9a9751b32aa8df835134fe7ba6f" "043c8375cad0cf1d5c42f5d85cbed601075caf09594da04a74712510e9437d2b" "722e1cd0dad601ec6567c32520126e42a8031cd72e05d2221ff511b58545b108" "0c3b1358ea01895e56d1c0193f72559449462e5952bded28c81a8e09b53f103f" "d9850d120be9d94dd7ae69053630e89af8767c36b131a3aa7b06f14007a24656" "fee4e306d9070a55dce4d8e9d92d28bd9efe92625d2ba9d4d654fc9cd8113b7f" "93268bf5365f22c685550a3cbb8c687a1211e827edc76ce7be3c4bd764054bad" "f984e2f9765a69f7394527b44eaa28052ff3664a505f9ec9c60c088ca4e9fc0b" "350dc341799fbbb81e59d1e6fff2b2c8772d7000e352a5c070aa4317127eee94" "bf798e9e8ff00d4bf2512597f36e5a135ce48e477ce88a0764cfb5d8104e8163" "732b807b0543855541743429c9979ebfb363e27ec91e82f463c91e68c772f6e3" "a62f0662e6aa7b05d0b4493a8e245ab31492765561b08192df61c9d1c7e1ddee" "c9f102cf31165896631747fd20a0ca0b9c64ecae019ce5c2786713a5b7d6315e" "c9ddf33b383e74dac7690255dd2c3dfa1961a8e8a1d20e401c6572febef61045" "44961a9303c92926740fc4121829c32abca38ba3a91897a4eab2aa3b7634bed4" "9be1d34d961a40d94ef94d0d08a364c3d27201f3c98c9d38e36f10588469ea57" "50b64810ed1c36dfb72d74a61ae08e5869edc554102f20e078b21f84209c08d1" "2540689fd0bc5d74c4682764ff6c94057ba8061a98be5dd21116bf7bf301acfb" "36ca8f60565af20ef4f30783aa16a26d96c02df7b4e54e9900a5138fb33808da" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "a24c5b3c12d147da6cef80938dca1223b7c7f70f2f382b26308eba014dc4833a" "a7051d761a713aaf5b893c90eaba27463c791cd75d7257d3a8e66b0c8c346e77" default))) + '("ecfd522bd04e43c16e58bd8af7991bc9583b8e56286ea0959a428b3d7991bbd8" "eae831de756bb480240479794e85f1da0789c6f2f7746e5cc999370bbc8d9c8a" "6271fc9740379f8e2722f1510d481c1df1fcc43e48fa6641a5c19e954c21cc8f" "b3bcf1b12ef2a7606c7697d71b934ca0bdd495d52f901e73ce008c4c9825a3aa" "fc7fd2530b82a722ceb5b211f9e732d15ad41d5306c011253a0ba43aaf93dccc" "1d079355c721b517fdc9891f0fda927fe3f87288f2e6cc3b8566655a64ca5453" "68fb87a1805393d7a00ba5064d28b8277de5a75addf0d34094012408cfcf2eea" "23ba4b4ba4d1c989784475fed58919225db8d9a9751b32aa8df835134fe7ba6f" "043c8375cad0cf1d5c42f5d85cbed601075caf09594da04a74712510e9437d2b" "722e1cd0dad601ec6567c32520126e42a8031cd72e05d2221ff511b58545b108" "0c3b1358ea01895e56d1c0193f72559449462e5952bded28c81a8e09b53f103f" "d9850d120be9d94dd7ae69053630e89af8767c36b131a3aa7b06f14007a24656" "fee4e306d9070a55dce4d8e9d92d28bd9efe92625d2ba9d4d654fc9cd8113b7f" "93268bf5365f22c685550a3cbb8c687a1211e827edc76ce7be3c4bd764054bad" "f984e2f9765a69f7394527b44eaa28052ff3664a505f9ec9c60c088ca4e9fc0b" "350dc341799fbbb81e59d1e6fff2b2c8772d7000e352a5c070aa4317127eee94" "bf798e9e8ff00d4bf2512597f36e5a135ce48e477ce88a0764cfb5d8104e8163" "732b807b0543855541743429c9979ebfb363e27ec91e82f463c91e68c772f6e3" "a62f0662e6aa7b05d0b4493a8e245ab31492765561b08192df61c9d1c7e1ddee" "c9f102cf31165896631747fd20a0ca0b9c64ecae019ce5c2786713a5b7d6315e" "c9ddf33b383e74dac7690255dd2c3dfa1961a8e8a1d20e401c6572febef61045" "44961a9303c92926740fc4121829c32abca38ba3a91897a4eab2aa3b7634bed4" "9be1d34d961a40d94ef94d0d08a364c3d27201f3c98c9d38e36f10588469ea57" "50b64810ed1c36dfb72d74a61ae08e5869edc554102f20e078b21f84209c08d1" "2540689fd0bc5d74c4682764ff6c94057ba8061a98be5dd21116bf7bf301acfb" "36ca8f60565af20ef4f30783aa16a26d96c02df7b4e54e9900a5138fb33808da" "cdb4ffdecc682978da78700a461cdc77456c3a6df1c1803ae2dd55c59fa703e3" "d6c5b8dc6049f2e9dabdfcafa9ef2079352640e80dffe3e6cc07c0f89cbf9748" "a24c5b3c12d147da6cef80938dca1223b7c7f70f2f382b26308eba014dc4833a" "a7051d761a713aaf5b893c90eaba27463c791cd75d7257d3a8e66b0c8c346e77" default)) '(global-display-line-numbers-mode t) + '(inhibit-startup-screen t) '(package-selected-packages - (quote - (rust-playground all-the-icons neotree base16-theme afternoon-theme ample-theme nord-theme company-racer racer markdown-mode+ vue-mode dumb-jump magit company flycheck-rust flycheck json-mode flymake-json tss tide material-theme zenburn-theme ac-js2 auto-complete projectile helm js2-mode cargo rust-mode))) + '(gitlab-ci-mode gitlab-ci-mode-flycheck web-mode impatient-mode exec-path-from-shell rust-playground all-the-icons neotree base16-theme afternoon-theme ample-theme nord-theme company-racer racer markdown-mode+ vue-mode dumb-jump magit company flycheck-rust flycheck json-mode flymake-json tss tide material-theme zenburn-theme ac-js2 auto-complete projectile helm js2-mode cargo rust-mode iedit gitlab-ci-mode gitlab-ci-mode-flycheck)) '(tool-bar-mode nil)) (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 "Fira Code" :foundry "CTDB" :slant normal :weight normal :height 120 :width normal))))) + '(default ((t (:family "Menlo" :foundry "CTDB" :slant normal :weight normal :height 160 :width normal))))) (add-to-list 'load-path "~/.emacs.d/lib") (require 'init-editor) (require 'init-web) (require 'init-js-ts) (require 'init-rust) - diff --git a/lib/init-editor.el b/lib/init-editor.el index c67ee09..14ccdf4 100644 --- a/lib/init-editor.el +++ b/lib/init-editor.el @@ -14,12 +14,30 @@ (setq neo-theme (if (display-graphic-p) 'icons 'arrow)) (setq tab-width 4) +(setq js-indent-level 4) (tool-bar-mode -1) (electric-pair-mode +1) (dumb-jump-mode) (global-display-line-numbers-mode) -(load-theme 'base16-horizon-dark t) +(load-theme 'base16-railscasts t) ;; Born to be wild (setq make-backup-files nil) +;; Load user path +(when (memq window-system '(mac ns x)) + (exec-path-from-shell-initialize)) + +(set-frame-parameter (selected-frame) 'alpha '(97)) +(add-to-list 'default-frame-alist '(alpha . (97))) + +;; Show full path in window title +(setq frame-title-format + '(buffer-file-name "%b - %f" ; File buffer + (dired-directory dired-directory ; Dired buffer + (revert-buffer-function "%b" ; Buffer Menu + ("%b - Dir: " default-directory))))) ; Plain buffer + +(require 'iedit) +(require 'gitlab-ci-mode) +(require 'gitlab-ci-mode-flycheck) (provide 'init-editor) diff --git a/lib/init-js-ts.el b/lib/init-js-ts.el index 12285df..3a1a49e 100644 --- a/lib/init-js-ts.el +++ b/lib/init-js-ts.el @@ -29,5 +29,6 @@ (add-hook 'typescript-mode-hook #'setup-tide-mode) (add-hook 'json-mode #'flycheck-mode) +(add-to-list 'projectile-globally-ignored-files "*node_modules") (provide 'init-js-ts) diff --git a/lib/init-pkg.el b/lib/init-pkg.el index 1f61209..e72cfbd 100644 --- a/lib/init-pkg.el +++ b/lib/init-pkg.el @@ -14,7 +14,7 @@ ; list the packages you want (setq package-list - '(all-the-icons neotree base16-theme afternoon-theme ample-theme nord-theme company-racer racer markdown-mode+ vue-mode dumb-jump magit company flycheck-rust flycheck json-mode flymake-json tss tide material-theme zenburn-theme ac-js2 auto-complete projectile helm js2-mode cargo rust-mode rust-playground css-mode skewer-mode)) + '(all-the-icons neotree base16-theme afternoon-theme ample-theme nord-theme company-racer racer markdown-mode+ vue-mode dumb-jump magit company flycheck-rust flycheck json-mode flymake-json tss tide material-theme zenburn-theme ac-js2 auto-complete projectile helm js2-mode cargo rust-mode rust-playground css-mode skewer-mode web-mode)) ; activate all the packages diff --git a/lib/init-web.el b/lib/init-web.el index 961b000..4fbf450 100644 --- a/lib/init-web.el +++ b/lib/init-web.el @@ -9,4 +9,9 @@ (add-hook 'css-mode-hook 'skewer-css-mode) (add-hook 'html-mode-hook 'skewer-html-mode) +(require 'web-mode) +(add-to-list 'auto-mode-alist '("\\.twig'" . web-mode)) +(add-to-list 'auto-mode-alist '("\\.html?\\'" . web-mode)) +(setq sgml-quick-keys 'close) + (provide 'init-web) diff --git a/transient/history.el b/transient/history.el index 90b5a84..923b5a5 100644 --- a/transient/history.el +++ b/transient/history.el @@ -1 +1,7 @@ -nil \ No newline at end of file +((magit-commit nil) + (magit-dispatch nil) + (magit-push nil) + (magit-revert + ("--edit")) + (magit-stash + ("--all")))