From fd390fac33304615c591f1e2e6deea35d43098ac Mon Sep 17 00:00:00 2001 From: Jim Menard Date: Mon, 17 Nov 2014 16:03:56 -0500 Subject: [PATCH] removed unused files, cleanup --- bootstrap-init.el | 4 +- bootstrap/.gitignore | 1 - bootstrap/nrelate/server/after.el | 12 ----- bootstrap/nrelate/server/before.el | 31 ----------- bootstrap/nrelate/server/dot_emacs | 4 -- bootstrap/nrelate/widget/after.el | 84 ------------------------------ bootstrap/nrelate/widget/before.el | 29 ----------- bootstrap/nrelate/widget/dot_emacs | 4 -- emacs.el | 2 +- 9 files changed, 2 insertions(+), 169 deletions(-) delete mode 100644 bootstrap/.gitignore delete mode 100644 bootstrap/nrelate/server/after.el delete mode 100644 bootstrap/nrelate/server/before.el delete mode 100644 bootstrap/nrelate/server/dot_emacs delete mode 100644 bootstrap/nrelate/widget/after.el delete mode 100644 bootstrap/nrelate/widget/before.el delete mode 100644 bootstrap/nrelate/widget/dot_emacs diff --git a/bootstrap-init.el b/bootstrap-init.el index 33df065e..e4d257fa 100644 --- a/bootstrap-init.el +++ b/bootstrap-init.el @@ -31,6 +31,4 @@ this function." (add-to-list 'load-path *my-emacs-lib-dir* t) ; add to end of load path (load-init-if-exists domain machine "before") (load-library "emacs") - (load-init-if-exists domain machine "after") - (setq bookmark-default-file - (bootstrap-file domain machine "emacs.bmk"))) + (load-init-if-exists domain machine "after")) diff --git a/bootstrap/.gitignore b/bootstrap/.gitignore deleted file mode 100644 index 3469e674..00000000 --- a/bootstrap/.gitignore +++ /dev/null @@ -1 +0,0 @@ -emacs.bmk diff --git a/bootstrap/nrelate/server/after.el b/bootstrap/nrelate/server/after.el deleted file mode 100644 index b277a73f..00000000 --- a/bootstrap/nrelate/server/after.el +++ /dev/null @@ -1,12 +0,0 @@ -(setq sql-user "vulcan") -(setq sql-server "10.10.10.17") -(setq sql-database "linksDBProd") - -(setq dired-use-ls-dired nil) -(add-hook 'tramp-mode-hook - (lambda () - (add-to-list 'tramp-default-user-alist '("ssh\\|scp" "10\\.10\\.*" "vulcan")))) -(setq sql-sqlite-program "sqlite3") - -(add-to-list 'auto-mode-alist '("\\.\\(md\\|markdown\\)$" . markdown-mode)) -(setq markdown-command "multimarkdown") diff --git a/bootstrap/nrelate/server/before.el b/bootstrap/nrelate/server/before.el deleted file mode 100644 index e25c7754..00000000 --- a/bootstrap/nrelate/server/before.el +++ /dev/null @@ -1,31 +0,0 @@ -(defvar *my-pim-dir* "~/jimm/pim/") - -(setq user-emacs-directory "~/jimm/.emacs.d/") -(setq bookmark-default-file "~/jimm/.emacs.d/bookmarks") -(setq eshell-directory-name "~/jimm/.emacs.d/eshell/") - -(setq ns-command-modifier 'meta) ; define Command as Meta key -(setq ns-option-modifier "none") ; unbind option key - -; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5683#19 -(when (fboundp 'ns-list-colors) - (setq x-colors (ns-list-colors))) ; fix build bug in 23.4, also in 24.1 - -; Smoother mouse wheel scrolling -; http://www.reddit.com/r/programming/comments/95uv7/emacs_231_has_been_released/c0bj6zp -(setq mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control))))) - -(when window-system - (defvar *basic-frame-alist* '((background-color . "ghost white") - (cursor-color . "orange") - (tool-bar-mode . nil) - (font . "Monaco 13"))) - (setq initial-frame-alist - (append *basic-frame-alist* '((height . 58) (top . 0) (left . 0)))) - (setq default-frame-alist *basic-frame-alist*) - (set-face-attribute 'mode-line nil :foreground "yellow" :background "black")) - -(add-to-list 'load-path "/usr/share/emacs/22.1/lisp" t) -(add-to-list 'load-path "/usr/share/emacs/22.1/site-lisp" t) - -(setq-default indent-tabs-mode nil) diff --git a/bootstrap/nrelate/server/dot_emacs b/bootstrap/nrelate/server/dot_emacs deleted file mode 100644 index 738824fc..00000000 --- a/bootstrap/nrelate/server/dot_emacs +++ /dev/null @@ -1,4 +0,0 @@ -;; -*- emacs-lisp -*- -(defvar *my-emacs-lib-dir* "~/lib/elisp/") -(load-file (concat *my-emacs-lib-dir* "bootstrap-init.el")) -(bootstrap-init "nrelate" "server") diff --git a/bootstrap/nrelate/widget/after.el b/bootstrap/nrelate/widget/after.el deleted file mode 100644 index 1eeb907a..00000000 --- a/bootstrap/nrelate/widget/after.el +++ /dev/null @@ -1,84 +0,0 @@ -(defun embiggen () - (interactive) - (set-face-attribute 'default nil :font "Monaco 18") - (set-frame-width (zoom-frame-width-cols))) - -(defun unembiggen () - (interactive) - (set-face-attribute 'default nil :font "Monaco 13") - (max-frame-height)) - -(defun vulcan-password-to-clipboard () - (interactive) - (let ((buf - (find-file-noselect - (concat *my-pim-dir* - "orgs/work/nrelate/keyring.org.gpg")))) - (with-current-buffer buf - (beginning-of-buffer) - (end-of-line) - (clipboard-kill-ring-save 1 (point))) - (message "Password saved to clipboard"))) - -(defun vulcan-password-to-iterm () - (interactive) - (with-current-buffer (find-file-noselect (concat *my-pim-dir* "orgs/work/nrelate/keyring.org.gpg")) - (beginning-of-buffer) - (send-current-line-to-iterm)) - (message "Password sent to iTerm")) - -(defun mindspark-password-to-clipboard () - (interactive) - (let ((buf - (find-file-noselect - (concat *my-pim-dir* - "orgs/work/nrelate/keyring.org.gpg")))) - (with-current-buffer buf - (beginning-of-buffer) - (next-line) - (let ((start-point (point))) - (end-of-line) - (clipboard-kill-ring-save start-point (point)))) - (message "Password saved to clipboard"))) - -(setq sql-mysql-options (list "-A")) -;; (setq sql-user "jimm") -;; (setq sql-server "localhost") -;; (setq sql-database "db") - -(require 'mmm-defaults) - -(setq dired-use-ls-dired nil) -(add-hook 'tramp-mode-hook - (lambda () - (add-to-list 'tramp-default-user-alist '("ssh\\|scp" "10\\.10\\.*" "vulcan")))) -(setq browse-url-generic-program "open") -(setq Man-switches "-M /usr/share/man:/usr/local/share/man") - -(defvar compile-ant "ant -e -s build.xml ") -(set-register ?n compile-ant) - -(setq sql-sqlite-program "sqlite3") - -(add-to-list 'auto-mode-alist '("\\.\\(md\\|markdown\\)$" . markdown-mode)) -(setq markdown-command "multimarkdown") - -;; Start Emacs server -(server-start) - -(defmacro find-org-file (path) - `(lambda () - (interactive) - (find-file (concat *my-pim-dir* "orgs/" ,path)))) - -(org-add-link-type - "jira" - (lambda (url) - (browse-url-generic (concat "https://jira.iaccap.com:8443/browse/" url)))) - -(global-set-key [f4] (find-org-file "work/nrelate/todo.org")) -(global-set-key [\C-f4] (find-org-file "todo.org")) -(global-set-key [f6] (find-org-file "work/nrelate/notes.org")) -(global-set-key [\C-f6] (find-org-file "notes.org")) -(global-set-key [f7] 'vulcan-password-to-iterm) -(global-set-key [\C-f7] 'mindspark-password-to-clipboard) diff --git a/bootstrap/nrelate/widget/before.el b/bootstrap/nrelate/widget/before.el deleted file mode 100644 index 05b59841..00000000 --- a/bootstrap/nrelate/widget/before.el +++ /dev/null @@ -1,29 +0,0 @@ -(defvar *my-pim-dir* "~/pim/") - -(setq ns-command-modifier 'meta) ; define Command as Meta key -(setq ns-option-modifier "none") ; unbind option key - -; http://debbugs.gnu.org/cgi/bugreport.cgi?bug=5683#19 -(when (fboundp 'ns-list-colors) - (setq x-colors (ns-list-colors))) ; fix build bug in 23.4, also in 24.1 - -; Smoother mouse wheel scrolling -; http://www.reddit.com/r/programming/comments/95uv7/emacs_231_has_been_released/c0bj6zp -(setq mouse-wheel-scroll-amount (quote (1 ((shift) . 5) ((control))))) - -(when window-system - (defvar *basic-frame-alist* '((background-color . "ghost white") - (cursor-color . "orange") - (tool-bar-mode . nil) - (font . "Monaco 13"))) - (setq initial-frame-alist - (append *basic-frame-alist* '((height . 58) (top . 0) (left . 0)))) - (setq default-frame-alist *basic-frame-alist*) - (set-face-attribute 'mode-line nil :foreground "yellow" :background "black")) - -(setq *zoom-frame-width-factor* 0.175) - -(add-to-list 'load-path "/usr/share/emacs/22.1/lisp" t) -(add-to-list 'load-path "/usr/share/emacs/22.1/site-lisp" t) - -(setq-default indent-tabs-mode nil) diff --git a/bootstrap/nrelate/widget/dot_emacs b/bootstrap/nrelate/widget/dot_emacs deleted file mode 100644 index 003c1fdb..00000000 --- a/bootstrap/nrelate/widget/dot_emacs +++ /dev/null @@ -1,4 +0,0 @@ -;; -*- emacs-lisp -*- -(defvar *my-emacs-lib-dir* "~/Library/elisp/") -(load-file (concat *my-emacs-lib-dir* "bootstrap-init.el")) -(bootstrap-init "nrelate" "widget") diff --git a/emacs.el b/emacs.el index 34aa9068..de04f6d0 100644 --- a/emacs.el +++ b/emacs.el @@ -89,7 +89,7 @@ (transient-mark-mode -1) (setq confirm-nonexistent-file-or-buffer nil)) -(setq bookmark-save-flag 1) ; see bootstrap-ini for loc of file +(setq save-flag 1) ; see bootstrap-ini for loc of file (setq sentence-end-double-space nil) (turn-on-auto-fill) (auto-fill-mode 1)