Browse Source

Merge branch 'master' of github.com:leothelocust/.emacs.d

master
Levi Olson 5 years ago
parent
commit
793f68ea1a
6 changed files with 67 additions and 27 deletions
  1. +33
    -21
      init.el
  2. +34
    -6
      init.org
  3. BIN
      public/emacs-logo-128.png
  4. BIN
      public/emacs-logo-256.png
  5. BIN
      public/emacs-logo-512.png
  6. BIN
      public/emacs-logo.png

+ 33
- 21
init.el View File

@ -15,6 +15,7 @@
(add-hook 'after-save-hook 'tangle-init)
(require 'package)
(package-initialize)
(defvar my-packages
'(all-the-icons
@ -27,6 +28,7 @@
counsel
counsel-projectile
dash-at-point
dashboard
diminish
dockerfile-mode
doom-modeline
@ -36,6 +38,7 @@
elfeed
elfeed-org
elpy
emmet-mode
expand-region
fic-mode
flycheck
@ -53,6 +56,7 @@
multiple-cursors
projectile
rainbow-delimiters
rust-mode
shrink-path
tide
typescript-mode
@ -71,10 +75,6 @@
(when (not (package-installed-p p))
(package-install p)))
(require 'edit-server)
(edit-server-start)
(require 'better-defaults)
;; Instead of the annoying giant warning icon, just flash the modeline.
@ -128,9 +128,33 @@
(put 'upcase-region 'disabled nil)
(put 'downcase-region 'disabled nil)
(setq inhibit-splash-screen t
fancy-splash-image "~/.emacs.d/public/emacs-logo.png"
fancy-splash-image-file "~/.emacs.d/public/emacs-logo.png")
(require 'dashboard)
(dashboard-setup-startup-hook)
;; Set the title
(setq dashboard-banner-logo-title "Let's begin...")
;; Set the banner
(setq dashboard-startup-banner "~/.emacs.d/public/emacs-logo-512.png")
;; Value can be
;; 'official which displays the official emacs logo
;; 'logo which displays an alternative emacs logo
;; 1, 2 or 3 which displays one of the text banners
;; "path/to/your/image.png" which displays whatever image you would prefer
;; Content is not centered by default. To center, set
(setq dashboard-center-content t)
;; To disable shortcut "jump" indicators for each section, set
(setq dashboard-show-shortcuts t)
(setq show-week-agenda-p t)
(setq dashboard-items '((recents . 5)
(bookmarks . 5)
(projects . 5)
(agenda . 5)
(registers . 5)))
(defvar backup-dir (expand-file-name "~/.emacs.d/backup/"))
(defvar autosave-dir (expand-file-name "~/.emacs.d/autosave/"))
@ -1417,8 +1441,8 @@ ARGS may be amongst :timeout, :icon, :urgency, :app and :category."
"A mode that activates custom-bindings."
t nil custom-bindings)
(cond ((member "PragmataPro" (font-family-list))
(set-face-attribute 'default nil :font "PragmataPro-14")))
(cond ((member "PragmataPro Mono Liga" (font-family-list))
(set-face-attribute 'default nil :font "PragmataPro Mono Liga-13")))
(require 'doom-modeline)
(doom-modeline-mode 1)
@ -1487,15 +1511,3 @@ ARGS may be amongst :timeout, :icon, :urgency, :app and :category."
;; Whether display mu4e notifications or not. Requires `mu4e-alert' package.
(setq doom-modeline-mu4e t)
(custom-set-variables
;; custom-set-variables was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
'(magit-log-section-arguments (quote ("--graph" "--color" "--decorate" "-n256"))))
(custom-set-faces
;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful.
;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right.
)

+ 34
- 6
init.org View File

@ -44,6 +44,7 @@
** Packages
#+BEGIN_SRC emacs-lisp :results silent
(require 'package)
(package-initialize)
(defvar my-packages
'(all-the-icons
@ -56,6 +57,7 @@
counsel
counsel-projectile
dash-at-point
dashboard
diminish
dockerfile-mode
doom-modeline
@ -65,6 +67,7 @@
elfeed
elfeed-org
elpy
emmet-mode
expand-region
fic-mode
flycheck
@ -82,6 +85,7 @@
multiple-cursors
projectile
rainbow-delimiters
rust-mode
shrink-path
tide
typescript-mode
@ -101,7 +105,7 @@
(package-install p)))
#+END_SRC
** Server
#+BEGIN_SRC emacs-lisp :results silent
#+BEGIN_SRC emacs-lisp :results silent :tangle no
(require 'edit-server)
(edit-server-start)
@ -165,9 +169,33 @@
#+END_SRC
** Splash Screen
#+BEGIN_SRC emacs-lisp :results silent
(setq inhibit-splash-screen t
fancy-splash-image "~/.emacs.d/public/emacs-logo.png"
fancy-splash-image-file "~/.emacs.d/public/emacs-logo.png")
(require 'dashboard)
(dashboard-setup-startup-hook)
;; Set the title
(setq dashboard-banner-logo-title "Let's begin...")
;; Set the banner
(setq dashboard-startup-banner "~/.emacs.d/public/emacs-logo-512.png")
;; Value can be
;; 'official which displays the official emacs logo
;; 'logo which displays an alternative emacs logo
;; 1, 2 or 3 which displays one of the text banners
;; "path/to/your/image.png" which displays whatever image you would prefer
;; Content is not centered by default. To center, set
(setq dashboard-center-content t)
;; To disable shortcut "jump" indicators for each section, set
(setq dashboard-show-shortcuts t)
(setq show-week-agenda-p t)
(setq dashboard-items '((recents . 5)
(bookmarks . 5)
(projects . 5)
(agenda . 5)
(registers . 5)))
#+END_SRC
** Basic Customization
#+BEGIN_SRC emacs-lisp :results silent
@ -1548,8 +1576,8 @@
** UI
#+BEGIN_SRC emacs-lisp :results silent
(cond ((member "PragmataPro" (font-family-list))
(set-face-attribute 'default nil :font "PragmataPro-14")))
(cond ((member "PragmataPro Mono Liga" (font-family-list))
(set-face-attribute 'default nil :font "PragmataPro Mono Liga-13")))
#+END_SRC
*** Doom Modeline

BIN
public/emacs-logo-128.png View File

Before After
Width: 128  |  Height: 128  |  Size: 21 KiB

BIN
public/emacs-logo-256.png View File

Before After
Width: 256  |  Height: 256  |  Size: 40 KiB

BIN
public/emacs-logo-512.png View File

Before After
Width: 512  |  Height: 512  |  Size: 92 KiB

BIN
public/emacs-logo.png View File

Before After
Width: 1200  |  Height: 1200  |  Size: 189 KiB Width: 1150  |  Height: 1150  |  Size: 180 KiB

Loading…
Cancel
Save