Skip to content

Commit bb7f06b

Browse files
committed
Org and mu updates, xonsh config, etc.
1 parent 42d8981 commit bb7f06b

File tree

6 files changed

+92
-29
lines changed

6 files changed

+92
-29
lines changed

home/.config/xonsh/config.json

Lines changed: 0 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -4,8 +4,6 @@
44
"coreutils",
55
"jedi",
66
"mpl",
7-
"vox",
8-
"vox_tabcomplete",
97
"schedule"
108
]
119
}

home/.emacs.d/Cask

Lines changed: 33 additions & 13 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@
1010
(depends-on "anaphora")
1111
(depends-on "ansible")
1212
(depends-on "ansible-doc")
13-
(depends-on "apiwrap")
13+
(depends-on "ansible-vault")
1414
(depends-on "async")
1515
(depends-on "auto-complete")
1616
(depends-on "auto-highlight-symbol")
@@ -42,15 +42,16 @@
4242
(depends-on "company-jedi")
4343
(depends-on "company-nginx")
4444
(depends-on "company-quickhelp")
45-
(depends-on "company-solidity")
4645
(depends-on "company-tern")
4746
(depends-on "company-terraform")
4847
(depends-on "company-web")
4948
(depends-on "concurrent")
49+
(depends-on "confluence")
5050
(depends-on "css-eldoc")
5151
(depends-on "csv-mode")
5252
(depends-on "ctable")
5353
(depends-on "ctags")
54+
(depends-on "ctags-update")
5455
(depends-on "cython-mode")
5556
(depends-on "dad-joke")
5657
(depends-on "dakrone-theme")
@@ -73,13 +74,15 @@
7374
(depends-on "dpaste")
7475
(depends-on "dracula-theme")
7576
(depends-on "edts")
76-
(depends-on "ein")
7777
(depends-on "el-get")
7878
(depends-on "elang")
7979
(depends-on "elixir-mode")
8080
(depends-on "elm-mode")
8181
(depends-on "elpy")
82+
(depends-on "elscreen")
8283
(depends-on "elscreen-persist")
84+
(depends-on "emacsql")
85+
(depends-on "emacsql-mysql")
8386
(depends-on "emojify")
8487
(depends-on "enh-ruby-mode")
8588
(depends-on "epc")
@@ -88,8 +91,8 @@
8891
(depends-on "erlang")
8992
(depends-on "eruby-mode")
9093
(depends-on "eslint-fix")
91-
(depends-on "ess")
9294
(depends-on "esup")
95+
(depends-on "esxml")
9396
(depends-on "excorporate")
9497
(depends-on "exec-path-from-shell")
9598
(depends-on "exotica-theme")
@@ -105,10 +108,12 @@
105108
(depends-on "flycheck-elm")
106109
(depends-on "flycheck-flow")
107110
(depends-on "flycheck-mypy")
111+
(depends-on "flycheck-nimsuggest")
108112
(depends-on "flycheck-plantuml")
109113
(depends-on "flycheck-pyflakes")
110114
(depends-on "flycheck-rust")
111115
(depends-on "flycheck-yamllint")
116+
(depends-on "flymake-easy")
112117
(depends-on "flymake-json")
113118
(depends-on "flymake-php")
114119
(depends-on "flymake-python-pyflakes")
@@ -123,15 +128,15 @@
123128
(depends-on "fuzzy")
124129
(depends-on "gh")
125130
(depends-on "gh-md")
126-
(depends-on "ghub")
127-
(depends-on "ghub+")
128131
(depends-on "git")
129132
(depends-on "git-commit")
130133
(depends-on "git-gutter+")
131134
(depends-on "git-gutter-fringe+")
132135
(depends-on "git-link")
133136
(depends-on "github-issues")
137+
(depends-on "gntp")
134138
(depends-on "graphviz-dot-mode")
139+
(depends-on "groovy-mode")
135140
(depends-on "haml-mode")
136141
(depends-on "hcl-mode")
137142
(depends-on "helm")
@@ -149,7 +154,6 @@
149154
(depends-on "helm-proc")
150155
(depends-on "helm-projectile")
151156
(depends-on "helm-pydoc")
152-
(depends-on "helm-tramp")
153157
(depends-on "heroku")
154158
(depends-on "highlight")
155159
(depends-on "highlight-indentation")
@@ -182,18 +186,20 @@
182186
(depends-on "kdeconnect")
183187
(depends-on "kivy-mode")
184188
(depends-on "kubernetes")
189+
(depends-on "kv")
185190
(depends-on "ldap-mode")
186-
(depends-on "lentic")
187191
(depends-on "let-alist")
188192
(depends-on "lice")
189193
(depends-on "linum-relative")
194+
(depends-on "log4e")
190195
(depends-on "logito")
191196
(depends-on "logstash-conf")
192197
(depends-on "lorem-ipsum")
193198
(depends-on "lush-theme")
194199
(depends-on "lxc-tramp")
195200
(depends-on "m-buffer")
196201
(depends-on "magit")
202+
(depends-on "magit-filenotify")
197203
(depends-on "magit-gh-pulls")
198204
(depends-on "magit-popup")
199205
(depends-on "magithub")
@@ -205,14 +211,17 @@
205211
(depends-on "marshal")
206212
(depends-on "material-theme")
207213
(depends-on "memoize")
214+
(depends-on "metaweblog")
208215
(depends-on "mkdown")
216+
(depends-on "mmm-jinja2")
209217
(depends-on "mmm-mako")
210218
(depends-on "mmm-mode")
211219
(depends-on "monky")
212220
(depends-on "mu4e-alert")
213221
(depends-on "mu4e-conversation")
214222
(depends-on "mu4e-jump-to-list")
215223
(depends-on "mu4e-maildirs-extension")
224+
(depends-on "mu4e-query-fragments")
216225
(depends-on "multi")
217226
(depends-on "multi-term")
218227
(depends-on "multi-web-mode")
@@ -234,26 +243,32 @@
234243
(depends-on "org-gcal")
235244
(depends-on "org-jira")
236245
(depends-on "org-journal")
246+
(depends-on "org-mind-map")
237247
(depends-on "org-mobile-sync")
248+
(depends-on "org-msg")
238249
(depends-on "org-pomodoro")
250+
(depends-on "org-timeline")
239251
(depends-on "org-trello")
240252
(depends-on "org-web-tools")
241253
(depends-on "org-wild-notifier")
242254
(depends-on "org2blog")
243255
(depends-on "origami")
256+
(depends-on "ov")
244257
(depends-on "package-build")
245258
(depends-on "pallet")
246259
(depends-on "pandoc")
247260
(depends-on "pcache")
248-
(depends-on "pelican-mode")
261+
(depends-on "peg")
249262
(depends-on "perspective")
250263
(depends-on "php-mode")
251264
(depends-on "pip-requirements")
252265
(depends-on "pipenv")
253266
(depends-on "pippel")
254267
(depends-on "pkg-info")
255268
(depends-on "plantuml-mode")
269+
(depends-on "pocket-lib")
256270
(depends-on "pocket-reader")
271+
(depends-on "poly-ansible")
257272
(depends-on "polymode")
258273
(depends-on "pony-mode")
259274
(depends-on "popup")
@@ -280,9 +295,12 @@
280295
(depends-on "pyvenv")
281296
(depends-on "racer")
282297
(depends-on "rainbow-delimiters")
298+
(depends-on "rainbow-identifiers")
283299
(depends-on "rainbow-mode")
284300
(depends-on "rake")
301+
(depends-on "rbenv")
285302
(depends-on "request")
303+
(depends-on "request-deferred")
286304
(depends-on "revive")
287305
(depends-on "rich-minority")
288306
(depends-on "rinari")
@@ -297,30 +315,29 @@
297315
(depends-on "sass-mode")
298316
(depends-on "scss-mode")
299317
(depends-on "seq")
300-
(depends-on "simple-httpd")
301-
(depends-on "skewer-mode")
318+
(depends-on "shut-up")
302319
(depends-on "slack")
303320
(depends-on "smart-mode-line")
304321
(depends-on "smartparens")
305322
(depends-on "smbc")
306323
(depends-on "smeargle")
307324
(depends-on "smex")
308-
(depends-on "solidity-mode")
309325
(depends-on "sphinx-doc")
310326
(depends-on "spinner")
311327
(depends-on "sql-indent")
312328
(depends-on "sr-speedbar")
313329
(depends-on "swiper")
314330
(depends-on "swiper-helm")
315-
(depends-on "sx")
316331
(depends-on "synonymous")
317332
(depends-on "systemd")
318333
(depends-on "tablist")
334+
(depends-on "tblui")
319335
(depends-on "tern")
320336
(depends-on "tern-auto-complete")
321337
(depends-on "terraform-mode")
322338
(depends-on "tj-mode")
323339
(depends-on "tramp-theme")
340+
(depends-on "transient")
324341
(depends-on "tree-mode")
325342
(depends-on "twittering-mode")
326343
(depends-on "undo-tree")
@@ -329,6 +346,7 @@
329346
(depends-on "use-package")
330347
(depends-on "vagrant")
331348
(depends-on "virtualenvwrapper")
349+
(depends-on "vlf")
332350
(depends-on "web-completion-data")
333351
(depends-on "web-mode")
334352
(depends-on "websocket")
@@ -337,6 +355,8 @@
337355
(depends-on "windata")
338356
(depends-on "with-editor")
339357
(depends-on "xcscope")
358+
(depends-on "xml-rpc")
359+
(depends-on "xterm-color")
340360
(depends-on "yaml-mode")
341361
(depends-on "yaml-tomato")
342362
(depends-on "yasnippet")

home/.emacs.d/configurations.el

Lines changed: 20 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,7 @@
2424

2525
(setq helm-dash-browser-func 'eww)
2626

27-
(setq ido-enable-flex-matching t)
27+
;; (setq ido-enable-flex-matching t)
2828

2929
(setq whitespace-line-column 150)
3030
(setq whitespace-style
@@ -37,7 +37,7 @@
3737
(add-to-list 'auto-mode-alist '("\\.js\\'" . js2-mode))
3838
(add-to-list 'auto-mode-alist '("\\.html" . web-mode))
3939
(add-to-list 'auto-mode-alist '("\\.jinja" . jinja2-mode))
40-
(add-to-list 'auto-mode-alist '("\\.sls" . yaml-mode))
40+
(add-to-list 'auto-mode-alist '("\\.sls" . salt-mode))
4141
(add-to-list 'auto-mode-alist '("\\.trello" . org-mode))
4242

4343
(setq speedbar-indentation-width 2)
@@ -196,6 +196,7 @@
196196
(global-set-key (kbd "C-c C-{") 'insert-pair)
197197
(global-set-key (kbd "C-c C-[") 'insert-pair)
198198

199+
(global-set-key (kbd "C-c p p") 'projectile-switch-project)
199200
(global-set-key (kbd "M-P") 'projectile-find-file)
200201

201202
(global-set-key (kbd "M-%") 'query-replace-regexp)
@@ -210,6 +211,7 @@
210211
(require 'org-alert)
211212
(require 'org-gcal)
212213
(require 'ox-latex)
214+
(require 'org-mu4e)
213215
(add-to-list 'org-latex-packages-alist '("" "listings"))
214216
(add-to-list 'org-latex-packages-alist '("" "color"))
215217
(setq org-agenda-restore-windows-after-quit t)
@@ -222,6 +224,8 @@
222224
(setq org-log-redeadline (quote time))
223225
(setq org-log-reschedule (quote time))
224226
(setq org-log-into-drawer t)
227+
(setq org-use-sub-superscripts '{})
228+
(setq org-export-with-sub-superscripts '{})
225229
(setq org-todo-keywords
226230
'((sequence "TODO(t)" "DOING(d!)" "|" "DONE(D!)")))
227231
(setq org-todo-keyword-faces
@@ -236,11 +240,14 @@
236240
(setq org-mobile-directory "~/Dropbox/org")
237241
(setq org-default-notes-file (concat org-directory "notes.org"))
238242
(setq org-refile-targets `((org-agenda-files . (:maxlevel . 2))))
243+
(setq org-mu4e-link-query-in-headers-mode nil)
239244
(setq org-capture-templates
240245
`(("t" "Todo" entry (file ,(concat org-directory "todo/todo.org"))
241246
"** TODO %? :%^G\n:PROPERTIES:\n:Created: %U\n:END:")
242247
("n" "Note" entry (file org-default-notes-file)
243-
"* %?\n:PROPERTIES:\n:Created: %U\n:END:")))
248+
"* %?\n:PROPERTIES:\n:Created: %U\n:END:")
249+
("f" "Followup" entry (file+headline ,(concat org-directory "todo/todo.org") "Tasks")
250+
"* TODO [#A] %?\nSCHEDULED: %(org-insert-time-stamp (org-read-date nil t \"+0d\"))\n%a\n")))
244251
(ignore-errors (load-file "~/.org-gcal-client-secrets.el.gpg"))
245252
(setq org-gcal-file-alist `(("[email protected]" . ,(concat org-directory "calendars/blarghmatey.org"))
246253
("[email protected]" . ,(concat org-directory "calendars/sabrinaleevt.org"))
@@ -252,7 +259,7 @@
252259
(global-set-key (kbd "C-c L") 'org-store-link)
253260
(global-set-key (kbd "C-c a") 'org-agenda)
254261
(global-set-key (kbd "C-c c") 'org-capture)
255-
(global-set-key (kbd "C-c o n") (lambda () (interactive) (find-file org-default-notes-file)))
262+
(global-set-key (kbd "C-c o n") (lambda () (interactive) (find-file (concat org-directory "notes/"))))
256263
(global-set-key (kbd "C-c o t") (lambda () (interactive) (find-file (concat org-directory "todo/"))))
257264
(global-set-key (kbd "C-c s e") `org-edit-src-code)
258265

@@ -273,7 +280,6 @@
273280

274281
(add-to-list 'load-path "/usr/local/share/emacs/site-lisp/mu4e")
275282
(require 'mu4e)
276-
(require 'org-mu4e)
277283
(require 'smtpmail)
278284
(require 'mu4e-contrib)
279285
(setq send-mail-function 'smtpmail-send-it
@@ -316,11 +322,14 @@
316322
317323
318324
319-
325+
326+
327+
320328
(dolist (bookmark
321329
'(("date:7d..now AND NOT maildir:\"/tobiasmacey/Python Ideas\" AND NOT maildir:\"/mitodl/Inbox/Django Errors\"" "Week View" ?W)
322330
("date:30d..now AND NOT maildir:\"/tobiasmacey/Python Ideas\" AND NOT maildir:\"/mitodl/Inbox/Django Errors\"" "Month View" ?M)
323-
("date:90d..now AND NOT maildir:\"/tobiasmacey/Python Ideas\" AND NOT maildir:\"/mitodl/Inbox/Django Errors\" flag:unread flag:list" "Unread Newsletters" ?L)))
331+
("date:90d..now AND NOT maildir:\"/tobiasmacey/Python Ideas\" AND NOT maildir:\"/mitodl/Inbox/Django Errors\" flag:unread flag:list" "Unread Newsletters" ?L)
332+
("flag:flagged" "Flagged Emails" ?f)))
324333
(add-to-list 'mu4e-bookmarks bookmark))
325334
(setq mu4e-contexts
326335
`( ,(make-mu4e-context
@@ -530,8 +539,8 @@
530539
"Regards,\n"
531540
"Tobias Macey\n"
532541
"DevOps Engineering Manager\n"
533-
"MIT Office of Digital Learning\n"
534-
"https://engineering.odl.mit.edu\n"))
542+
"MIT Open Learning\n"
543+
"https://openlearning.mit.edu\n"))
535544
(mu4e-maildir-shortcuts .
536545
(("/mitodl/Inbox" . ?i)
537546
("/mitodl/Sent Items" . ?s)
@@ -550,8 +559,8 @@
550559
;; Don't ask to delete excess versions of files
551560
(defvar trim-versions-without-asking t)
552561

553-
(require 'ido)
554-
(ido-mode t)
562+
;; (require 'ido)
563+
;; (ido-mode t)
555564

556565
;; (setq evil-toggle-key "C-`")
557566
;; (define-key evil-normal-state-map (kbd "<remap> <evil-next-line>") 'evil-next-visual-line)

home/.emacs.d/functions.el

Lines changed: 32 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -446,4 +446,36 @@ This command calls python3's script 「2to3」. A backup will be generated by
446446

447447
(defun jcs-view-in-eww (msg)
448448
(eww-browse-url (concat "file://" (mu4e~write-body-to-html msg))))
449+
450+
451+
(defun find-next-unsafe-char (&optional coding-system)
452+
"Find the next character in the buffer that cannot be encoded by
453+
coding-system. If coding-system is unspecified, default to the coding
454+
system that would be used to save this buffer. With prefix argument,
455+
prompt the user for a coding system."
456+
(interactive "Zcoding-system: ")
457+
(if (stringp coding-system) (setq coding-system (intern coding-system)))
458+
(if coding-system nil
459+
(setq coding-system
460+
(or save-buffer-coding-system buffer-file-coding-system)))
461+
(let ((found nil) (char nil) (csets nil) (safe nil))
462+
(setq safe (coding-system-get coding-system 'safe-chars))
463+
;; some systems merely specify the charsets as ones they can encode:
464+
(setq csets (coding-system-get coding-system 'safe-charsets))
465+
(save-excursion
466+
;;(message "zoom to <")
467+
(let ((end (point-max))
468+
(here (point ))
469+
(char nil))
470+
(while (and (< here end) (not found))
471+
(setq char (char-after here))
472+
(if (or (eq safe t)
473+
(< char ?\177)
474+
(and safe (aref safe char))
475+
(and csets (memq (char-charset char) csets)))
476+
nil ;; safe char, noop
477+
(setq found (cons here char)))
478+
(setq here (1+ here))) ))
479+
(and found (goto-char (1+ (car found))))
480+
found))
449481
;;; functions.el ends here

0 commit comments

Comments
 (0)