diff --git a/emacs.d/bookmarks b/emacs.d/bookmarks index 7e5665c..1d32074 100644 --- a/emacs.d/bookmarks +++ b/emacs.d/bookmarks @@ -2,9 +2,19 @@ ;;; This format is meant to be slightly human-readable; ;;; nevertheless, you probably don't want to edit it. ;;; -*- End Of Bookmark File Format Version Stamp -*- -(("org-capture-last-stored" - (filename . "~/data/org/notes.org") - (front-context-string . "** Hello, I'm a ") +(("org-capture-last-stored-marker" + (filename . "~/.notes") + (front-context-string . "** TODO \n [202") + (rear-context-string . "]\nDo some work!\n") + (position . 52)) +("org-refile-last-stored" + (filename . "~/.notes") + (front-context-string . "** TODO \n [202") + (rear-context-string . "]\nDo some work!\n") + (position . 52)) +("org-capture-last-stored" + (filename . "~/.notes") + (front-context-string . "** TODO \n [202") (rear-context-string) - (position . 10)) + (position . 9)) ) \ No newline at end of file diff --git a/emacs.d/custom.el b/emacs.d/custom.el index cc1c60d..9fee0bf 100644 --- a/emacs.d/custom.el +++ b/emacs.d/custom.el @@ -3,8 +3,14 @@ ;; 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 (dracula))) + '(custom-safe-themes + (quote + ("dcdd1471fde79899ae47152d090e3551b889edf4b46f00df36d653adc2bf550d" default))) '(org-agenda-files (quote ("~/data/org/notes.org" "~/data/org/work.org"))) - '(package-selected-packages (quote (magit dracula-theme use-package)))) + '(package-selected-packages + (quote + (rust-playground rust-mode company magit-gerrit elixir-mode evil-org org-pomodoro evil magit dracula-theme use-package)))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. diff --git a/emacs.d/init.el b/emacs.d/init.el index 4cd156a..6668180 100644 --- a/emacs.d/init.el +++ b/emacs.d/init.el @@ -1,8 +1,18 @@ (require 'package) (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t) -(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa") t) +(add-to-list 'package-archives '("org" . "http://orgmode.org/elpa/") t) + +(setq gnutls-algorithm-priority "NORMAL:-VERS-TLS1.3") (package-initialize) +(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. + '(package-selected-packages + (quote + (evil-org monitor evil slime notmuch use-package magit dracula-theme)))) (unless (package-installed-p 'org) (package-refresh-contents) @@ -12,11 +22,16 @@ (package-refresh-contents) (package-install 'use-package)) +(unless (package-installed-p 'evil) + (package-refresh-contents) + (package-install 'evil)) + (eval-when-compile (require 'use-package)) (require 'bind-key) (setq user-full-name "Paul Walker") +(setq user-email "paul.walker@broadcom.com") (setq custom-file (expand-file-name "custom.el" user-emacs-directory)) (when (file-exists-p custom-file) (load custom-file)) @@ -25,15 +40,29 @@ (tool-bar-mode 0) (tooltip-mode 0)) +(windmove-default-keybindings) + +; Can re-bind these. +; windmove-up +; windmove-down +; windmove-left +; windmove-right + +(eval-when-compile (require 'cl)) + +(ido-mode 1) +(global-set-key (kbd "C-p") 'fzf-git) +(global-set-key (kbd "C-x b") 'ibuffer) + ;; initial window (setq initial-frame-alist '((width . 102) ; characters in a line - (height . 44))) ; number of lines + (height . 44))) ; number of lines ;; sebsequent frame (setq default-frame-alist '((width . 100) ; characters in a line - (height . 42))) ; number of lines + (height . 42))) ; number of lines ;; No welcome screen - opens directly in scratch buffer (setq inhibit-startup-message t @@ -65,4 +94,19 @@ recentf-exclude '("/tmp/" "/ssh:")) (recentf-mode) -(global-set-key [C-Z] 'undo) +; (global-set-key [C-Z] 'undo) + +(autoload 'notmuch "notmuch" "notmuch mail" t) + +(use-package evil-org + :ensure t + :after org + :config + (add-hook 'org-mode-hook 'evil-org-mode) + (add-hook 'evil-org-mode-hook + (lambda () + (evil-org-set-key-theme))) + (require 'evil-org-agenda) + (evil-org-agenda-set-keys)) + +(add-hook 'after-init-hook 'global-company-mode) diff --git a/emacs.d/org.el b/emacs.d/org.el index e28b65c..2336fbd 100644 --- a/emacs.d/org.el +++ b/emacs.d/org.el @@ -1,45 +1,51 @@ (setq org-directory "~/data/org") +(setq org-agenda-files "~/data/org") (setq org-catch-invisible-edits t) ;; (setq org-hide-emphasis-markers t) ;; (setq org-src-fontify-natively t ;; org-src-tab-acts-natively t) -;; (setq org-startup-indented t -;; org-hide-leading-stars t) +(setq org-startup-indented t) +;;(setq org-hide-leading-stars t) ;; (setq org-export-with-smart-quotes t ;; org-export-backends '(beamer html md)) +(setq org-tag-alist (quote (("irdeto" . ?i) + ("nagra" . ?n) + ("security" . ?s) + ("admin" . ?a)))) + ;; (setq org-tag-alist (quote (("article" . ?a) ;; temporary ;; ("books" . ?b) ;; ("work" . ?w) ;; ("noexport" . ?x) ;; ("cash" . ?$)))) -;; (setq org-todo-keywords -;; '((sequence "TODO(t)" "IN-PROGRESS(i)" "|" "DONE(d!)") -;; (sequence "WAITING(w@/!)" "|" "CANCELED(c@)"))) +(setq org-todo-keywords + '((sequence "TODO(t)" "IN-PROGRESS(i)" "|" "DONE(d!)") + (sequence "WAITING(w@/!)" "|" "CANCELED(c@)") + (sequence "IN-REVIEW(r)")) -;; (setq org-todo-keyword-faces -;; (quote (("TODO" :foreground "red" :weight bold) -;; ("NEXT" :foreground "blue" :weight bold) -;; ("DONE" :foreground "forest green" :weight bold) -;; ("WAITING" :foreground "orange" :weight bold) -;; ("HOLD" :foreground "magenta" :weight bold) -;; ("CANCELLED" :foreground "forest green" :weight bold) -;; ("MEETING" :foreground "forest green" :weight bold) -;; ("PHONE" :foreground "forest green" :weight bold)))) +(setq org-todo-keyword-faces + (quote (("TODO" :foreground "red" :weight bold) + ("NEXT" :foreground "blue" :weight bold) + ("DONE" :foreground "forest green" :weight bold) + ("WAITING" :foreground "orange" :weight bold) + ("HOLD" :foreground "magenta" :weight bold) + ("CANCELLED" :foreground "forest green" :weight bold) + ("MEETING" :foreground "forest green" :weight bold) + ("PHONE" :foreground "forest green" :weight bold)))) ;; (setq org-use-fast-todo-selection t) ;; (setq org-treat-S-cursor-todo-selection-as-state-change nil) -;; (add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\)$" . org-mode)) +(add-to-list 'auto-mode-alist '("\\.\\(org\\|org_archive\\)$" . org-mode)) ;; (setq org-agenda-files (list ;; "~/data/org/notes.org" -;; "~/data/org/work.org")) -;; (setq org-directory "~/data/org/") +;; "~/data/org/work.org")) ;; (setq org-default-notes-file "~/data/org/refile.org") ;; (setq org-deadline-warning-days 7 @@ -49,19 +55,19 @@ ;; (setq org-deadline-warning-days 7 ;; org-agenda-span 'fortnight) -;; (setq org-capture-templates -;; '( -;; ("n" -;; "Note" -;; entry -;; (file+headline "~/data/org/notes.org" "Notes") -;; "* %? %(org-set-tags) :note:\n:PROPERTIES:\n:Created: %U\n:Linked: %A\n:END:\n%i" ; template -;; :prepend t ; properties -;; :empty-lines 1 ; properties -;; :created t ; properties -;; :kill-buffer t ; properties -;; ;; For notes or something regarding more work -;; ) +(setq org-capture-templates + '( + ("n" + "Note" + entry + (file+headline "~/data/org/notes.org" "Notes") + "* %? %(org-set-tags) :note:\n:PROPERTIES:\n:Created: %U\n:Linked: %A\n:END:\n%i" ; template + :prepend t ; properties + :empty-lines 1 ; properties + :created t ; properties + :kill-buffer t ; properties + ;; For notes or something regarding more work + ) ;; ( ;; "w" ; key ;; "Work" ; name @@ -74,7 +80,7 @@ ;; :kill-buffer t ; properties ;; ) ;; ) -;; ) + )) ;; (setq org-refile-targets '((nil :maxlevel . 9) ;; (org-agenda-files :maxlevel . 9)))