emenel/doomemacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

Clean up init files

Browse source
This commit is contained in:
Henrik Lissner 2015-10-25 00:39:54 -04:00
parent f63d831575
commit accd943e87
2 changed files with 90 additions and 83 deletions
Download patch file Download diff file Expand all files Collapse all files

37
init-load-path.el
View file

@ -1,19 +1,22 @@
;;; init-load-path.el ;;; init-load-path.el
(fset '! 'eval-when-compile) (setq gc-cons-threshold 84857600)
(defconst narf-emacs-dir user-emacs-directory) (eval-and-compile
(defconst narf-core-dir (concat narf-emacs-dir "core/")) (defconst narf-emacs-dir user-emacs-directory)
(defconst narf-modules-dir (concat narf-emacs-dir "modules/")) (defconst narf-core-dir (concat narf-emacs-dir "core/"))
(defconst narf-contrib-dir (concat narf-emacs-dir "contrib/")) (defconst narf-modules-dir (concat narf-emacs-dir "modules/"))
(defconst narf-private-dir (concat narf-emacs-dir "private/")) (defconst narf-contrib-dir (concat narf-emacs-dir "contrib/"))
(defconst narf-elpa-dir (concat narf-emacs-dir ".cask/" emacs-version "/elpa/")) (defconst narf-private-dir (concat narf-emacs-dir "private/"))
(defconst narf-temp-dir (concat narf-private-dir "cache/" (system-name) "/")) (defconst narf-elpa-dir (concat narf-emacs-dir ".cask/" emacs-version "/elpa/"))
(defconst narf-script-dir (concat narf-emacs-dir "scripts/")) (defconst narf-temp-dir (concat narf-private-dir "cache/" (system-name) "/"))
(defconst narf-snippet-dirs (list (concat narf-private-dir "snippets/") (defconst narf-script-dir (concat narf-emacs-dir "scripts/"))
(concat narf-private-dir "templates/"))) (defconst narf-snippet-dirs (list (concat narf-private-dir "snippets/")
(concat narf-private-dir "templates/"))))
(! (defun --subdirs (path) (eval-when-compile
(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/cask")
(defun --subdirs (path)
(let ((result '()) (let ((result '())
(paths (ignore-errors (directory-files path t "^[^.]" t)))) (paths (ignore-errors (directory-files path t "^[^.]" t))))
(dolist (file paths) (dolist (file paths)
@ -23,10 +26,13 @@
;; Scan various folders to populate the load-dirs ;; Scan various folders to populate the load-dirs
(setq custom-theme-load-path (setq custom-theme-load-path
(! (append (--subdirs (concat narf-private-dir "themes/")) (eval-when-compile
(append (--subdirs (concat narf-private-dir "themes/"))
custom-theme-load-path))) custom-theme-load-path)))
(setq load-path (setq load-path
(! (require 'cask) (eval-when-compile
(require 'cask)
(cask-initialize) (cask-initialize)
(setq load-path (append (list narf-core-dir narf-contrib-dir narf-modules-dir narf-private-dir) (setq load-path (append (list narf-core-dir narf-contrib-dir narf-modules-dir narf-private-dir)
(list (concat narf-core-dir "lib")) (list (concat narf-core-dir "lib"))
@ -38,4 +44,7 @@
(defconst IS-LINUX (eq system-type 'gnu/linux)) (defconst IS-LINUX (eq system-type 'gnu/linux))
(defconst IS-WINDOWS (eq system-type 'windows-nt)) (defconst IS-WINDOWS (eq system-type 'windows-nt))
(when (file-exists-p "~/.emacs.local.el")
(load "~/.emacs.local.el"))
;;; init-load-path.el ends here ;;; init-load-path.el ends here

28
init.el
View file

@ -40,22 +40,19 @@
;; ;;
;;; License: GPLv3 ;;; License: GPLv3
(defconst narf-debug-mode nil) (defconst narf-theme 'narf-dark)
(setq gc-cons-threshold 84857600) ; avoid garbage collection (defconst narf-default-font (font-spec :family "DejaVu Sans Mono" :size 12))
(setq file-name-handler-alist nil) ; premature optimization weee! (defconst narf-big-font (font-spec :family "Ubuntu Mono" :size 18))
(scroll-bar-mode -1) ; no scrollbar (scroll-bar-mode -1) ; no scrollbar
(tool-bar-mode -1) ; no toolbar (tool-bar-mode -1) ; no toolbar
(menu-bar-mode -1) ; no menubar
(defconst narf-default-font (font-spec :family "terminus (ttf)" :size 12 :antialias nil)) ;; prematurely optimize for faster startup
(defconst narf-big-font (font-spec :family "Ubuntu Mono" :size 18 :antialias t)) (let (file-name-handler-alist)
(load (concat user-emacs-directory "init-load-path.el")) (load (concat user-emacs-directory "init-load-path.el"))
(load-theme (if window-system 'narf-dark 'wombat) t) (load-theme narf-theme t)
(set-frame-parameter nil 'fullscreen 'fullboth) (mapc 'require
(mapc 'require
`(core ; core/core.el `(core ; core/core.el
,(cond (IS-MAC 'core-os-osx) ,(cond (IS-MAC 'core-os-osx)
(IS-LINUX 'core-os-linux) (IS-LINUX 'core-os-linux)
@ -77,6 +74,7 @@
module-cc ; c/c++/obj-c madness module-cc ; c/c++/obj-c madness
;; module-crystal ; ruby at the speed of c ;; module-crystal ; ruby at the speed of c
module-csharp ; unity, .NET, and mono shenanigans module-csharp ; unity, .NET, and mono shenanigans
module-collab ; wonewy, I'm so wonewy~
module-data ; dbs 'n data formats module-data ; dbs 'n data formats
module-elisp ; drowning in parentheses module-elisp ; drowning in parentheses
module-eshell ; eshell (on windows) module-eshell ; eshell (on windows)
@ -87,20 +85,20 @@
module-lua ; one-based indices? one-based indices. module-lua ; one-based indices? one-based indices.
module-markdown ; markdown module-markdown ; markdown
module-org ; for fearless [organized] leader module-org ; for fearless [organized] leader
module-plantuml ; to help show how right I am
module-php ; making php less painful to work with module-php ; making php less painful to work with
module-python ; beautiful is better than ugly module-python ; beautiful is better than ugly
module-regex ; /^[^\s](meaning)[^\n]*/ module-regex ; /^[^\s](meaning)[^\n]*/
module-ruby ; <3 module-ruby ; <3
module-rust ; Fe2O3 module-rust ; Fe2O3
module-sh ; she sells Z-shells by the C shore module-sh ; she sells Z-shells by the C XOR
module-swift ; yay, emoji variables! module-swift ; yay, emoji variables!
module-vim ; the confessional module-vim ; my mistress
module-web ; for the 2.0'er module-web ; for the 2.0'er
my-bindings my-bindings
my-commands my-commands
)) ))
(narf-init))
(narf-init)
;;; I think so Brain... ;;; I think so Brain...