From 7369cde119caac0c9ef4eebb4ea5bee7c43dafa6 Mon Sep 17 00:00:00 2001
From: Stephane Del Pino <stephane.delpino44@gmail.com>
Date: Fri, 19 Feb 2021 20:46:18 +0100
Subject: [PATCH] Nettoyage de la configuration

---
 .init-custom.el   | 10 +---------
 Configuration.org | 37 +++++++++++++++++++++++--------------
 2 files changed, 24 insertions(+), 23 deletions(-)

diff --git a/.init-custom.el b/.init-custom.el
index d0fca10..acb3543 100644
--- a/.init-custom.el
+++ b/.init-custom.el
@@ -16,7 +16,6 @@
  '(display-line-numbers-widen t)
  '(elpy-rpc-backend "jedi" t)
  '(hydra-hint-display-type (quote posframe))
- '(irony-cdb-search-directory-list (quote ("." "build")))
  '(ispell-dictionary "american")
  '(org-confirm-babel-evaluate nil)
  '(org-default-notes-file (concat org-directory "/notes.org"))
@@ -29,17 +28,10 @@
  '(custom-enabled-themes '(sourcerer) t)
  '(package-selected-packages
    (quote
-    (better-shell flycheck-irony 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 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 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)))
+    (better-shell 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 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 tao-theme poet-theme faff-theme zerodark-theme alect-themes moe-theme base16-theme zenburn-theme color-theme-modern company-jedi company counsel ace-window htmlize noflet org-bullets which-key try use-package)))
  '(sp-escape-quotes-after-insert nil)
  '(pdf-view-incompatible-modes
    (quote
     (linum-mode linum-relative-mode helm-linum-relative-mode nlinum-mode nlinum-hl-mode nlinum-relative-mode yalinum-mode display-line-numbers-mode))))
 
-(custom-set-faces
- '(aw-leading-char-face ((((class color) (min-colors 16777215)) (:foreground "#fb4933" :background "#282828" :height 4.0)) (((class color) (min-colors 255)) (:foreground "#d75f5f" :background "#262626" :height 4.0))))
- '(git-gutter:added ((t (:inherit bold :background "green" :foreground "gray15" :inverse-video t :weight bold))))
- '(git-gutter:deleted ((t (:inherit bold :background "red" :foreground "gray15" :inverse-video t :weight bold))))
- '(git-gutter:modified ((t (:inherit bold :background "yellow" :foreground "gray15" :inverse-video t :weight bold))))
- '(show-paren-match ((t (:background "green" :foreground "grey15" :inverse-video t :weight bold)))))
-
 ;;; .init-custom.el ends here
diff --git a/Configuration.org b/Configuration.org
index fa95d4a..882bb57 100644
--- a/Configuration.org
+++ b/Configuration.org
@@ -218,10 +218,10 @@ fenêtre choisie pour s'y rendre.
       (setq aw-scope 'global) ;; was frame
       (global-set-key (kbd "C-x O") 'other-frame)
       (global-set-key [remap other-window] 'ace-window)
-      (custom-set-faces
-       '(aw-leading-char-face
-         ((t (:inherit ace-jump-face-foreground :height 3.0)))))
-      ))
+      )
+    :custom-face
+    (aw-leading-char-face ((t (:inherit ace-jump-face-foreground :height 3.0))))
+    )
 #+END_SRC
 
 ** Window-jump
@@ -263,7 +263,10 @@ Interface de complétion
     (setq ivy-use-virtual-buffers t)
     (setq ivy-count-format "%d/%d ")
     (setq ivy-display-style 'fancy)
-    (setq ivy-wrap t))
+    (setq ivy-wrap t)
+    :custom-face
+    (ivy-current-match ((t (:extend t :background "#27323D" :underline t :weight bold))))
+  )
 
   (use-package ivy-rich
     :ensure t
@@ -309,13 +312,13 @@ classiques. Deux différences notables.
       (setq ivy-use-selectable-prompt t)
       (define-key read-expression-map (kbd "C-r") 'counsel-expression-history)
       (define-key ivy-minibuffer-map (kbd "C-w") 'ivy-yank-word)
-      (custom-set-faces
-       '(swiper-match-face-1 ((t (:background "#74b5727c5654" :foreground "black"))))
-       '(swiper-match-face-2 ((t (:background "#ce8bf1006cba" :foreground "black"))))
-       '(swiper-match-face-3 ((t (:background "#fefdc4fe5941" :foreground "black"))))
-       '(swiper-match-face-4 ((t (:background "#fefd9c40f85a" :foreground "black"))))
-       )
       )
+    :custom-face
+    (swiper-line-face ((t (:inherit highlight :underline t :weight bold))))
+    (swiper-match-face-1 ((t (:background "#74b5727c5654" :foreground "black"))))
+    (swiper-match-face-2 ((t (:background "#ce8bf1006cba" :foreground "black"))))
+    (swiper-match-face-3 ((t (:background "#fefdc4fe5941" :foreground "black"))))
+    (swiper-match-face-4 ((t (:background "#fefd9c40f85a" :foreground "black"))))
     )
 #+END_SRC
 
@@ -341,7 +344,6 @@ Boîtes de dialogue pour la complétion
     (setq company-tooltip-align-annotations t)
     (global-company-mode t))
 
-
   (use-package company-box
     :ensure t
     :hook (company-mode . company-box-mode))
@@ -866,7 +868,9 @@ raccourci suivant.
     :config
     (require 'smartparens-config)
     (global-set-key (kbd "C-\"") 'sp-split-sexp)
-  )
+    :custom-face
+    (show-paren-match ((t (:background "green" :foreground "grey15" :inverse-video t :weight bold))))
+    )
 
   (show-paren-mode t)
   (setq show-paren-style 'mixed)
@@ -963,7 +967,12 @@ checkout -p~)
     :init
     (global-git-gutter-mode +1)
     (add-hook 'magit-post-refresh-hook
-              #'git-gutter:update-all-windows))
+              #'git-gutter:update-all-windows)
+    :custom-face
+    (git-gutter:added ((t (:inherit bold :background "green" :foreground "gray15" :inverse-video t :weight bold))))
+    (git-gutter:deleted ((t (:inherit bold :background "red" :foreground "gray15" :inverse-video t :weight bold))))
+    (git-gutter:modified ((t (:inherit bold :background "yellow" :foreground "gray15" :inverse-video t :weight bold))))
+    )
 
   (global-set-key (kbd "M-g M-g") 'hydra-git-gutter/body)
 
-- 
GitLab