Skip to content

Commit 7efc9cf

Browse files
Merge branch 'release/1.0.2'
2 parents c15aeee + 9d8cec2 commit 7efc9cf

File tree

5 files changed

+58
-36
lines changed

5 files changed

+58
-36
lines changed

hooks.el

Lines changed: 8 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,14 @@
44
;;; Code:
55

66
;; Hooks
7+
;; Use a hook so the message doesn't get clobbered by other messages.
8+
(add-hook 'emacs-startup-hook
9+
(lambda ()
10+
(message "Emacs with 'The Pepe emacs config' is ready in %s with %d garbage collections."
11+
(format "%.3f seconds"
12+
(float-time
13+
(time-subtract after-init-time before-init-time)))
14+
gcs-done)))
715
(add-hook 'window-setup-hook 'on-after-init)
816
;(add-hook 'php-mode-hook 'php-enable-psr2-coding-style)
917
(add-hook 'flycheck-mode-hook 'flycheck-color-mode-line-mode)

init.el

Lines changed: 4 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -12,15 +12,12 @@
1212
(load "~/.emacs.d/messages")
1313
(setq load-prefer-newer t)
1414
(package-initialize)
15+
(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3")
1516
(load "~/.emacs.d/init-packages")
1617

1718
(eval-when-compile
1819
(require 'use-package))
1920
(load "~/.emacs.d/use-package")
20-
(require 'auto-compile)
21-
(auto-compile-on-load-mode)
22-
(auto-compile-on-save-mode)
23-
(load "~/.emacs.d/require")
2421
(load "~/.emacs.d/variables")
2522
(load "~/.emacs.d/customvariables")
2623
(load "~/.emacs.d/functions")
@@ -35,7 +32,6 @@
3532
(global-git-gutter-mode t)
3633
(global-highlight-parentheses-mode t)
3734
(global-linum-mode t) ;; Show line-number
38-
(hlinum-activate)
3935
(global-whitespace-mode t)
4036
(ido-mode t)
4137
(menu-bar-mode -1) ;; Hide menubar
@@ -46,15 +42,16 @@
4642
(tool-bar-mode -1) ;; Hide toolbar
4743
(yas-global-mode 1)
4844
(projectile-mode +1)
45+
(which-key-mode)
4946

5047
(put 'downcase-region 'disabled nil)
5148
(set-default 'case-fold-search nil) ; Case sensitive TAGS search
5249
(autoload 'geben "geben" "DBGp protocol frontend, a script debugger" t) ; Geben
5350

5451
(diminish 'abbrev-mode "Abv")
5552
(diminish 'git-gutter-mode)
56-
(diminish 'global-whitespace-mode t)
57-
(diminish 'yas-minor-mode t)
53+
(diminish 'global-whitespace-mode "")
54+
(diminish 'yas-minor-mode "")
5855
(load-theme 'monokai t)
5956
(load "~/.emacs.d/faces")
6057
(load "~/.emacs.d/customfaces")

tabbar.el

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030

3131
;; Use Powerline to make tabs look nicer
3232
;; (this needs to run *after* the colors are set)
33-
(require 'powerline)
34-
(defvar my/tabbar-height 20)
33+
;(require 'powerline)
34+
(defvar my/tabbar-height 25)
3535
(defvar my/tabbar-left (powerline-slant-right 'tabbar-default nil my/tabbar-height))
3636
(defvar my/tabbar-right (powerline-slant-right nil 'tabbar-default my/tabbar-height))
3737
(defun my/tabbar-tab-label-function (tab)

use-package.el

Lines changed: 42 additions & 27 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,14 @@
99
(use-package adoc-mode
1010
:mode "\\.adoc")
1111
(use-package ag
12-
:defer t)
12+
:defer 2)
1313
(use-package all-the-icons
14-
:defer t)
14+
:defer 1)
1515
(use-package auto-compile
16-
:defer t)
16+
:defer t
17+
:custom
18+
(auto-compile-on-load-mode)
19+
(auto-compile-on-save-mode))
1720
;(use-package benchmark-init
1821
; :ensure t
1922
; :config
@@ -59,13 +62,14 @@
5962
(use-package dockerfile-mode
6063
:mode "Dockerfile\\'")
6164
(use-package dumb-jump
62-
:defer t
65+
:defer 2
6366
:custom
6467
(dumb-jump-default-project "~")
6568
(dumb-jump-force-searcher nil)
6669
(dumb-jump-prefer-searcher 'ag)
6770
(dumb-jump-quiet nil))
6871
(use-package ecb
72+
; :defer 2
6973
:bind (("<f7>" . ecb-minor-mode))
7074
:custom
7175
(ecb-layout-name "left6")
@@ -105,21 +109,14 @@
105109
:after (flycheck))
106110
(use-package gcmh)
107111
(use-package geben
108-
:defer t)
112+
:defer 2)
109113
(use-package git-gutter-fringe)
110114
(use-package highlight
111-
:defer t
115+
:defer 2
112116
:custom-face
113117
(highlight ((t (:background "black" :foreground "white")))))
114118
(use-package highlight-parentheses
115-
:defer t
116-
:diminish)
117-
(use-package highlight-indent-guides
118-
:defer t
119-
:init
120-
(add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
121-
:custom
122-
(highlight-indent-guides-method 'bitmap)
119+
:defer 2
123120
:diminish)
124121
(use-package hlinum
125122
:custom-face
@@ -137,10 +134,12 @@
137134
(use-package json-mode
138135
:mode "\\.json\\'")
139136
(use-package linum
137+
:defer 0.3
140138
:init
141-
(add-hook 'linum-mode-hook 'my-linum-mode-hook))
139+
(add-hook 'linum-mode-hook 'my-linum-mode-hook)
140+
(hlinum-activate))
142141
(use-package magit
143-
:bind (("C-x g" . magit-status))
142+
:bind (("C-x g" . magit-status))
144143
:custom-face
145144
(magit-branch-local ((t (:foreground "orange"))))
146145
(magit-branch-remote ((t (:foreground "#D90F5A"))))
@@ -171,9 +170,9 @@
171170
(use-package markdown-toc
172171
:after (markdown-mode))
173172
(use-package markup-faces
174-
:defer t)
173+
:defer 2)
175174
(use-package monokai-theme
176-
:defer t)
175+
:defer 2)
177176
(use-package neotree
178177
:bind (("<f8>" . neotree-toggle))
179178
:custom
@@ -186,7 +185,7 @@
186185
(neo-dir-link-face ((t (:foreground "#FF6E27"))))
187186
(neo-root-dir-face ((t (:background "#000000" :foreground "gold")))))
188187
(use-package pass
189-
:defer t
188+
:defer 2
190189
:custom-face
191190
(pass-mode-directory-face ((t (:foreground "#FF6E27" :weight bold))))
192191
(pass-mode-entry-face ((t))))
@@ -205,8 +204,14 @@
205204
(phpcbf-standard "PSR12")
206205
:after (php-mode))
207206
(use-package pkg-info
208-
:defer t)
209-
(use-package popup)
207+
:defer 2)
208+
(use-package popup
209+
:defer 2
210+
:custom-face
211+
(popup-face ((t (:background "gray10" :foreground "#F8F8F2"))))
212+
(popup-menu-face ((t (:background "gray10" :foreground "#F8F8F2"))))
213+
(popup-menu-mouse-face ((t (:background "orange" :foreground "#F8F8F2"))))
214+
(popup-menu-selection-face ((t (:background "orange red" :foreground "#000000")))))
210215
(use-package powerline
211216
:custom
212217
(powerline-default-separator "arrow-fade")
@@ -221,16 +226,18 @@
221226
(powerline-active2 ((t (:background "gray9" :foreground "#FF6E27")))))
222227

223228
(use-package projectile
224-
:defer 0.1
229+
:defer 0.4
225230
:diminish "Proj"
231+
:custom
232+
(projectile-use-git-grep t)
226233
:bind-keymap
227234
("M-p" . projectile-command-map)
228235
("C-c p" . projectile-command-map))
229236
(use-package smarty-mode
230237
:mode "\\.tpl$")
231238
(use-package sqlformat
232-
:bind (("C-c <tab>" . sqlformat))
233-
:defer t)
239+
:bind (("C-c <tab>" . sqlformat))
240+
:defer 2)
234241
(use-package tabbar
235242
:bind (("M-<left>" . tabbar-backward)
236243
("M-<right>" . tabbar-forward))
@@ -241,12 +248,20 @@
241248
:custom-face
242249
(tabbar-separator ((t (:inherit tabbar-default :width normal)))))
243250
(use-package web-mode
244-
:defer t)
251+
:mode "\\.html?\\'"
252+
:mode "\\.phtml\\'"
253+
:mode "\\.phtml\\'")
254+
255+
(use-package which-key
256+
:defer 2
257+
:custom-face
258+
(which-key-key-face ((t (:foreground "#FF6E27" :weight bold))))
259+
(which-key-group-description-face ((t (:foreground "#FE8B05" :weight bold)))))
245260
(use-package yaml-mode
246261
:mode "\\.yml$"
247262
:mode "\\.yaml$")
248263
(use-package yasnippet
249-
:defer t)
264+
:defer 2)
250265
(use-package yasnippet-snippets
251-
:defer t)
266+
:defer 2)
252267
;;;

variables.el

Lines changed: 2 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -41,6 +41,8 @@
4141
(setq-default yas-prompt-functions '(yas-dropdown-prompt yas-ido-prompt yas-completing-prompt))
4242
(setq-default load-prefer-newer t)
4343
(setq-default pepe-debug-p t)
44+
(setq-default whitespace-style '(face trailing tabs newline empty indentation space-after-tab space-before-tab space-mark tab-mark newline-mark))
45+
(setq-default whitespace-global-modes '(adoc-mode dockerfile-mode js2-mode json-mode markdown-mode php-mode python-mode smarty-mode web-mode yaml-mode))
4446
;(setq projectile-project-search-path '("~/projects/" "~/work/")) ;; Set your project's direcotries copying this line in customvariables.el
4547

4648
;; Taker from doom-emacs

0 commit comments

Comments
 (0)