summary refs log tree commit diff
diff options
context:
space:
mode:
-rw-r--r--emacs.d/custom/fcuny-prog.el5
-rw-r--r--emacs.d/custom/fcuny-puppet.el12
-rw-r--r--emacs.d/init.el2
3 files changed, 5 insertions, 14 deletions
diff --git a/emacs.d/custom/fcuny-prog.el b/emacs.d/custom/fcuny-prog.el
index 182e9e6..76b65a9 100644
--- a/emacs.d/custom/fcuny-prog.el
+++ b/emacs.d/custom/fcuny-prog.el
@@ -87,4 +87,9 @@
   (("C-c C-e" . eval-buffer)
    ("C-c C-r" . eval-region)))
 
+(use-package puppet-mode
+  :ensure t
+  :bind (:map puppet-mode-map
+              ("C-c |" . puppet-align-block)))
+
 (provide 'fcuny-prog)
diff --git a/emacs.d/custom/fcuny-puppet.el b/emacs.d/custom/fcuny-puppet.el
deleted file mode 100644
index a189bf8..0000000
--- a/emacs.d/custom/fcuny-puppet.el
+++ /dev/null
@@ -1,12 +0,0 @@
-(use-package puppet-mode
-  :ensure t
-  :bind (:map puppet-mode-map
-              ("C-c |" . puppet-align-block))
-  :custom
-  (flycheck-puppet-lint-executable "~/workspace/rcs/scripts/puppet-lint.sh")
-  (flycheck-puppet-parser-executable "~/workspace/rcs/scripts/puppet-parser.sh")
-
-  (puppet-lint-command (concat "~/workspace/rcs/scripts/puppet-lint.sh"
-                               "--log-format \"%{path}:%{line}: %{kind}: %{message} (%{check})\"")))
-
-(provide 'fcuny-puppet)
diff --git a/emacs.d/init.el b/emacs.d/init.el
index a751421..672306d 100644
--- a/emacs.d/init.el
+++ b/emacs.d/init.el
@@ -39,7 +39,5 @@
 (require 'fcuny-conf)
 (require 'fcuny-flycheck)
 (require 'fcuny-prog)
-(require 'fcuny-puppet)
 (require 'fcuny-eshell)
-(require 'fcuny-elfeed)
 (require 'fcuny-twitter)