1 files changed, 42 insertions, 94 deletions
diff --git a/emacs.d/init.el b/emacs.d/init.el
index 7966f4c..37094a4 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -1,32 +1,6 @@
-;; If this is not commented, Emacs will overwrite this configuration file
-;; on load time.
-;; (package-initialize)
-
 ;; Initialise the package system first of all.
-(package-initialize)
-
-(defvar fcuny-path-home (getenv "HOME")
-  "Path to the user's home directory.")
-
-(defvar fcuny-path-workspace (expand-file-name "workspace" fcuny-path-home)
-  "Path to the workspace.")
-
-(defvar fcuny-path-git-twitter (expand-file-name "git.twitter.biz" fcuny-path-workspace)
-  "Path to twitter's git repositories.")
-
-(defvar fcuny-path-git-github (expand-file-name "github.com" fcuny-path-workspace)
-  "Path to github's git repositories.")
-
-(defvar fcuny-path-svn-twitter (expand-file-name "svn.twitter.biz" fcuny-path-workspace)
-  "Path to twitter's SVN repositories.")
-
-(defvar fcuny-path-puppet-linter-svn (expand-file-name "twitter-ops/utilities/puppet/.puppet-lint.rc"
-                                                       fcuny-path-svn-twitter)
-  "Path to the linter's configuration for twitter-ops.")
-
-(defvar fcuny-path-puppet-linter-gcp (expand-file-name "gcp-puppet-manifests/.puppet-lint-rc"
-                                                       fcuny-path-git-twitter)
-  "Path to the linkter's configucation for gcp-puppet-manifests.")
+(require 'package)
+(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
 
 (defvar fcuny-path-emacs-var (expand-file-name "var" user-emacs-directory)
   "Path to some files for Emacs.")
@@ -34,78 +8,52 @@
 (defvar fcuny-path-emacs-elpa (expand-file-name "elpa" fcuny-path-emacs-var)
   "Path to elpa's local files.")
 
-(defvar fcuny-projects-ignored-dirs
-  '(".git" ".svn" "target"
-    "elpa"))
-
-(defvar fcuny-projects-ignored-files
-  '(".DS_Store"
-    "*.pyc"
-    "*.jar"
-    "*.zip" "*.tar.gz" "*.tgz" "*.gz"
-    "TAGS"))
-
 ;; where to store the packages
 (setq package-user-dir fcuny-path-emacs-elpa)
 
-(require 'package)
-(add-to-list 'package-archives '("melpa" . "http://melpa.org/packages/") t)
-
 ;; initialize it
 (package-initialize)
 
-;; we install packages using the `use-package' module
-(require 'use-package)
-
-(setq use-package-always-ensure t)
-
-;; Skip the default splash screen.
-(setq inhibit-startup-message t)
+(defun fcuny/init-load-path ()
+  "Load custom configurations."
+  (let* ((before load-path)
+         (config-dir (expand-file-name "config" user-emacs-directory)))
+    (dolist (path (append (list config-dir)))
+      (add-to-list 'load-path path)
+      (add-to-list 'Info-default-directory-list path))))
 
-(add-to-list 'load-path (expand-file-name "config" user-emacs-directory))
-(add-to-list 'load-path (expand-file-name "modules" user-emacs-directory))
+(fcuny/init-load-path)
 
-(dolist (sub (list
-              (replace-regexp-in-string "/" "-" (symbol-name system-type))
-              (symbol-name window-system)
-              (replace-regexp-in-string "\\..*" "" (system-name))))
-  (load (concat "module-" sub) t))
-
-(load "config-lib")
-(load "config-set-path")
-
-(load "module-general")
-(load "module-appareance")
-(load "module-hydra")
-(load "module-editing")
-(load "module-codestyle")
-
-(load "module-ibuffer")
-(load "module-git")
-(load "module-dired")
-(load "module-ivy")
-(load "module-project")
-(load "module-flycheck")
-(load "module-flyspell")
-(load "module-autocomplete")
-
-(load "module-make")
-(load "module-pants")
-
-(load "module-c")
-(load "module-docker")
-(load "module-go")
-(load "module-java")
-(load "module-json")
-(load "module-lisp")
-(load "module-protobuf")
-(load "module-puppet")
-(load "module-python")
-(load "module-rust")
-(load "module-scala")
-(load "module-shell")
-(load "module-thrift")
+(require 'use-package)
 
-(load "module-markdown")
-(load "module-toml")
-(load "module-yaml")
+(use-package fcuny-vars)
+(use-package fcuny-basic-settings)
+(use-package fcuny-common)
+(use-package fcuny-appearance)
+(use-package fcuny-darwin)
+
+(use-package fcuny-editor)
+(use-package fcuny-paren)
+(use-package fcuny-ibuffer)
+(use-package fcuny-dired)
+(use-package fcuny-project)
+
+(use-package fcuny-company)
+(use-package fcuny-magit)
+(use-package fcuny-pants)
+(use-package fcuny-flyspell)
+
+(use-package fcuny-elisp)
+(use-package fcuny-go)
+(use-package fcuny-python)
+(use-package fcuny-rust)
+(use-package fcuny-shell)
+(use-package fcuny-scala)
+(use-package fcuny-make)
+(use-package fcuny-puppet)
+
+(use-package fcuny-docker)
+(use-package fcuny-json)
+(use-package fcuny-thrift)
+(use-package fcuny-protobuf)
+(use-package fcuny-markdown)