Skip to content

Commit

Permalink
Merge branch 'release/1.0.3'
Browse files Browse the repository at this point in the history
  • Loading branch information
Jose C. Massón committed Nov 6, 2020
2 parents 7efc9cf + d90c85b commit b89a7ce
Show file tree
Hide file tree
Showing 6 changed files with 19 additions and 24 deletions.
7 changes: 4 additions & 3 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@


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.
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.
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.

This Emacs config have some useful modules:

Expand All @@ -50,7 +50,6 @@ This Emacs config have some useful modules:
* markdown-mode
* markdown-toc
* neo-tree
* password-store
* php-mode
* powerline
* projectile
Expand Down Expand Up @@ -160,12 +159,14 @@ $ git clone https://github.com/Abuelodelanada/pepe-emacs-config ~/.emacs.d
* `C-M-left`: tabbar-backward
* `M-up` : beginning-of-buffer
* `M-down`: end-of-buffer
* `C-M-g`: dumb-jump-go (Go to definition)
* `C-M-p`: dumb-jump-back (Return from definition)
* `C-M-right`: tabbar-forward
* `S-M-down` : enlarge window
* `S-M-left`: enlarge window horizontally
* `S-M-right`: shrink window horizontally
* `S-M-up`: shrink window
* `S-down`: windmove down
* `S-left`: 'windmove left
* `S-left`: windmove left
* `S-right`: windmove right
* `S-up`: windmove up
4 changes: 3 additions & 1 deletion faces.el
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,9 @@
;;; Code:

(set-face-attribute 'cursor t :background "#FE8B05" :foreground "white smoke" :inverse-video t)
(set-face-attribute 'default t :background "#000000" :foreground "#F8F8F2" :weight 'bold :height 110 :family "Ubuntu Mono")
(set-face-attribute 'default t :background "#000000" :foreground "#F8F8F2" :weight 'normal :height 105)


(set-face-attribute 'ido-first-match t :foreground "#FF6E27" :weight 'bold)
(set-face-attribute 'ido-incomplete-regexp t :foreground "DeepPink1" :weight 'bold)
(set-face-attribute 'ido-indicator t :background "#FF6E27" :foreground "#000000" :width 'condensed)
Expand Down
7 changes: 1 addition & 6 deletions require.el
Original file line number Diff line number Diff line change
Expand Up @@ -3,11 +3,6 @@
;;; Commentary:
;;; Code:

;(require 'git-gutter-fringe)
;(require 'iedit)
;(require 'magit)
;(require 'linum)
;(require 'hlinum)
;(require 'projectile)

(provide 'require)
;;; require.el ends here
3 changes: 1 addition & 2 deletions tabbar.el
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,7 @@
;; Colors
(set-face-attribute 'tabbar-default nil
:background "gray9" :foreground
"gray9" :distant-foreground "gray9"
:family "Helvetica Neue" :box nil)
"gray9" :distant-foreground "gray9" :box nil)
(set-face-attribute 'tabbar-unselected nil
:background "gray80" :foreground "gray9" :box nil)
(set-face-attribute 'tabbar-modified nil
Expand Down
20 changes: 9 additions & 11 deletions use-package.el
Original file line number Diff line number Diff line change
Expand Up @@ -63,6 +63,10 @@
:mode "Dockerfile\\'")
(use-package dumb-jump
:defer 2
:init
(add-hook 'js2-mode-hook 'dumb-jump-mode)
(add-hook 'php-mode-hook 'dumb-jump-mode)
(add-hook 'python-mode-hook 'dumb-jump-mode)
:custom
(dumb-jump-default-project "~")
(dumb-jump-force-searcher nil)
Expand Down Expand Up @@ -123,13 +127,13 @@
(linum-highlight-face ((t (:inherit default :background "#000000" :foreground "#FF6E27" :slant normal :weight bold)))))
(use-package iedit
:defer t
:bind (("C-;" . iedit-mode))
:custom-face
(iedit-occurrence ((t (:foreground "green yellow")))))
(iedit-occurrence ((t (:foreground "green yellow"))))
:diminish)
(use-package jquery-doc
:defer t)
(use-package js2-mode
:config
(dumb-jump-mode t)
:mode "\\.js\\'")
(use-package json-mode
:mode "\\.json\\'")
Expand Down Expand Up @@ -184,14 +188,7 @@
(neo-banner-face ((t (:background "#000000" :foreground "#F34739" :weight bold))))
(neo-dir-link-face ((t (:foreground "#FF6E27"))))
(neo-root-dir-face ((t (:background "#000000" :foreground "gold")))))
(use-package pass
:defer 2
:custom-face
(pass-mode-directory-face ((t (:foreground "#FF6E27" :weight bold))))
(pass-mode-entry-face ((t))))
(use-package php-mode
:config
(dumb-jump-mode t)
:mode "\\.php"
:mode "\\.module$"
:mode "\\.inc$"
Expand Down Expand Up @@ -256,7 +253,8 @@
:defer 2
:custom-face
(which-key-key-face ((t (:foreground "#FF6E27" :weight bold))))
(which-key-group-description-face ((t (:foreground "#FE8B05" :weight bold)))))
(which-key-group-description-face ((t (:foreground "#FE8B05" :weight bold))))
:diminish)
(use-package yaml-mode
:mode "\\.yml$"
:mode "\\.yaml$")
Expand Down
2 changes: 1 addition & 1 deletion variables.el
Original file line number Diff line number Diff line change
Expand Up @@ -45,7 +45,7 @@
(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))
;(setq projectile-project-search-path '("~/projects/" "~/work/")) ;; Set your project's direcotries copying this line in customvariables.el

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

0 comments on commit b89a7ce

Please sign in to comment.