From ad83e045223e48385aeb6c4d5ada3b816e7301e7 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?CAPELLE=20Mika=C3=ABl?= Date: Mon, 13 Jan 2020 18:52:23 +0100 Subject: [PATCH] [global] Multiple small improvements. --- .gitmodules | 72 ++++++++++++++++++++-------------------- elisp/init-dashboard.el | 26 +++++++-------- elisp/init-projectile.el | 15 ++++++--- elisp/init-search.el | 11 +++++- init.el | 11 ++++-- 5 files changed, 79 insertions(+), 56 deletions(-) diff --git a/.gitmodules b/.gitmodules index 1c0701a..784afad 100644 --- a/.gitmodules +++ b/.gitmodules @@ -1,36 +1,36 @@ -[submodule "site-elisp\\color-rg"] - path = site-elisp\\color-rg - url = https://github.com/manateelazycat/color-rg.git -[submodule "site-elisp\\awesome-pair"] - path = site-elisp\\awesome-pair - url = https://github.com/manateelazycat/awesome-pair.git -[submodule "site-elisp\\header2"] - path = site-elisp\\header2 - url = https://github.com/emacsmirror/header2.git -[submodule "site-elisp\\grep-dired"] - path = site-elisp\\grep-dired - url = https://github.com/manateelazycat/grep-dired.git -[submodule "site-elisp\\leetcode"] - path = site-elisp\\leetcode - url = https://github.com/kaiwk/leetcode.el.git -[submodule "site-elisp\\delete-block"] - path = site-elisp\\delete-block - url = https://github.com/manateelazycat/delete-block.git -[submodule "site-elisp\\instant-rename-tag"] - path = site-elisp\\instant-rename-tag - url = https://github.com/manateelazycat/instant-rename-tag.git -[submodule "site-elisp\\emacs-application-framework"] - path = site-elisp\\emacs-application-framework - url = https://github.com/manateelazycat/emacs-application-framework.git -[submodule "site-elisp\\snails"] - path = site-elisp\\snails - url = https://github.com/manateelazycat/snails.git -[submodule "site-elisp\\multi-term"] - path = site-elisp\\multi-term - url = https://github.com/manateelazycat/multi-term.git -[submodule "site-elisp\\epaint"] - path = site-elisp\\epaint - url = https://github.com/chuntaro/epaint.git -[submodule "site-elisp\\aweshell"] - path = site-elisp\\aweshell - url = https://github.com/MatthewZMD/aweshell.git +[submodule "site-elisp/color-rg"] + path = site-elisp/color-rg + url = https://github.com/manateelazycat/color-rg.git +[submodule "site-elisp/awesome-pair"] + path = site-elisp/awesome-pair + url = https://github.com/manateelazycat/awesome-pair.git +[submodule "site-elisp/header2"] + path = site-elisp/header2 + url = https://github.com/emacsmirror/header2.git +[submodule "site-elisp/grep-dired"] + path = site-elisp/grep-dired + url = https://github.com/manateelazycat/grep-dired.git +[submodule "site-elisp/leetcode"] + path = site-elisp/leetcode + url = https://github.com/kaiwk/leetcode.el.git +[submodule "site-elisp/delete-block"] + path = site-elisp/delete-block + url = https://github.com/manateelazycat/delete-block.git +[submodule "site-elisp/instant-rename-tag"] + path = site-elisp/instant-rename-tag + url = https://github.com/manateelazycat/instant-rename-tag.git +[submodule "site-elisp/emacs-application-framework"] + path = site-elisp/emacs-application-framework + url = https://github.com/manateelazycat/emacs-application-framework.git +[submodule "site-elisp/snails"] + path = site-elisp/snails + url = https://github.com/manateelazycat/snails.git +[submodule "site-elisp/multi-term"] + path = site-elisp/multi-term + url = https://github.com/manateelazycat/multi-term.git +[submodule "site-elisp/epaint"] + path = site-elisp/epaint + url = https://github.com/chuntaro/epaint.git +[submodule "site-elisp/aweshell"] + path = site-elisp/aweshell + url = https://github.com/MatthewZMD/aweshell.git diff --git a/elisp/init-dashboard.el b/elisp/init-dashboard.el index 253c911..6984280 100644 --- a/elisp/init-dashboard.el +++ b/elisp/init-dashboard.el @@ -6,8 +6,8 @@ ;; Copyright (C) 2019 Mingde (Matthew) Zeng ;; Created: Thu Mar 14 17:21:46 2019 (-0400) ;; Version: 2.0.0 -;; Last-Updated: Mon Dec 23 18:19:44 2019 (-0500) -;; By: Mingde (Matthew) Zeng +;; Last-Updated: lun. janv. 13 17:02:52 2020 (+0100) +;; By: Mikaël Capelle ;; URL: https://github.com/MatthewZMD/.emacs.d ;; Keywords: M-EMACS .emacs.d dashboard ;; Compatibility: emacs-version >= 26.1 @@ -46,34 +46,34 @@ (dashboard-banner-logo-title "Close the world. Open the nExt.") (dashboard-startup-banner (expand-file-name "images/KEC_Dark_BK_Small.png" user-emacs-directory)) - (dashboard-items '((recents . 7) - (bookmarks . 7) - (agenda . 5))) + (dashboard-items '((recents . 8) + (projects . 8) + (bookmarks . 8))) (dashboard-set-heading-icons t) (dashboard-set-navigator t) (initial-buffer-choice (lambda () (get-buffer dashboard-buffer-name))) (dashboard-navigator-buttons (if (featurep 'all-the-icons) `(((,(all-the-icons-octicon "mark-github" :height 1.1 :v-adjust -0.05) - "M-EMACS" "Browse M-EMACS Homepage" - (lambda (&rest _) (browse-url "https://github.com/MatthewZMD/.emacs.d"))) - (,(all-the-icons-fileicon "elisp" :height 1.0 :v-adjust -0.1) - "Configuration" "" (lambda (&rest _) (edit-configs))))) + "M-EMACS" "Browse M-EMACS Homepage" + (lambda (&rest _) (browse-url "https://github.com/MatthewZMD/.emacs.d"))) + (,(all-the-icons-fileicon "elisp" :height 1.0 :v-adjust -0.1) + "Configuration" "" (lambda (&rest _) (edit-configs))))) `((("" "M-EMACS" "Browse M-EMACS Homepage" - (lambda (&rest _) (browse-url "https://github.com/MatthewZMD/.emacs.d"))) - ("" "Configuration" "" (lambda (&rest _) (edit-configs))))))) + (lambda (&rest _) (browse-url "https://github.com/MatthewZMD/.emacs.d"))) + ("" "Configuration" "" (lambda (&rest _) (edit-configs))))))) :custom-face (dashboard-banner-logo-title ((t (:family "Love LetterTW" :height 123)))) :config (dashboard-modify-heading-icons '((recents . "file-text") - (bookmarks . "book"))) + (bookmarks . "book"))) (dashboard-setup-startup-hook) ;; Open Dashboard function (defun open-dashboard () "Open the *dashboard* buffer and jump to the first widget." (interactive) (if (get-buffer dashboard-buffer-name) - (kill-buffer dashboard-buffer-name)) + (kill-buffer dashboard-buffer-name)) (dashboard-insert-startupify-lists) (switch-to-buffer dashboard-buffer-name) (goto-char (point-min)) diff --git a/elisp/init-projectile.el b/elisp/init-projectile.el index 771fb8a..04458af 100644 --- a/elisp/init-projectile.el +++ b/elisp/init-projectile.el @@ -6,8 +6,8 @@ ;; Copyright (C) 2019 Mingde (Matthew) Zeng ;; Created: Fri Mar 15 09:10:23 2019 (-0400) ;; Version: 2.0.0 -;; Last-Updated: Thu Aug 8 16:07:35 2019 (-0400) -;; By: Mingde (Matthew) Zeng +;; Last-Updated: lun. janv. 13 17:34:30 2020 (+0100) +;; By: Mikaël Capelle ;; URL: https://github.com/MatthewZMD/.emacs.d ;; Keywords: M-EMACS .emacs.d projectile ;; Compatibility: emacs-version >= 26.1 @@ -48,13 +48,20 @@ ("C-z p" . projectile-add-known-project) :custom (projectile-completion-system 'ivy) + (projectile-git-submodule-command + "git submodule --quiet foreach \"echo $sm_path\" | tr '\\n' '\\0'") :config (projectile-mode 1) - (when (and *sys/win32* *tr*) - (setq projectile-indexing-method 'alien)) + (setq projectile-indexing-method 'alien) (add-to-list 'projectile-globally-ignored-directories "node_modules")) ;; -ProjPac +(use-package counsel-projectile + :custom + (projectile-use-git-grep t) + :config + (counsel-projectile-mode)) + (provide 'init-projectile) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; init-projectile.el ends here diff --git a/elisp/init-search.el b/elisp/init-search.el index 3f51247..672b038 100644 --- a/elisp/init-search.el +++ b/elisp/init-search.el @@ -87,7 +87,8 @@ :custom-face (snails-content-buffer-face ((t (:background "#111" :height 110)))) (snails-input-buffer-face ((t (:background "#222" :foreground "gold" :height 110)))) - (snails-header-line-face ((t (:inherit font-lock-function-name-face :underline t :height 1.1)))) + (snails-header-line-face + ((t (:inherit font-lock-function-name-face :underline t :height 1.1)))) :config (use-package exec-path-from-shell :if (featurep 'cocoa) :defer t) @@ -109,6 +110,14 @@ ("M-s e" . snails-everywhere))) ;; -SnailsPac +(use-package imenu-list + :custom + (imenu-list-auto-resize t) + :bind + (("C-x t l" . imenu-list-smart-toggle)) + :config + (imenu-list-minor-mode)) + (provide 'init-search) ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;; ;;; init-ag.el ends here diff --git a/init.el b/init.el index 47f4f56..7c9502f 100644 --- a/init.el +++ b/init.el @@ -37,12 +37,19 @@ ;; ;;; Code: +(setenv "PATH" + (concat + "C:/Softwares/Git/usr/bin" ";" + (getenv "PATH"))) + ;; CheckVer (cond ((version< emacs-version "26.1") (warn "M-EMACS requires Emacs 26.1 and above!")) ((let* ((early-init-f (expand-file-name "early-init.el" user-emacs-directory)) - (early-init-do-not-edit-d (expand-file-name "early-init-do-not-edit/" user-emacs-directory)) - (early-init-do-not-edit-f (expand-file-name "early-init.el" early-init-do-not-edit-d))) + (early-init-do-not-edit-d + (expand-file-name "early-init-do-not-edit/" user-emacs-directory)) + (early-init-do-not-edit-f + (expand-file-name "early-init.el" early-init-do-not-edit-d))) (and (version< emacs-version "27") (or (not (file-exists-p early-init-do-not-edit-f)) (file-newer-than-file-p early-init-f early-init-do-not-edit-f)))