From 057916c230f4937b3e4a17e57f895a233556da14 Mon Sep 17 00:00:00 2001 From: jowj Date: Thu, 9 Aug 2018 09:44:57 -0500 Subject: [PATCH] Move .emacs folder structure; add new functionality to init.el; begin 'usefulScripts.el' for holding future scripts. --- {.emacs.d => .emacs}/init.el | 78 ++++++++++++++++++++++-------------- .emacs/usefulScripts.el | 9 +++++ 2 files changed, 57 insertions(+), 30 deletions(-) rename {.emacs.d => .emacs}/init.el (75%) create mode 100644 .emacs/usefulScripts.el diff --git a/.emacs.d/init.el b/.emacs/init.el similarity index 75% rename from .emacs.d/init.el rename to .emacs/init.el index 8d170bb..6754aa4 100644 --- a/.emacs.d/init.el +++ b/.emacs/init.el @@ -14,35 +14,60 @@ ;; (add-to-list 'auto-mode-alist '("\\.org$" . org-mode)) ;; The above is the default in recent emacsen -;; packages +(custom-set-faces + '(org-level-1 ((t (:inherit outline-1 :height 1.3)))) + '(org-level-2 ((t (:inherit outline-2 :height 1.2)))) + '(org-level-3 ((t (:inherit outline-3 :height 1.1)))) + '(org-level-4 ((t (:inherit outline-4 :height 1.1)))) + '(org-level-5 ((t (:inherit outline-5 :height 1.1)))) +) + + +;; custom org mode hotkeys +(global-set-key "\C-cl" 'org-store-link) +(global-set-key "\C-ca" 'org-agenda) +(global-set-key "\C-cc" 'org-capture) +(global-set-key "\C-cb" 'org-iswitchb) + +;; search across agenda files when refiling: +(setq org-refile-targets '((nil :maxlevel . 9) + (org-agenda-files :maxlevel . 9))) +(setq org-outline-path-complete-in-steps nil) ; Refile in a single go +(setq org-refile-use-outline-path t) ; Show full paths for refiling + +;; add files to agenda: +(setq org-agenda-files '("~/Dropbox/org/")) + +;; define generic org capture shit +(setq org-directory "~/Dropbox/org/") +(setq org-default-notes-file (concat org-directory "/refile-beorg.org")) + (require 'package) (let* ((no-ssl (and (memq system-type '(windows-nt ms-dos)) (not (gnutls-available-p)))) (proto (if no-ssl "http" "https"))) ;; Comment/uncomment these two lines to enable/disable MELPA and MELPA Stable as desired - (add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t) + ;;(add-to-list 'package-archives (cons "melpa" (concat proto "://melpa.org/packages/")) t) ;;(add-to-list 'package-archives (cons "melpa-stable" (concat proto "://stable.melpa.org/packages/")) t) (when (< emacs-major-version 24) ;; For important compatibility libraries like cl-lib (add-to-list 'package-archives '("gnu" . (concat proto "://elpa.gnu.org/packages/"))))) +(package-initialize) -;; load custom themes -;; Added by Package.el. This must come before configurations of -;; installed packages. Don't delete this line. If you don't want it, -;; just comment it out by adding a semicolon to the start of the line. -;; You may delete these explanatory comments. -;;(package-initialize) +(unless package-archive-contents + (package-refresh-contents)) +;; load custom themes (custom-set-variables ;; custom-set-variables was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - '(custom-enabled-themes (quote (flatui))) + '(custom-enabled-themes '(flatui)) '(custom-safe-themes - (quote - ("15348febfa2266c4def59a08ef2846f6032c0797f001d7b9148f30ace0d08bcf" default))) - '(package-selected-packages (quote (markdown-mode flatui-theme powershell csharp-mode )))) + '("15348febfa2266c4def59a08ef2846f6032c0797f001d7b9148f30ace0d08bcf" default)) + '(package-selected-packages + '(doom-themes outline-magic pylint python-mode markdown-mode powershell csharp-mode))) '(org-agenda-files (quote ("~/Dropbox/org/work.org" "~/Dropbox/org/refile-beorg.org" "~/Dropbox/org/personal.org"))) @@ -52,31 +77,15 @@ (file "~/Dropbox/org/refile-beorg.org") "" :immediate-finish t)))) +;; trialing a new thing here; sometimes not all my packages actually get set up. +(unless package--initialized (package-initialize t)) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. ) -;; custom org mode hotkeys -(global-set-key "\C-cl" 'org-store-link) -(global-set-key "\C-ca" 'org-agenda) -(global-set-key "\C-cc" 'org-capture) -(global-set-key "\C-cb" 'org-iswitchb) - -;; search across agenda files when refiling: -(setq org-refile-targets '((nil :maxlevel . 9) - (org-agenda-files :maxlevel . 9))) -(setq org-outline-path-complete-in-steps nil) ; Refile in a single go -(setq org-refile-use-outline-path t) ; Show full paths for refiling -;; add files to agenda: -(setq org-agenda-files '("~/Dropbox/org/")) - -;; define generic org capture shit -(setq org-directory "~/Dropbox/org/") -(setq org-default-notes-file (concat org-directory "/refile-beorg.org")) -(define-key global-map "\C-cc" 'org-capture) ;; tell emacs to stop writing bullshit in all my folders ;; and just put all backups in a single folder @@ -99,3 +108,12 @@ ;; deal with mac command key problems: (when (eq system-type 'darwin) (setq mac-command-modifier 'meta)) + +;; custom emacsland functions +(defun find-user-init-file () + "Edit the `user-init-file', in another window." + (interactive) + (find-file-other-window user-init-file)) +(global-set-key (kbd "C-c I") 'find-user-init-file) + + diff --git a/.emacs/usefulScripts.el b/.emacs/usefulScripts.el new file mode 100644 index 0000000..beb2b1e --- /dev/null +++ b/.emacs/usefulScripts.el @@ -0,0 +1,9 @@ +(defun my/org-mode-hook () + "Stop the org-level headers from increasing in height relative to the other text." + (dolist (face '(org-level-1 + org-level-2 + org-level-3 + org-level-4 + org-level-5)) + (set-face-attribute face nil :weight 'semi-bold :height 1.0))) +(add-hook 'org-mode-hook 'my/org-mode-hook)