bunch of org, clojure stuff, fix lots of bugs
This commit is contained in:
parent
0edecaf151
commit
4bebee0cc6
3 changed files with 58 additions and 21 deletions
26
+bindings.el
26
+bindings.el
|
@ -174,7 +174,7 @@ private/hlissner/snippets."
|
|||
:desc "M-x" :nv ":" #'execute-extended-command
|
||||
:desc "Pop up scratch buffer" :nv "x" #'doom/open-scratch-buffer
|
||||
:desc "Org Capture" :nv "X" #'org-capture
|
||||
:desc "Org Capture" :nv "a" #'+org-capture/open
|
||||
:desc "Org Capture" :nv "a" #'org-capture
|
||||
|
||||
;; Most commonly used
|
||||
:desc "Find file in project" :n "SPC" #'projectile-find-file
|
||||
|
@ -886,13 +886,6 @@ private/hlissner/snippets."
|
|||
:i "C-e" #'doom/forward-to-last-non-comment-or-eol
|
||||
:i "C-u" #'doom/backward-kill-to-bol-and-indent
|
||||
|
||||
;; textmate-esque newline insertion
|
||||
:i [M-return] #'evil-open-below
|
||||
:i [S-M-return] #'evil-open-above
|
||||
;; textmate-esque deletion
|
||||
[M-backspace] #'doom/backward-kill-to-bol-and-indent
|
||||
:i [backspace] #'delete-backward-char
|
||||
:i [M-backspace] #'doom/backward-kill-to-bol-and-indent
|
||||
;; Emacsien motions for insert mode
|
||||
:i "C-b" #'backward-word
|
||||
:i "C-f" #'forward-word
|
||||
|
@ -908,8 +901,7 @@ private/hlissner/snippets."
|
|||
(:after org
|
||||
(:map org-mode-map
|
||||
:i [remap doom/inflate-space-maybe] #'org-self-insert-command
|
||||
:i "C-e" #'org-end-of-line
|
||||
:i "C-a" #'org-beginning-of-line))
|
||||
))
|
||||
|
||||
;; Restore common editing keys (and ESC) in minibuffer
|
||||
(:map (minibuffer-local-map
|
||||
|
@ -920,7 +912,7 @@ private/hlissner/snippets."
|
|||
evil-ex-completion-map
|
||||
evil-ex-search-keymap
|
||||
read-expression-map)
|
||||
[escape] #'abort-recursive-edit
|
||||
;; [escape] #'abort-recursive-edit
|
||||
"C-r" #'evil-paste-from-register
|
||||
"C-a" #'move-beginning-of-line
|
||||
"C-w" #'doom/minibuffer-kill-word
|
||||
|
@ -1087,4 +1079,14 @@ private/hlissner/snippets."
|
|||
:desc "Add require to ns" :n "n r" 'cljr-add-require-to-ns))
|
||||
(:map cider-repl-mode-map
|
||||
:n "g \\" 'cider-switch-to-last-clojure-buffer))
|
||||
)
|
||||
|
||||
(:after w3m
|
||||
(:map w3m-mode-map
|
||||
"/" 'evil-search-forward
|
||||
"?" 'evil-search-backward))
|
||||
|
||||
(:after org
|
||||
(:map org-mode-map
|
||||
[remap counsel-imenu] #'counsel-org-goto
|
||||
(:localleader
|
||||
:n "g" #'counsel-org-goto))))
|
||||
|
|
39
config.el
39
config.el
|
@ -356,7 +356,9 @@
|
|||
org-default-notes-file (concat org-directory "/inbox.org")
|
||||
+org-default-todo-file (concat org-directory "/inbox.org")
|
||||
org-agenda-files (list (expand-file-name "~/notes"))
|
||||
org-refile-targets '((org-agenda-files :maxlevel . 1))
|
||||
org-refile-targets '((org-agenda-files :maxlevel . 3))
|
||||
org-outline-path-complete-in-steps nil
|
||||
org-refile-use-outline-path t
|
||||
org-file-apps `((auto-mode . emacs)
|
||||
(,(rx (or (and "." (optional "x") (optional "htm") (optional "l") buffer-end)
|
||||
(and buffer-start "http" (optional "s") "://")))
|
||||
|
@ -376,6 +378,7 @@
|
|||
org-hidden-keywords '(title)
|
||||
org-tags-column -130
|
||||
org-ellipsis "⤵"
|
||||
org-imenu-depth 9
|
||||
org-capture-templates
|
||||
`(("t" "Todo" entry
|
||||
(file+headline +org-default-todo-file "Inbox")
|
||||
|
@ -385,13 +388,13 @@
|
|||
|
||||
("n" "Notes" entry
|
||||
(file+headline +org-default-notes-file "Inbox")
|
||||
"* %u %?\n%i"
|
||||
"* %U %?\n%i"
|
||||
:prepend t
|
||||
:kill-buffer t)
|
||||
|
||||
("c" "Task note" entry
|
||||
(clock)
|
||||
"* %u %?\n%i[[%l][Context]]\n"
|
||||
"* %U %?\n%i[[%l][Context]]\n"
|
||||
:kill-buffer t
|
||||
:unnarrowed t)
|
||||
|
||||
|
@ -405,7 +408,9 @@
|
|||
org-agenda-skip-scheduled-if-deadline-is-shown 'todo
|
||||
org-agenda-custom-commands
|
||||
'(("p" "Sprint Tasks" tags-todo "sprint")
|
||||
("i" "Inbox" tags "inbox")))
|
||||
("i" "Inbox" tags "inbox")
|
||||
("r" "Running jobs" todo "RUNNING")))
|
||||
|
||||
(set-face-foreground 'org-block +solarized-s-base00)
|
||||
(add-hook! org-mode
|
||||
(add-hook! evil-normal-state-entry-hook
|
||||
|
@ -627,6 +632,8 @@
|
|||
('npm ".test")
|
||||
(otherwise (projectile-test-suffix project-type)))))
|
||||
|
||||
(setq projectile-create-missing-test-files 't)
|
||||
|
||||
(defun magit-commit-wip ()
|
||||
(interactive)
|
||||
(magit-commit '("-m" "wip")))
|
||||
|
@ -707,7 +714,7 @@
|
|||
(require 'whitespace)
|
||||
(setq whitespace-style '(face lines-tail))
|
||||
(global-whitespace-mode t)
|
||||
(add-hook! 'org-mode-hook (lambda () (whitespace-mode -1)))
|
||||
(add-hook 'org-mode-hook (lambda () (whitespace-mode -1)) t)
|
||||
|
||||
(set-face-foreground 'whitespace-line +solarized-red)
|
||||
(set-face-attribute 'whitespace-line nil :underline 't)
|
||||
|
@ -829,7 +836,9 @@
|
|||
(PATCH 2)
|
||||
(DELETE 2)
|
||||
(context 2)
|
||||
(checking 3)))
|
||||
(checking 3)
|
||||
(match 1)
|
||||
(domonad 0)))
|
||||
|
||||
(def-package! flycheck-clojure
|
||||
:disabled t
|
||||
|
@ -851,3 +860,21 @@
|
|||
:hook
|
||||
(sql-mode-hook . sqlup-mode)
|
||||
(sql-interactive-mode-hook . sqlup-mode))
|
||||
|
||||
(def-package! yapfify
|
||||
:hook
|
||||
(python-mode-hook . yapf-mode))
|
||||
|
||||
(def-package! w3m
|
||||
:hook
|
||||
(setq browse-url-browser-function 'w3m-browse-url))
|
||||
|
||||
(def-package! ob-http
|
||||
:config
|
||||
(add-to-list 'org-babel-load-languages '(http . t)))
|
||||
|
||||
(def-package! ob-ipython
|
||||
:config
|
||||
(add-to-list 'org-babel-load-languages '(ipython . t))
|
||||
(setq ob-ipython-command
|
||||
"/home/griffin/code/urb/ciml-video-classifier/bin/jupyter"))
|
||||
|
|
14
packages.el
14
packages.el
|
@ -11,13 +11,18 @@
|
|||
:recipe (general
|
||||
:fetcher github
|
||||
:repo "noctuid/general.el"))
|
||||
(package! fill-column-indicator)
|
||||
(package! writeroom-mode)
|
||||
(package! dash)
|
||||
(package! w3m)
|
||||
|
||||
;;; Org
|
||||
(package! org-clubhouse
|
||||
:recipe (org-clubhouse
|
||||
:fetcher file
|
||||
:path "~/code/urb/org-clubhouse"))
|
||||
(package! fill-column-indicator)
|
||||
(package! writeroom-mode)
|
||||
(package! dash)
|
||||
(package! ob-http)
|
||||
(package! ob-ipython)
|
||||
|
||||
;; Presentation
|
||||
(package! epresent)
|
||||
|
@ -79,3 +84,6 @@
|
|||
|
||||
;; SQL
|
||||
(package! sqlup-mode)
|
||||
|
||||
;;; Python
|
||||
(package! yapfify)
|
||||
|
|
Loading…
Reference in a new issue