Skip to content

Commit b89a7ce

Browse files
author
Jose C. Massón
committed
Merge branch 'release/1.0.3'
2 parents 7efc9cf + d90c85b commit b89a7ce

File tree

6 files changed

+19
-24
lines changed

6 files changed

+19
-24
lines changed

README.md

Lines changed: 4 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@
3333

3434

3535
Inspired by the great Juan Pedro Fisanotti and his wonderful [fisa-vim-config](https://github.com/fisadev/fisa-vim-config), I share my [Emacs](https://www.gnu.org/software/emacs/) config.
36-
This is my personal Emacs configuration, built according to my personal preferences, without any justification to think it's the best possible emacs configuration. If you like it, great! :) It's mainly oriented to PHP software development, but many of its features are useful for other languages and editing tasks.
36+
This is my personal Emacs configuration, built according to my personal preferences, without any justification to think it's the best possible emacs configuration. If you like it, great! :) It's mainly oriented to PHP and Python software development, but many of its features are useful for other languages and editing tasks.
3737

3838
This Emacs config have some useful modules:
3939

@@ -50,7 +50,6 @@ This Emacs config have some useful modules:
5050
* markdown-mode
5151
* markdown-toc
5252
* neo-tree
53-
* password-store
5453
* php-mode
5554
* powerline
5655
* projectile
@@ -160,12 +159,14 @@ $ git clone https://github.com/Abuelodelanada/pepe-emacs-config ~/.emacs.d
160159
* `C-M-left`: tabbar-backward
161160
* `M-up` : beginning-of-buffer
162161
* `M-down`: end-of-buffer
162+
* `C-M-g`: dumb-jump-go (Go to definition)
163+
* `C-M-p`: dumb-jump-back (Return from definition)
163164
* `C-M-right`: tabbar-forward
164165
* `S-M-down` : enlarge window
165166
* `S-M-left`: enlarge window horizontally
166167
* `S-M-right`: shrink window horizontally
167168
* `S-M-up`: shrink window
168169
* `S-down`: windmove down
169-
* `S-left`: 'windmove left
170+
* `S-left`: windmove left
170171
* `S-right`: windmove right
171172
* `S-up`: windmove up

faces.el

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,7 +4,9 @@
44
;;; Code:
55

66
(set-face-attribute 'cursor t :background "#FE8B05" :foreground "white smoke" :inverse-video t)
7-
(set-face-attribute 'default t :background "#000000" :foreground "#F8F8F2" :weight 'bold :height 110 :family "Ubuntu Mono")
7+
(set-face-attribute 'default t :background "#000000" :foreground "#F8F8F2" :weight 'normal :height 105)
8+
9+
810
(set-face-attribute 'ido-first-match t :foreground "#FF6E27" :weight 'bold)
911
(set-face-attribute 'ido-incomplete-regexp t :foreground "DeepPink1" :weight 'bold)
1012
(set-face-attribute 'ido-indicator t :background "#FF6E27" :foreground "#000000" :width 'condensed)

require.el

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -3,11 +3,6 @@
33
;;; Commentary:
44
;;; Code:
55

6-
;(require 'git-gutter-fringe)
7-
;(require 'iedit)
8-
;(require 'magit)
9-
;(require 'linum)
10-
;(require 'hlinum)
11-
;(require 'projectile)
6+
127
(provide 'require)
138
;;; require.el ends here

tabbar.el

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,7 @@
1414
;; Colors
1515
(set-face-attribute 'tabbar-default nil
1616
:background "gray9" :foreground
17-
"gray9" :distant-foreground "gray9"
18-
:family "Helvetica Neue" :box nil)
17+
"gray9" :distant-foreground "gray9" :box nil)
1918
(set-face-attribute 'tabbar-unselected nil
2019
:background "gray80" :foreground "gray9" :box nil)
2120
(set-face-attribute 'tabbar-modified nil

use-package.el

Lines changed: 9 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -63,6 +63,10 @@
6363
:mode "Dockerfile\\'")
6464
(use-package dumb-jump
6565
:defer 2
66+
:init
67+
(add-hook 'js2-mode-hook 'dumb-jump-mode)
68+
(add-hook 'php-mode-hook 'dumb-jump-mode)
69+
(add-hook 'python-mode-hook 'dumb-jump-mode)
6670
:custom
6771
(dumb-jump-default-project "~")
6872
(dumb-jump-force-searcher nil)
@@ -123,13 +127,13 @@
123127
(linum-highlight-face ((t (:inherit default :background "#000000" :foreground "#FF6E27" :slant normal :weight bold)))))
124128
(use-package iedit
125129
:defer t
130+
:bind (("C-;" . iedit-mode))
126131
:custom-face
127-
(iedit-occurrence ((t (:foreground "green yellow")))))
132+
(iedit-occurrence ((t (:foreground "green yellow"))))
133+
:diminish)
128134
(use-package jquery-doc
129135
:defer t)
130136
(use-package js2-mode
131-
:config
132-
(dumb-jump-mode t)
133137
:mode "\\.js\\'")
134138
(use-package json-mode
135139
:mode "\\.json\\'")
@@ -184,14 +188,7 @@
184188
(neo-banner-face ((t (:background "#000000" :foreground "#F34739" :weight bold))))
185189
(neo-dir-link-face ((t (:foreground "#FF6E27"))))
186190
(neo-root-dir-face ((t (:background "#000000" :foreground "gold")))))
187-
(use-package pass
188-
:defer 2
189-
:custom-face
190-
(pass-mode-directory-face ((t (:foreground "#FF6E27" :weight bold))))
191-
(pass-mode-entry-face ((t))))
192191
(use-package php-mode
193-
:config
194-
(dumb-jump-mode t)
195192
:mode "\\.php"
196193
:mode "\\.module$"
197194
:mode "\\.inc$"
@@ -256,7 +253,8 @@
256253
:defer 2
257254
:custom-face
258255
(which-key-key-face ((t (:foreground "#FF6E27" :weight bold))))
259-
(which-key-group-description-face ((t (:foreground "#FE8B05" :weight bold)))))
256+
(which-key-group-description-face ((t (:foreground "#FE8B05" :weight bold))))
257+
:diminish)
260258
(use-package yaml-mode
261259
:mode "\\.yml$"
262260
:mode "\\.yaml$")

variables.el

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -45,7 +45,7 @@
4545
(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))
4646
;(setq projectile-project-search-path '("~/projects/" "~/work/")) ;; Set your project's direcotries copying this line in customvariables.el
4747

48-
;; Taker from doom-emacs
48+
;; Taken from doom-emacs
4949
;; Adopt a sneaky garbage collection strategy of waiting until idle time to
5050
;; collect; staving off the collector while the user is working.
5151
(setq gcmh-idle-delay 5

0 commit comments

Comments
 (0)