diff options
| -rw-r--r-- | emacs.d/config/config-env.el | 41 | ||||
| -rw-r--r-- | emacs.d/config/config-package.el | 22 | ||||
| -rw-r--r-- | emacs.d/init.el | 57 |
3 files changed, 54 insertions, 66 deletions
diff --git a/emacs.d/config/config-env.el b/emacs.d/config/config-env.el deleted file mode 100644 index 328914e..0000000 --- a/emacs.d/config/config-env.el +++ /dev/null @@ -1,41 +0,0 @@ -(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.") - -(defvar fcuny-path-emacs-var (expand-file-name "var" user-emacs-directory) - "Path to some files for Emacs.") - -(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")) - -(provide 'config-env) diff --git a/emacs.d/config/config-package.el b/emacs.d/config/config-package.el deleted file mode 100644 index 1b7c6f0..0000000 --- a/emacs.d/config/config-package.el +++ /dev/null @@ -1,22 +0,0 @@ -;; 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) - -;; paradox is a better interface -(when (not (package-installed-p 'paradox)) - (package-install 'paradox)) - -(setq paradox-github-token t) - -(paradox-require 'use-package) - -(require 'use-package) - -(setq use-package-always-ensure t) - -(provide 'config-package) diff --git a/emacs.d/init.el b/emacs.d/init.el index 6714294..7966f4c 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -5,6 +5,60 @@ ;; 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.") + +(defvar fcuny-path-emacs-var (expand-file-name "var" user-emacs-directory) + "Path to some files for Emacs.") + +(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) @@ -17,10 +71,7 @@ (replace-regexp-in-string "\\..*" "" (system-name)))) (load (concat "module-" sub) t)) - -(load "config-env") (load "config-lib") -(load "config-package") (load "config-set-path") (load "module-general") |