From ff71f0b8e9ca371cf48e33cf797263ae4259495e Mon Sep 17 00:00:00 2001 From: Franck Cuny Date: Sun, 17 Feb 2019 16:23:35 -0800 Subject: [Emacs] Rename `common.el` to `defuns.el`. The name `defuns` make more sense since it's a collection of functions. All the custom variables are using the prefix 'fcuny/' consistently. --- emacs.d/custom/fcuny-common.el | 42 -------------------------------------- emacs.d/custom/fcuny-defuns.el | 42 ++++++++++++++++++++++++++++++++++++++ emacs.d/custom/fcuny-flycheck.el | 2 +- emacs.d/custom/fcuny-json.el | 2 +- emacs.d/custom/fcuny-navigation.el | 2 +- emacs.d/custom/fcuny-vars.el | 9 +++++--- emacs.d/init.el | 7 ++++--- 7 files changed, 55 insertions(+), 51 deletions(-) delete mode 100644 emacs.d/custom/fcuny-common.el create mode 100644 emacs.d/custom/fcuny-defuns.el (limited to 'emacs.d') diff --git a/emacs.d/custom/fcuny-common.el b/emacs.d/custom/fcuny-common.el deleted file mode 100644 index 079c042..0000000 --- a/emacs.d/custom/fcuny-common.el +++ /dev/null @@ -1,42 +0,0 @@ -(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 fcuny/remove-mysql-columns () - "Removes | from text. This is useful when I want to drop the column separator from some text coming from a mysql query." - (interactive) - (if (region-active-p) - (replace-regexp "\s?|\s?" "" nil (region-beginning) (region-end)) - (replace-regexp "\s?|\s?" ""))) - -(defun fcuny/copy-whole-buffer () - "Selects the buffer and copy it." - (interactive) - (save-excursion - (mark-whole-buffer) - (copy-region-as-kill 1 (buffer-size)))) - -(defun fcuny/check-work-machine-p () - "Returns t if this is a work machine" - (string-match "tw-mbp.*" (system-name))) - -(defun fcuny/check-source-predicate-python-p () - (and (executable-find "check.pex") - (buffer-file-name) - (string-match "src/source/.*\.py$" (buffer-file-name)))) - -(provide 'fcuny-common) diff --git a/emacs.d/custom/fcuny-defuns.el b/emacs.d/custom/fcuny-defuns.el new file mode 100644 index 0000000..872f622 --- /dev/null +++ b/emacs.d/custom/fcuny-defuns.el @@ -0,0 +1,42 @@ +(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 fcuny/remove-mysql-columns () + "Removes | from text. This is useful when I want to drop the column separator from some text coming from a mysql query." + (interactive) + (if (region-active-p) + (replace-regexp "\s?|\s?" "" nil (region-beginning) (region-end)) + (replace-regexp "\s?|\s?" ""))) + +(defun fcuny/copy-whole-buffer () + "Selects the buffer and copy it." + (interactive) + (save-excursion + (mark-whole-buffer) + (copy-region-as-kill 1 (buffer-size)))) + +(defun fcuny/check-work-machine-p () + "Returns t if this is a work machine" + (string-match "tw-mbp.*" (system-name))) + +(defun fcuny/check-source-predicate-python-p () + (and (executable-find "check.pex") + (buffer-file-name) + (string-match "src/source/.*\.py$" (buffer-file-name)))) + +(provide 'fcuny-defuns) diff --git a/emacs.d/custom/fcuny-flycheck.el b/emacs.d/custom/fcuny-flycheck.el index 4c76d09..edc6f85 100644 --- a/emacs.d/custom/fcuny-flycheck.el +++ b/emacs.d/custom/fcuny-flycheck.el @@ -1,4 +1,4 @@ -(require 'fcuny-common) +(require 'fcuny-defuns) (use-package flycheck :ensure t diff --git a/emacs.d/custom/fcuny-json.el b/emacs.d/custom/fcuny-json.el index 126ed03..9174e5b 100644 --- a/emacs.d/custom/fcuny-json.el +++ b/emacs.d/custom/fcuny-json.el @@ -1,4 +1,4 @@ -(require 'fcuny-common) +(require 'fcuny-defuns) (use-package json-mode :after (flyspell flycheck) diff --git a/emacs.d/custom/fcuny-navigation.el b/emacs.d/custom/fcuny-navigation.el index 8073a8c..bf55994 100644 --- a/emacs.d/custom/fcuny-navigation.el +++ b/emacs.d/custom/fcuny-navigation.el @@ -18,7 +18,7 @@ (use-package bookmark :custom - (bookmark-default-file (expand-file-name "bookmarks" fcuny-path-emacs-var)) + (bookmark-default-file (expand-file-name "bookmarks" fcuny/path-emacs-var)) (bookmark-save-flag 1)) (use-package counsel diff --git a/emacs.d/custom/fcuny-vars.el b/emacs.d/custom/fcuny-vars.el index d4ff49f..67b04fa 100644 --- a/emacs.d/custom/fcuny-vars.el +++ b/emacs.d/custom/fcuny-vars.el @@ -1,10 +1,13 @@ -(defvar fcuny-path-emacs-var (expand-file-name "var" user-emacs-directory) +(defvar fcuny/path-emacs-var (expand-file-name "var" user-emacs-directory) "Path to some files for Emacs.") -(defvar fcuny/custom-settings (expand-file-name "emacs-custom.el" fcuny-path-emacs-var) +(defvar fcuny/custom-settings (expand-file-name "emacs-custom.el" fcuny/path-emacs-var) "Path to emacs custom variables.") -(defvar fcuny-path-emacs-elpa (expand-file-name "elpa" fcuny-path-emacs-var) +(defvar fcuny/path-emacs-elpa (expand-file-name "elpa" fcuny/path-emacs-var) "Path to elpa's local files.") +(defvar fcuny/path-workspace (expand-file-name "workspace" (getenv "HOME")) + "Path to the workspace.") + (provide 'fcuny-vars) diff --git a/emacs.d/init.el b/emacs.d/init.el index 4f032cb..cdc8e98 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -9,7 +9,7 @@ (require 'fcuny-vars) ;; where to store the packages -(setq package-user-dir fcuny-path-emacs-elpa) +(setq package-user-dir fcuny/path-emacs-elpa) ;; initialize it (package-initialize) @@ -24,12 +24,11 @@ (require 'fcuny-settings) (require 'fcuny-ui) (require 'fcuny-hygiene) -(require 'fcuny-common) +(require 'fcuny-defuns) (require 'fcuny-navigation) (require 'fcuny-edit) (require 'fcuny-text) (require 'fcuny-git) - (require 'fcuny-flycheck) (require 'fcuny-docker) @@ -43,3 +42,5 @@ (require 'fcuny-make) (require 'fcuny-python) (require 'fcuny-shell) + +(require 'fcuny-twitter) -- cgit 1.4.1