summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--custom-settings.el2
-rw-r--r--init.el70
2 files changed, 70 insertions, 2 deletions
diff --git a/custom-settings.el b/custom-settings.el
index e3f88f4..431792c 100644
--- a/custom-settings.el
+++ b/custom-settings.el
@@ -68,7 +68,7 @@
'(org-sort-agenda-notime-is-late nil)
'(package-selected-packages
(quote
- (expand-region org-gcal lsp-python-ms ace-window discover-my-major popup-kill-ring amx gnu-elpa-keyring-update auto-package-update monokai-theme color-theme-monokai color-theme-sanityinc-tomorrow dracula-theme evil-mode yasnippet-snippets highlight-symbol rainbow-delimiters git-gutter Ivy org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil)))
+ (csv-mode expand-region org-gcal lsp-python-ms ace-window discover-my-major popup-kill-ring amx gnu-elpa-keyring-update auto-package-update monokai-theme color-theme-monokai color-theme-sanityinc-tomorrow dracula-theme evil-mode yasnippet-snippets highlight-symbol rainbow-delimiters git-gutter Ivy org-caldav which-key-mode org-plus-contrib use-package ac-cider magit blacken py-autopep8 flycheck elpy yasnippet company-lsp company lsp-ui go-autocomplete lsp-mode go-mode markdown-mode gruvbox-theme helm org cider slime evil)))
'(pdf-view-midnight-colors (quote ("#fdf4c1" . "#282828")))
'(pos-tip-background-color "#36473A")
'(pos-tip-foreground-color "#FFFFC8")
diff --git a/init.el b/init.el
index 0ca7b6c..8477743 100644
--- a/init.el
+++ b/init.el
@@ -301,6 +301,7 @@
;; org-gcal stuff
(use-package org-gcal
+ :bind (:map org-agenda-mode-map ("g" . org-gcal-fetch))
:config
(setq org-gcal-client-id "685624394721-5bsfpo57ri2rcc7k6f8sbg12gjrs7dot.apps.googleusercontent.com"
org-gcal-client-secret "IAZ8j86uAPyolUnPGJxfieGO"
@@ -531,11 +532,19 @@
(global-set-key "\C-cc" 'org-capture)
(setq org-sort-agenda-notime-is-late nil)
(setq org-directory "~/Nextcloud/org")
- (setq org-agenda-files '("~/Nextcloud/org"))
+
+ (setq org-agenda-files (quote ("~/Nextcloud/org/todo.org"
+ "~/Nextcloud/org/projects.org"
+ "~/Nextcloud/org/"
+ "~/Nextcloud/org/calendar/home-cal.org"
+ "~/Nextcloud/org/calendar/work-cal.org")))
+
(setq org-default-notes-file (concat org-directory "/refile.org"))
(setq diary-file "~/Nextcloud/org/diary")
(setq org-agenda-include-diary t)
+ (setq org-agenda-show-future-repeats nil)
(setq org-agenda-skip-deadline-if-done t)
+ (setq org-agenda-skip-scheduled-if-done t)
(setq org-reverse-note-order t)
(setq org-sort-agenda-notime-is-late nil)
@@ -599,6 +608,65 @@
(setq org-ellipsis "...")
)
+;; org tags
+(setq org-tag-alist '(
+ ;; Depth
+ ("@immersive" . ?i) ;; "Deep"
+ ("@process" . ?p) ;; "Shallow"
+ ("@offdesk" . ?o) ;; "Away from desk"
+ ;; Context
+ ("@work" . ?w)
+ ("@home" . ?h)
+ ("@errand" . ?e)
+ ;; Time
+ ("15min" . ?<)
+ ("30min" . ?=)
+ ("1h" . ?>)
+ ;; Energy
+ ("Challenge" . ?1)
+ ("Average" . ?2)
+ ("Easy" . ?3)
+ ;; Misc
+ ("Maybe" . ?m)
+ ))
+
+;; Some nice org speed commands
+(setq org-use-speed-commands t
+ org-speed-commands-user
+ '(("N" org-narrow-to-subtree)
+ ("$" org-archive-subtree)
+ ("A" org-archive-subtree)
+ ("W" widen)
+ ("d" org-down-element)
+ ("k" org-cut-subtree)
+ ("m" org-mark-subtree)
+ ("s" org-sort)
+ ;; ("x" smex-major-mode-commands)
+ ("X" org-todo-done)
+ ("R" org-done-and-archive)
+ ("y" org-todo-yesterday)))
+
+;; org agenda should be full screen
+(defun open-agenda ()
+ "Open the org-agenda."
+ (interactive)
+ (let ((agenda "*Org Agenda*"))
+ (if (equal (get-buffer agenda) nil)
+ (org-agenda-list)
+ (unless (equal (buffer-name (current-buffer)) agenda)
+ (switch-to-buffer agenda))
+ (org-agenda-redo t)
+ (beginning-of-buffer))))
+
+(bind-key "<f5>" 'open-agenda)
+
+;; markdown
+(use-package markdown-mode)
+
+;; csvs!
+(use-package csv-mode
+ :mode ("\\.csv$" . csv-mode))
+
;; Interactively Do Things (ido)
(use-package ido
:config