Merge branch 'master' of git.awful.club:jowj/chd

.config/hammerspoon/init.lua

@@ -82,17 +82,16 @@ end)
 
 -- stolen from @mrled
 appCuts = {
+  c = 'Google Chrome',
   e = 'Emacs',
   d = 'Dash',
+  f = 'Firefox',  
   h = 'Hammerspoon',
-  f = 'Firefox',
   l = 'Slack',
-  o = 'Microsoft Outlook',
+  m = 'Mail.app',
+  o = 'Calendar.app',
   p = 'Bitwarden',
-  r = 'Element',
-  s = 'Safari',
-  t = 'iTerm',
-  c = 'Google Chrome',
+  t = 'Terminal.app',
   z = 'Zoom.us'  
 }
 

.emacs.d/init.el

@@ -41,7 +41,7 @@
  '(epg-gpg-program "/usr/local/bin/gpg")
  '(global-hl-line-mode t)
  '(package-selected-packages
-   '(org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))
+   '(org-caldav json-mode pdf-tools org-special-block-extras neotree sr-speedbar lsp-python-ms fira-code-mode yasnippet org-pdftools phps-mode projectile webfeeder znc pinboard yaml-mode which-key web-mode virtualenvwrapper use-package twittering-mode try smex racer powershell poetry pipenv ox-reveal outline-magic org-pdfview org-bullets ob-restclient multiple-cursors magit lua-mode lsp-ui iedit helm flycheck-rust exec-path-from-shell eglot edit-indirect company-lsp ansible ace-window)))
  '(znc-servers
    `(("bouncer.awful.club" 5000 t
       ((freenode "blindidiotgod/freenode" ,znc-password)

.emacs.d/jlj-generic.el

@@ -148,18 +148,6 @@
 (use-package magit
   :ensure t)
 
-(require 'desktop)
-(desktop-save-mode 1)
-(setq desktop-restore-eager 5)
-
-(defun jlj-desktop-save ()
-  (interactive)
-  ;; Don't call desktop-save-in-desktop-dir, as it prints a message.
-  (if (eq (desktop-owner) (emacs-pid))
-      (desktop-save desktop-dirname)))
-(add-hook 'auto-save-hook 'jlj-desktop-save)
-
-
 (setq org-reveal-root "http://cdn.jsdelivr.net/reveal.js/3.0.0/")
 (setq org-reveal-mathjax t)
 

.emacs.d/jlj-org.el

@@ -143,3 +143,15 @@ dependency: this relies on imagemagick"
 ;; force source blocks to respect the proper indentation.
 (setq org-src-preserve-indentation nil 
       org-edit-src-content-indentation 0)
+
+;; calender integration
+(use-package org-caldav
+  :ensure t
+  :config
+  (setq org-caldav-sync-direction 'cal->org)
+  (setq org-caldav-url "https://caldav.fastmail.com/dav/calendars/user/me@jowj.net/")
+  (setq org-caldav-calendars
+	'((:calendar-id "654a6e55-b777-4603-b009-0058d35aa5ca"
+			:inbox "~/Sync/Documents/org/fromworkcal.org")))
+  (setq org-icalendar-timezone "America/Chicago"))
+