9 files changed, 35 insertions, 29 deletions
diff --git a/emacs/custom/fcuny-conf.el b/emacs/custom/my-conf.el
index 7258d9f..3cb7234 100644
--- a/emacs/custom/fcuny-conf.el
+++ b/emacs/custom/my-conf.el
@@ -1,13 +1,18 @@
-;;; fcuny-conf.el -- setup configuration modes
+;;; my-conf.el --- Configure modes related to configuration files -*- lexical-binding: t -*-
+
 ;;; Commentary:
+;; Provides configuration for modes that are related to configuration
+;; files.
+
 ;;; Code:
 
-(require 'fcuny-defuns)
+;; (require 'fcuny-defuns)
 (require 'use-package)
 
 (use-package dockerfile-mode
   :ensure t
-  :mode "Dockerfile[a-zA-Z.-]*\\'")
+  :custom
+  (dockerfile-use-sudo t))
 
 (use-package yaml-mode
   :ensure t)
@@ -44,5 +49,5 @@
 (use-package chef-mode
   :ensure t)
 
-(provide 'fcuny-conf)
-;;; fcuny-conf.el ends here
+(provide 'my-conf)
+;;; my-conf.el ends here
diff --git a/emacs/custom/fcuny-defuns.el b/emacs/custom/my-defuns.el
index 0c358ce..dc035c4 100644
--- a/emacs/custom/fcuny-defuns.el
+++ b/emacs/custom/my-defuns.el
@@ -37,4 +37,4 @@
       (concat "[[" url "][" title "]]"))))
 
 
-(provide 'fcuny-defuns)
+(provide 'my-defuns)
diff --git a/emacs/custom/fcuny-eshell.el b/emacs/custom/my-eshell.el
index 29495ef..a6b2cfc 100644
--- a/emacs/custom/fcuny-eshell.el
+++ b/emacs/custom/my-eshell.el
@@ -1,8 +1,9 @@
-;;; fcuny-eshell.el --- Configure eshell
+;;; my-eshell.el --- Configure eshell
 ;;; Commentary:
 ;;; Code:
+(eval-when-compile
+  (require 'use-package)  )
 
-(require 'use-package)
 (require 'magit)
 
 (require 'eshell)
@@ -227,5 +228,5 @@ append to it, while separating multiple outputs with
   :ensure t
   :hook (eshell-mode . eshell-bookmark-setup))
 
-(provide 'fcuny-eshell)
-;;; fcuny-eshell.el ends here
+(provide 'my-eshell)
+;;; my-eshell.el ends here
diff --git a/emacs/custom/fcuny-notmuch.el b/emacs/custom/my-notmuch.el
index 3334733..b009f9e 100644
--- a/emacs/custom/fcuny-notmuch.el
+++ b/emacs/custom/my-notmuch.el
@@ -1,4 +1,4 @@
-;;; fcuny-notmuch.el --- Configures notmuch
+;;; my-notmuch.el --- Configures notmuch
 ;;; Commentary:
 ;;; Code:
 
@@ -16,5 +16,5 @@
   (notmuch-show-relative-dates t)
   (notmuch-archive-tags '("-inbox" "-unread")))
 
-(provide 'fcuny-notmuch)
-;;; fcuny-notmuch.el ends here
+(provide 'my-notmuch)
+;;; my-notmuch.el ends here
diff --git a/emacs/custom/fcuny-prog.el b/emacs/custom/my-prog.el
index 2c4635e..ce41935 100644
--- a/emacs/custom/fcuny-prog.el
+++ b/emacs/custom/my-prog.el
@@ -1,9 +1,9 @@
-;;; fcuny-prog.el --- Configures emacs for various programming languages
+;;; my-prog.el --- Configures emacs for various programming languages
 ;;; Commentary:
 
 ;;; Code:
 
-(require 'fcuny-vars)
+;; (require 'fcuny-vars)
 (require 'use-package)
 
 (use-package man
@@ -127,5 +127,5 @@
   :mode "\\.nix\\'"
   :hook ((before-save . nix-format-before-save)))
 
-(provide 'fcuny-prog)
-;;; fcuny-prog.el ends here
+(provide 'my-prog)
+;;; my-prog.el ends here
diff --git a/emacs/custom/fcuny-tramp.el b/emacs/custom/my-tramp.el
index 68bacf7..9854dab 100644
--- a/emacs/custom/fcuny-tramp.el
+++ b/emacs/custom/my-tramp.el
@@ -1,4 +1,4 @@
-;;; fcuny-tramp.el --- Configure tramp
+;;; my-tramp.el --- Configure tramp
 ;;; Commentary:
 ;;; Code:
 
@@ -11,5 +11,5 @@
   (tramp-ssh-controlmaster-options
    "-o ControlMaster=auto -o ControlPath='tramp.%%C'"))
 
-(provide 'fcuny-tramp)
-;;; fcuny-tramp.el ends here
+(provide 'my-tramp)
+;;; my-tramp.el ends here
diff --git a/emacs/custom/my-ui.el b/emacs/custom/my-ui.el
index a0473e6..32bf802 100644
--- a/emacs/custom/my-ui.el
+++ b/emacs/custom/my-ui.el
@@ -1,4 +1,4 @@
-;;;my-ui -- configure UI elements
+;;; my-ui.el --- configure UI elements
 ;;; Commentary:
 
 ;;; Code:
diff --git a/emacs/custom/fcuny-vars.el b/emacs/custom/my-vars.el
index 632e4c5..03b9fa0 100644
--- a/emacs/custom/fcuny-vars.el
+++ b/emacs/custom/my-vars.el
@@ -1,4 +1,4 @@
-;;; fcuny-vars.el --- Set a number of variables
+;;; my-vars.el --- Set a number of variables
 ;;; Commentary:
 ;;; Code:
 
@@ -22,5 +22,5 @@
       (expand-file-name "~/workspace/notebooks/")
     (expand-file-name "~/documents/notes/")))
 
-(provide 'fcuny-vars)
-;;; fcuny-vars.el ends here
+(provide 'my-vars)
+;;; my-vars.el ends here
diff --git a/emacs/init.el b/emacs/init.el
index 9c7d13e..e7a6db7 100644
--- a/emacs/init.el
+++ b/emacs/init.el
@@ -45,11 +45,11 @@
 (require 'my-text (expand-file-name "custom/my-text" user-emacs-directory))
 (require 'my-git (expand-file-name "custom/my-git" user-emacs-directory))
 (require 'my-org (expand-file-name "custom/my-org" user-emacs-directory))
-(require 'fcuny-conf (expand-file-name "custom/fcuny-conf" user-emacs-directory))
-(require 'fcuny-prog (expand-file-name "custom/fcuny-prog" user-emacs-directory))
-(require 'fcuny-eshell (expand-file-name "custom/fcuny-eshell" user-emacs-directory))
-(require 'fcuny-tramp (expand-file-name "custom/fcuny-tramp" user-emacs-directory))
-(require 'fcuny-notmuch (expand-file-name "custom/fcuny-notmuch" user-emacs-directory))
+(require 'my-conf (expand-file-name "custom/my-conf" user-emacs-directory))
+(require 'my-prog (expand-file-name "custom/my-prog" user-emacs-directory))
+(require 'my-eshell (expand-file-name "custom/my-eshell" user-emacs-directory))
+(require 'my-tramp (expand-file-name "custom/my-tramp" user-emacs-directory))
+(require 'my-notmuch (expand-file-name "custom/my-notmuch" user-emacs-directory))
 
 ;; ;; (require 'fcuny-defuns)
 ;; ;; (require 'fcuny-commands)