[emacs] Rename some custom variables.

Use '-' as a separator instead of '/' in some variable's names.

3 files changed, 26 insertions, 18 deletions

diff --git a/emacs.d/config/config-env.el b/emacs.d/config/config-env.el
index 3f7bf0a..a7ea4f5 100644
--- a/emacs.d/config/config-env.el
+++ b/emacs.d/config/config-env.el
@@ -1,19 +1,24 @@
-(defvar fcuny/workspace (expand-file-name "workspace" (getenv "HOME"))
+(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-twitter-git (expand-file-name "git.twitter.biz" fcuny/workspace)
+(defvar fcuny-path-git-twitter (expand-file-name "git.twitter.biz" fcuny-path-workspace)
   "Path to twitter's git repositories.")
 
-(defvar fcuny/path-github (expand-file-name "github.com" fcuny/workspace)
+(defvar fcuny-path-git-github (expand-file-name "github.com" fcuny-path-workspace)
   "Path to github's git repositories.")
 
-(defvar fcuny/path-twitter-svn (expand-file-name "svn.twitter.biz" fcuny/workspace)
+(defvar fcuny-path-svn-twitter (expand-file-name "svn.twitter.biz" fcuny-path-workspace)
   "Path to twitter's SVN repositories.")
 
-(defvar fcuny/twitter-ops-linter (expand-file-name "twitter-ops/utilities/puppet/.puppet-lint.rc" fcuny/path-twitter-svn)
+(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/twitter-gcp-linter (expand-file-name "gcp-puppet-manifests/.puppet-lint-rc" fcuny/path-twitter-git)
+(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")
 
 (provide 'config-env)
diff --git a/emacs.d/modules/module-flyspell.el b/emacs.d/modules/module-flyspell.el
index ade45ee..e95ab1e 100644
--- a/emacs.d/modules/module-flyspell.el
+++ b/emacs.d/modules/module-flyspell.el
@@ -1,17 +1,20 @@
 (require 'config-package)
 
-;; check the spelling
+(use-package ispell
+  :config
+  (setq ispell-program-name "aspell"
+        ispell-list-command "--list"))
+
+(use-package flyspell-correct-ivy
+  :bind
+  (:map flyspell-mode-map
+        ("C-;" . flyspell-correct-previous-word-generic)))
+
 (use-package flyspell
+  :commands (spell-checking/change-dictionary)
   :init
-  (use-package ispell
-    :ensure t
-    :config
-    (setq ispell-program-name "aspell"
-          ispell-list-command "--list"))
-  (use-package flyspell-popup
-    :ensure t
-    :bind ("C-:" . flyspell-popup-correct))
   :config
-  (add-hook 'text-mode-hook 'flyspell-mode))
+  (add-hook 'text-mode-hook 'flyspell-mode)
+  (add-hook 'prog-mode-hook 'flyspell-prog-mode))
 
 (provide 'module-flyspell)
diff --git a/emacs.d/modules/module-pants.el b/emacs.d/modules/module-pants.el
index 5a7abbb..f1027bb 100644
--- a/emacs.d/modules/module-pants.el
+++ b/emacs.d/modules/module-pants.el
@@ -1,11 +1,11 @@
 (require 'config-package)
 
 (use-package pants
-  :load-path (lambda () (expand-file-name  "github.com/fcuny/pants.el/" fcuny/workspace))
+  :load-path (lambda () (expand-file-name  "github.com/fcuny/pants.el/" fcuny-path-workspace))
 
   :config
   (setq pants-completion-system 'ivy
-        pants-source-tree-root (expand-file-name "git.twitter.biz/source" fcuny/workspace)
+        pants-source-tree-root (expand-file-name "git.twitter.biz/source" fcuny-path-workspace)
         pants-bury-compilation-buffer t
         pants-extra-args "-q")