Skip to content

Commit

Permalink
Merge branch 'release/1.0.1'
Browse files Browse the repository at this point in the history
  • Loading branch information
Abuelodelanada committed Jul 5, 2020
2 parents 49d33e7 + f49a805 commit c15aeee
Show file tree
Hide file tree
Showing 15 changed files with 114 additions and 46 deletions.
1 change: 1 addition & 0 deletions alias.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand Down
1 change: 1 addition & 0 deletions automode.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand Down
1 change: 1 addition & 0 deletions customfaces.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary: Here you can place your custom faces
;;; Code:
Expand Down
5 changes: 1 addition & 4 deletions customvariables.el
Original file line number Diff line number Diff line change
@@ -1,11 +1,8 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary: Here you can place your custom variables
;;; Code:






(provide 'customvariables)
;;; customvariables.el ends here
3 changes: 1 addition & 2 deletions faces.el
Original file line number Diff line number Diff line change
@@ -1,9 +1,8 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; 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 'ido-first-match t :foreground "#FF6E27" :weight 'bold)
Expand Down
1 change: 1 addition & 0 deletions functions.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand Down
5 changes: 5 additions & 0 deletions hooks.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand All @@ -8,5 +9,9 @@
(add-hook 'flycheck-mode-hook 'flycheck-color-mode-line-mode)
(add-hook 'flycheck-mode-hook #'flycheck-pycheckers-setup)

(add-hook 'emacs-startup-hook
(lambda ()
(setq file-name-handler-alist pepe--file-name-handler-alist)))

(provide 'hooks)
;;; hooks ends here
1 change: 1 addition & 0 deletions init-packages.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand Down
7 changes: 7 additions & 0 deletions init.el
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:

;; Taken from foom-emacs!
;; A big contributor to startup times is garbage collection. We up the gc
;; threshold to temporarily prevent it from running, then reset it later by
;; enabling `gcmh-mode'. Not resetting it will cause stuttering/freezes.
(setq gc-cons-threshold most-positive-fixnum)

(load "~/.emacs.d/messages")
(setq load-prefer-newer t)
(package-initialize)
Expand Down
1 change: 1 addition & 0 deletions messages.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand Down
13 changes: 7 additions & 6 deletions require.el
Original file line number Diff line number Diff line change
@@ -1,12 +1,13 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:

(require 'git-gutter-fringe)
(require 'iedit)
(require 'magit)
(require 'linum)
(require 'hlinum)
(require 'projectile)
;(require 'git-gutter-fringe)
;(require 'iedit)
;(require 'magit)
;(require 'linum)
;(require 'hlinum)
;(require 'projectile)
(provide 'require)
;;; require.el ends here
6 changes: 1 addition & 5 deletions shortcuts.el
Original file line number Diff line number Diff line change
@@ -1,12 +1,11 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:

;; Shortcuts
(global-set-key (kbd "%") 'match-paren) ;; Ir al cierre-apertura de ([{
(global-set-key (kbd "<f12>") 'menu-bar-mode)
(global-set-key (kbd "C-;") 'iedit-dwim)
(global-set-key (kbd "C-c <tab>") 'sqlformat)
(global-set-key (kbd "C-c C-k") 'copy-line)
(global-set-key (kbd "C-c C-w") 'copy-word)
(global-set-key (kbd "C-c C-z") 'term-stop-subjob)
Expand All @@ -15,7 +14,6 @@
(global-set-key (kbd "C-d") 'duplicate-current-line)
(global-set-key (kbd "C-l") 'goto-line)
(global-set-key (kbd "C-t") 'crear-tags) ;; Create tags shortcut
(global-set-key (kbd "C-x p") 'phpcbf)
(global-set-key (kbd "M-<up>") 'beginning-of-buffer)
(global-set-key (kbd "M-<down>") 'end-of-buffer)
(global-set-key (kbd "S-M-<down>") 'enlarge-window)
Expand All @@ -27,8 +25,6 @@
(global-set-key (kbd "S-<right>") 'windmove-right)
(global-set-key (kbd "S-<up>") 'windmove-up)

(define-key projectile-mode-map (kbd "M-p") 'projectile-command-map)
(define-key projectile-mode-map (kbd "C-c p") 'projectile-command-map)

(provide 'shortcuts)
;;; shortcuts.el ends here
3 changes: 2 additions & 1 deletion tabbar.el
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:

;; Taken from: https://amitp.blogspot.com/2018/10/emacs-prettier-tabbar.html
;; Tab Bar
(require 'tabbar)
;(require 'tabbar)
(customize-set-variable 'tabbar-background-color "gray9")
(customize-set-variable 'tabbar-separator '(0.5))
(customize-set-variable 'tabbar-use-images t)
Expand Down
102 changes: 74 additions & 28 deletions use-package.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand All @@ -7,10 +8,19 @@

(use-package adoc-mode
:mode "\\.adoc")
(use-package ag)
(use-package all-the-icons)
(use-package auto-compile)
(use-package ag
:defer t)
(use-package all-the-icons
:defer t)
(use-package auto-compile
:defer t)
;(use-package benchmark-init
; :ensure t
; :config
; ;; To disable collection of benchmark data after init is done.
; (add-hook 'after-init-hook 'benchmark-init/deactivate))
(use-package company
:defer t
:diminish "Comp"
:custom-face
(company-preview ((t (:background "gray10" :foreground "#F8F8F0"))))
Expand All @@ -23,19 +33,22 @@
(company-tooltip-mouse ((t (:background "orange red" :foreground "#000000"))))
(company-tooltip-selection ((t (:background "orange red" :foreground "#000000")))))
(use-package company-anaconda
:defer t
:init
(eval-after-load "company"
'(add-to-list 'company-backends '(company-anaconda :with company-capf)))
(add-hook 'python-mode-hook 'company-mode)
(add-hook 'python-mode-hook 'anaconda-mode))
(use-package company-php
:defer t
:init
(add-hook 'php-mode-hook
'(lambda ()
(require 'company-php)
(company-mode t)
(add-to-list 'company-backends 'company-ac-php-backend ))))
(use-package company-quickhelp
:defer t
:custom
(company-quickhelp-color-background "gray15")
(company-quickhelp-color-foreground "white smoke")
Expand All @@ -46,6 +59,7 @@
(use-package dockerfile-mode
:mode "Dockerfile\\'")
(use-package dumb-jump
:defer t
:custom
(dumb-jump-default-project "~")
(dumb-jump-force-searcher nil)
Expand Down Expand Up @@ -81,18 +95,27 @@
(flycheck-error ((t (:underline "#F92672"))))
(flycheck-color-mode-line-error-face ((t (:inherit 'flycheck-fringe-error :box t :line-width 2 :color "red" :style 'released-button))))
(flycheck-color-mode-line-warning-face ((t (:inherit 'flycheck-fringe-warning :box t :line-width 2 :color "orange" :style 'released-button)))))
(use-package flycheck-color-mode-line)
(use-package flycheck-mypy)
(use-package flycheck-pycheckers)
(use-package flymd)
(use-package geben)
(use-package flycheck-color-mode-line
:after (flycheck))
(use-package flycheck-mypy
:after (flycheck))
(use-package flycheck-pycheckers
:after (flycheck))
(use-package flymd
:after (flycheck))
(use-package gcmh)
(use-package geben
:defer t)
(use-package git-gutter-fringe)
(use-package highlight
:defer t
:custom-face
(highlight ((t (:background "black" :foreground "white")))))
(use-package highlight-parentheses
:defer t
:diminish)
(use-package highlight-indent-guides
:defer t
:init
(add-hook 'prog-mode-hook 'highlight-indent-guides-mode)
:custom
Expand All @@ -102,20 +125,22 @@
:custom-face
(linum-highlight-face ((t (:inherit default :background "#000000" :foreground "#FF6E27" :slant normal :weight bold)))))
(use-package iedit
:defer t
:custom-face
(iedit-occurrence ((t (:foreground "green yellow")))))
(use-package jquery-doc)
(use-package jquery-doc
:defer t)
(use-package js2-mode
:config
(dumb-jump-mode t)
:mode "\\.js\\'")
:config
(dumb-jump-mode t)
:mode "\\.js\\'")
(use-package json-mode
:mode "\\.json\\'")
(use-package linum
:init
(add-hook 'linum-mode-hook 'my-linum-mode-hook))
(use-package magit
:bind (("C-x g" . magit-status))
:bind (("C-x g" . magit-status))
:custom-face
(magit-branch-local ((t (:foreground "orange"))))
(magit-branch-remote ((t (:foreground "#D90F5A"))))
Expand All @@ -134,16 +159,21 @@
(add-hook 'magit-mode-hook 'my-inhibit-global-linum-mode)
(remove-hook 'server-switch-hook 'magit-commit-diff))

(use-package magit-gitflow)
(use-package magit-gitflow
:after (magit))
(use-package markdown-mode
:mode (("\\.md\\'" . markdown-mode)
:mode (("\\.md\\'" . markdown-mode)
("\\.markdown\\'" . markdown-mode)
("\\.text\\'" . markdown-mode)))

(use-package markdown-mode+)
(use-package markdown-toc)
(use-package markup-faces)
(use-package monokai-theme)
(use-package markdown-mode+
:after (markdown-mode))
(use-package markdown-toc
:after (markdown-mode))
(use-package markup-faces
:defer t)
(use-package monokai-theme
:defer t)
(use-package neotree
:bind (("<f8>" . neotree-toggle))
:custom
Expand All @@ -156,6 +186,7 @@
(neo-dir-link-face ((t (:foreground "#FF6E27"))))
(neo-root-dir-face ((t (:background "#000000" :foreground "gold")))))
(use-package pass
:defer t
:custom-face
(pass-mode-directory-face ((t (:foreground "#FF6E27" :weight bold))))
(pass-mode-entry-face ((t))))
Expand All @@ -169,9 +200,12 @@
:mode "\\.engine$"
:mode "\\.tpl.php$")
(use-package phpcbf
:bind (("C-x p" . phpcbf))
:custom
(phpcbf-standard "PSR12"))
(use-package pkg-info)
(phpcbf-standard "PSR12")
:after (php-mode))
(use-package pkg-info
:defer t)
(use-package popup)
(use-package powerline
:custom
Expand All @@ -187,9 +221,16 @@
(powerline-active2 ((t (:background "gray9" :foreground "#FF6E27")))))

(use-package projectile
:diminish "Proj")
(use-package smarty-mode)
(use-package sqlformat)
:defer 0.1
:diminish "Proj"
:bind-keymap
("M-p" . projectile-command-map)
("C-c p" . projectile-command-map))
(use-package smarty-mode
:mode "\\.tpl$")
(use-package sqlformat
:bind (("C-c <tab>" . sqlformat))
:defer t)
(use-package tabbar
:bind (("M-<left>" . tabbar-backward)
("M-<right>" . tabbar-forward))
Expand All @@ -199,8 +240,13 @@
(tabbar-use-images t)
:custom-face
(tabbar-separator ((t (:inherit tabbar-default :width normal)))))
(use-package web-mode)
(use-package yaml-mode)
(use-package yasnippet)
(use-package yasnippet-snippets)
(use-package web-mode
:defer t)
(use-package yaml-mode
:mode "\\.yml$"
:mode "\\.yaml$")
(use-package yasnippet
:defer t)
(use-package yasnippet-snippets
:defer t)
;;;
10 changes: 10 additions & 0 deletions variables.el
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
;;; -*- lexical-binding: t; -*-
;;; package --- Summary
;;; Commentary:
;;; Code:
Expand All @@ -6,6 +7,8 @@
(defvar dumb-jump-prefer-searcher)
(defvar yas-prompt-functions)
(defvar path-to-ctags)
(defvar pepe-debug-p)
(defvar pepe--file-name-handler-alist file-name-handler-alist)

(setq-default auto-save-default nil) ;; Stop creating auto #autosave# files
(setq-default auto-window-vscroll nil)
Expand Down Expand Up @@ -37,8 +40,15 @@
(setq-default whitespace-style '(face trailing tabs spaces newline empty indentation space-after-tab space-before-tab space-mark tab-mark newline-mark))
(setq-default yas-prompt-functions '(yas-dropdown-prompt yas-ido-prompt yas-completing-prompt))
(setq-default load-prefer-newer t)
(setq-default pepe-debug-p t)
;(setq projectile-project-search-path '("~/projects/" "~/work/")) ;; Set your project's direcotries copying this line in customvariables.el

;; Taker 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
gcmh-high-cons-threshold (* 16 1024 1024) ; 16mb
gcmh-verbose pepe-debug-p)

(provide 'variables)
;;; variables.el ends here

0 comments on commit c15aeee

Please sign in to comment.