From 0b8215de350a2c97aca90aeb2ca033fa46dfa8f3 Mon Sep 17 00:00:00 2001 From: Stephane Del Pino <stephane.delpino44@gmail.com> Date: Sun, 8 Mar 2020 20:54:06 +0100 Subject: [PATCH] Nettoyage tests complementaires --- .gitignore | 5 ++++- init.el | 31 ++++++++++++++++++------------- myinit.org | 14 ++++++++------ projectile-bookmarks.eld | 1 - 4 files changed, 30 insertions(+), 21 deletions(-) delete mode 100644 projectile-bookmarks.eld diff --git a/.gitignore b/.gitignore index a9e876a..c24b169 100644 --- a/.gitignore +++ b/.gitignore @@ -3,4 +3,7 @@ auto-save-list myinit.el *~ \#* -*.elc \ No newline at end of file +*.elc +/elpa/ +/irony/ +/projectile-bookmarks.eld diff --git a/init.el b/init.el index 84ef9b6..36be9d6 100644 --- a/init.el +++ b/init.el @@ -4,12 +4,17 @@ (require 'package) (setq package-enable-at-startup nil) -(add-to-list 'package-archives - '("melpa" . "http://melpa.org/packages/")) - (add-to-list 'package-archives - '("gnu" . "http://elpa.gnu.org/packages/")) -;; (add-to-list 'package-archives -;; '("melpa3" . "http://www.mirrorservice.org/sites/stable.melpa.org/packages/")) + +(setq is-standalone nil) +(if is-standalone + (setq package-archives '(("myelpa" . "~/.emacs.d/myelpa/"))) + '((add-to-list 'package-archives + '("melpa" . "http://melpa.org/packages/")) + (add-to-list 'package-archives + '("gnu" . "http://elpa.gnu.org/packages/")) + (add-to-list 'package-archives + '("melpa3" . "http://www.mirrorservice.org/sites/stable.melpa.org/packages/")))) + (package-initialize) ;; Bootstrap `use-package' @@ -17,12 +22,6 @@ (package-refresh-contents) (package-install 'use-package)) -; If you like a tabbar -(use-package tabbar - :ensure t - :config - (tabbar-mode 1)) - ;; show the current function on top (which-function-mode t) @@ -46,7 +45,7 @@ '(org-startup-indented t) '(package-selected-packages (quote - (alect-theme zero-dark-theme autumn-light-theme solarized-dark-theme misterioso misterioso-theme zenburn sourcerer-theme flycheck-pos-tip flycheck-clojure ox-reveal posframe processing-snippets processing-mode rg deadgrep flycheck-rust cargo racer yasnippet-classic-snippets rustic lsp-rust lsp-java company-lsp lsp-ui lsp-mode lsp yasnippet-snippets counsel-spotify exec-path-from-shell easy-kill auto-yasnippet org-pdfview pdf-tools atomic-chrome mingus simple-mpc pcre2el ag wgrep-ag wgrep haskell-mode aggressive-indent treemacs-projectile treemacs prodigy origami dumb-jump cider ggtags circe-notifications circe org-gcal mu4e-alert git-timemachine git-gutter magit hydra default-text-scale smartparens projectile auctex tern-auto-complete tern js2-refactor ac-js2 js2-mode emmet-mode web-mode iedit expand-region multiple-cursors hungry-delete beacon undo-tree virtualenvwrapper elpy flycheck doom-modeline doom-themes tao-theme poet-theme faff-theme zerodark-theme alect-themes moe-theme base16-theme zenburn-theme color-theme-modern company-jedi irony-eldoc company-irony company counsel ace-window htmlize noflet org-bullets which-key try use-package))) + (tabbar cmake-font-lock alect-theme zero-dark-theme autumn-light-theme solarized-dark-theme misterioso misterioso-theme zenburn sourcerer-theme flycheck-pos-tip flycheck-clojure ox-reveal posframe processing-snippets processing-mode rg deadgrep flycheck-rust cargo racer yasnippet-classic-snippets rustic lsp-rust lsp-java company-lsp lsp-ui lsp-mode lsp yasnippet-snippets counsel-spotify exec-path-from-shell easy-kill auto-yasnippet org-pdfview pdf-tools atomic-chrome mingus simple-mpc pcre2el ag wgrep-ag wgrep haskell-mode aggressive-indent treemacs-projectile treemacs prodigy origami dumb-jump cider ggtags circe-notifications circe org-gcal mu4e-alert git-timemachine git-gutter magit hydra default-text-scale smartparens projectile auctex tern-auto-complete tern js2-refactor ac-js2 js2-mode emmet-mode web-mode iedit expand-region multiple-cursors hungry-delete beacon undo-tree virtualenvwrapper elpy flycheck doom-modeline doom-themes tao-theme poet-theme faff-theme zerodark-theme alect-themes moe-theme base16-theme zenburn-theme color-theme-modern company-jedi irony-eldoc company-irony company counsel ace-window htmlize noflet org-bullets which-key try use-package))) '(sp-escape-quotes-after-insert nil)) ;; (setq max-lisp-eval-depth 10000) ;; (setq max-specpdl-size 10000) @@ -79,6 +78,12 @@ (byte-recompile-directory (expand-file-name "~/.emacs.d") 0) +(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. + '(aw-leading-char-face ((t (:inherit ace-jump-face-foreground :height 3.0))))) ;; Local Variables: ;; byte-compile-warnings: (not free-vars) ;; End: diff --git a/myinit.org b/myinit.org index 7410202..afea11a 100644 --- a/myinit.org +++ b/myinit.org @@ -32,6 +32,13 @@ (add-hook 'prog-mode-hook (lambda () (auto-fill-mode -1))) #+END_SRC +* Powerline +#+BEGIN_SRC emacs-lisp +(use-package powerline +:ensure t +:config (powerline-default-theme)) +#+END_SRC + * try #+BEGIN_SRC emacs-lisp (use-package try @@ -812,11 +819,6 @@ (bind-key "C-x g" 'magit-status) )) -(use-package magit-gerrit - :ensure t - :after magit - ) - (setq magit-status-margin '(t "%Y-%m-%d %H:%M " magit-log-margin-width t 18)) (use-package git-gutter @@ -1483,7 +1485,7 @@ #+BEGIN_SRC emacs-lisp (use-package fzf :ensure t) #+END_SRC -* COMMENT All the icons +* All the icons #+BEGIN_SRC emacs-lisp (use-package all-the-icons diff --git a/projectile-bookmarks.eld b/projectile-bookmarks.eld deleted file mode 100644 index 74ae8a1..0000000 --- a/projectile-bookmarks.eld +++ /dev/null @@ -1 +0,0 @@ -("~/using-emacs/" "~/pugs/") \ No newline at end of file -- GitLab