diff options
| -rw-r--r-- | emacs.d/config/fcuny-appearance.el | 22 | ||||
| -rw-r--r-- | emacs.d/config/fcuny-base.el (renamed from emacs.d/config/fcuny-vars.el) | 30 | ||||
| -rw-r--r-- | emacs.d/config/fcuny-basic-settings.el | 15 | ||||
| -rw-r--r-- | emacs.d/config/fcuny-common.el | 29 | ||||
| -rw-r--r-- | emacs.d/init.el | 4 |
5 files changed, 45 insertions, 55 deletions
diff --git a/emacs.d/config/fcuny-appearance.el b/emacs.d/config/fcuny-appearance.el deleted file mode 100644 index 5c65374..0000000 --- a/emacs.d/config/fcuny-appearance.el +++ /dev/null @@ -1,22 +0,0 @@ -(eval-when-compile - (require 'use-package)) - -;; Set default font. -(set-face-attribute 'default nil :height 130 :weight 'normal :width 'normal) - -(use-package tool-bar - :config - (tool-bar-mode -1)) - -(use-package scroll-bar - :config - (scroll-bar-mode -1)) - -(use-package frame - :bind ("<s-return>" . toggle-frame-fullscreen) - :config - (blink-cursor-mode -1) - (when (eq system-type 'darwin) - (setq ns-use-native-fullscreen nil))) - -(provide 'fcuny-appearance) diff --git a/emacs.d/config/fcuny-vars.el b/emacs.d/config/fcuny-base.el index aebaadf..bca68c8 100644 --- a/emacs.d/config/fcuny-vars.el +++ b/emacs.d/config/fcuny-base.el @@ -38,4 +38,32 @@ (defvar fcuny-custom-settings (expand-file-name "emacs-custom.el" fcuny-path-emacs-var) "Path to emacs custom variables.") -(provide 'fcuny-vars) +(defun fcuny-rename-this-buffer-and-file () + "Renames current buffer and file it is visiting." + (interactive) + (let ((name (buffer-name)) + (filename (buffer-file-name)) + (read-file-name-function 'read-file-name-default)) + (if (not (and filename (file-exists-p filename))) + (error "Buffer '%s' is not visiting a file!" name) + (let ((new-name (read-file-name "New name: " filename))) + (cond ((get-buffer new-name) + (error "A buffer named '%s' already exists!" new-name)) + (t + (rename-file filename new-name 1) + (rename-buffer new-name) + (set-visited-file-name new-name) + (set-buffer-modified-p nil) + (message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name)))))))) + +(defun fc/check-work-machine-p () + "Returns t if this is a work machine" + (string-match "tw-mbp.*" (system-name))) + +(defun fc/check-source-p () + "Finds if the current python file is in the `source' repository." + (and (executable-find "check.pex") + (buffer-file-name) + (string-match "src/source/.*\.py$" (buffer-file-name)))) + +(provide 'fcuny-base) diff --git a/emacs.d/config/fcuny-basic-settings.el b/emacs.d/config/fcuny-basic-settings.el index fe05241..a3469a8 100644 --- a/emacs.d/config/fcuny-basic-settings.el +++ b/emacs.d/config/fcuny-basic-settings.el @@ -35,4 +35,19 @@ ;; Remap join-line to M-j where it's easier to get to. (global-set-key (kbd "M-j") 'join-line) +(use-package tool-bar + :config + (tool-bar-mode -1)) + +(use-package scroll-bar + :config + (scroll-bar-mode -1)) + +(use-package frame + :bind ("<s-return>" . toggle-frame-fullscreen) + :config + (blink-cursor-mode -1) + (when (eq system-type 'darwin) + (setq ns-use-native-fullscreen nil))) + (provide 'fcuny-basic-settings) diff --git a/emacs.d/config/fcuny-common.el b/emacs.d/config/fcuny-common.el deleted file mode 100644 index 61a2829..0000000 --- a/emacs.d/config/fcuny-common.el +++ /dev/null @@ -1,29 +0,0 @@ -(defun fc/rename-this-buffer-and-file () - "Renames current buffer and file it is visiting." - (interactive) - (let ((name (buffer-name)) - (filename (buffer-file-name)) - (read-file-name-function 'read-file-name-default)) - (if (not (and filename (file-exists-p filename))) - (error "Buffer '%s' is not visiting a file!" name) - (let ((new-name (read-file-name "New name: " filename))) - (cond ((get-buffer new-name) - (error "A buffer named '%s' already exists!" new-name)) - (t - (rename-file filename new-name 1) - (rename-buffer new-name) - (set-visited-file-name new-name) - (set-buffer-modified-p nil) - (message "File '%s' successfully renamed to '%s'" name (file-name-nondirectory new-name)))))))) - -(defun fc/check-source-p () - "Finds if the current python file is in the `source' repository." - (and (executable-find "check.pex") - (buffer-file-name) - (string-match "src/source/.*\.py$" (buffer-file-name)))) - -(defun fc/check-work-machine-p () - "Returns t if this is a work machine" - (string-match "tw-mbp.*" (system-name))) - -(provide 'fcuny-common) diff --git a/emacs.d/init.el b/emacs.d/init.el index dd233a1..8ac9baf 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -26,10 +26,8 @@ (require 'use-package) -(use-package fcuny-vars) +(use-package fcuny-base) (use-package fcuny-basic-settings) -(use-package fcuny-common) -(use-package fcuny-appearance) (use-package fcuny-darwin :if (memq window-system '(mac ns))) |