diff --git a/core/core-defuns.el b/core/core-defuns.el index a5569059f..61e3d6733 100644 --- a/core/core-defuns.el +++ b/core/core-defuns.el @@ -223,18 +223,17 @@ to abort the minibuffer." (let (message-log-max) (if (and delete-selection-mode transient-mark-mode mark-active) (setq deactivate-mark t) - ;; (when (get-buffer "*Completions*") - ;; (delete-windows-on "*Completions*")) (abort-recursive-edit)))) (defun narf-reload () - "Reload `load-path', in case you updated cask while emacs was open!" - (interactive) - (setq load-path (append (list narf-private-dir narf-core-dir narf-modules-dir narf-packages-dir) - (f-directories narf-core-dir nil t) - (f-directories narf-modules-dir nil t) - (f-directories narf-packages-dir) - narf--load-path))) + "Reload `load-path', in case you updated cask while emacs was open!" + (interactive) + (setq load-path (append (list narf-private-dir narf-core-dir narf-modules-dir narf-packages-dir) + (f-directories narf-core-dir nil t) + (f-directories narf-modules-dir nil t) + (f-directories narf-packages-dir) + (f-directories (expand-file-name "../bootstrap" narf-packages-dir)) + narf--load-path))) (provide 'core-defuns) ;;; core-defuns.el ends here diff --git a/core/core-project.el b/core/core-project.el index 781441e70..8382491ee 100644 --- a/core/core-project.el +++ b/core/core-project.el @@ -97,23 +97,23 @@ (evil-set-initial-state 'neotree-mode 'motion) (add-hook! neotree-mode 'narf|neotree-init-keymap) (defun narf|neotree-init-keymap () - (map! (:map evil-motion-state-local-map - "ESC" 'neotree-hide - [escape] 'neotree-hide - "q" 'neotree-hide + (map! :map evil-motion-state-local-map + "ESC" 'neotree-hide + [escape] 'neotree-hide + "q" 'neotree-hide - "RET" 'neotree-enter - "J" 'neotree-select-next-sibling-node - "K" 'neotree-select-previous-sibling-node - "H" 'neotree-select-up-node - "L" 'neotree-select-down-node - "v" 'neotree-enter-vertical-split - "s" 'neotree-enter-horizontal-split - "c" 'neotree-create-node - "d" 'neotree-delete-node - "g" 'neotree-refresh - "r" 'neotree-rename-node - "R" 'neotree-change-root))) + "RET" 'neotree-enter + "J" 'neotree-select-next-sibling-node + "K" 'neotree-select-previous-sibling-node + "H" 'neotree-select-up-node + "L" 'neotree-select-down-node + "v" 'neotree-enter-vertical-split + "s" 'neotree-enter-horizontal-split + "c" 'neotree-create-node + "d" 'neotree-delete-node + "g" 'neotree-refresh + "r" 'neotree-rename-node + "R" 'neotree-change-root)) (after! projectile (setq projectile-switch-project-action 'neotree-projectile-action)) diff --git a/modules/defuns/defuns-python.el b/modules/defuns/defuns-python.el index 9db69cfaf..05cea2b24 100644 --- a/modules/defuns/defuns-python.el +++ b/modules/defuns/defuns-python.el @@ -7,5 +7,9 @@ (local-set-key [escape] 'anaconda-nav-quit) (local-set-key [?\C-g] 'anaconda-nav-quit))) +;;;###autoload +(defun narf/inf-python () + (run-python python-shell-interpreter t t)) + (provide 'defuns-python) ;;; defuns-python.el ends here diff --git a/modules/module-python.el b/modules/module-python.el index 16cb3936d..dac7f2670 100644 --- a/modules/module-python.el +++ b/modules/module-python.el @@ -8,36 +8,17 @@ (define-docset! python-mode "py,py3,python") (add-hook! python-mode '(emr-initialize narf|flycheck-enable-maybe)) (setq-default - python-indent-offset 4 python-environment-directory narf-temp-dir python-shell-interpreter "ipython") :config (define-env-command! python-mode "python --version 2>&1 | cut -d' ' -f2") - (define-repl! python-mode narf-inf-python) - - (defun narf-inf-python () - (run-python python-shell-interpreter t t)) + (define-repl! python-mode narf/inf-python) ;; interferes with smartparens (define-key python-mode-map (kbd "DEL") nil) - (use-package nose - :commands nose-mode - :preface (defvar nose-mode-map (make-sparse-keymap)) - :init - (associate! nose-mode :match "/test_.+\\.py\\'") - :config - (map! :map nose-mode-map - (:localleader - :n "tr" 'nosetests-again - :n "ta" 'nosetests-all - :n "ts" 'nosetests-one - :n "tv" 'nosetests-module - :n "tA" 'nosetests-pdb-all - :n "tO" 'nosetests-pdb-one - :n "tV" 'nosetests-pdb-module))) - (use-package anaconda-mode + :defer t :defines (anaconda-mode-map anaconda-nav-mode-map) :functions (anaconda-mode-running-p) :init @@ -63,12 +44,28 @@ (not (use-region-p)) (not (sp-point-in-string-or-comment))))) (emr-declare-command (intern (format "anaconda-mode-%s" (symbol-name command-name))) - :title title :modes 'python-mode :predicate predicate))) + :title title :modes 'python-mode :predicate predicate))) '((show-doc "view documentation" t) (find-assignments "find assignments" t) (find-definitions "find definitions" t) (find-file "find assignments" t) (find-references "show usages" nil)))))) +(use-package nose + :commands nose-mode + :preface (defvar nose-mode-map (make-sparse-keymap)) + :init + (associate! nose-mode :match "/test_.+\\.py\\'") + :config + (map! :map nose-mode-map + (:localleader + :n "tr" 'nosetests-again + :n "ta" 'nosetests-all + :n "ts" 'nosetests-one + :n "tv" 'nosetests-module + :n "tA" 'nosetests-pdb-all + :n "tO" 'nosetests-pdb-one + :n "tV" 'nosetests-pdb-module))) + (provide 'module-python) ;;; module-python.el ends here diff --git a/modules/module-rust.el b/modules/module-rust.el index 62f77b160..914ea5150 100644 --- a/modules/module-rust.el +++ b/modules/module-rust.el @@ -7,7 +7,7 @@ (define-builder! toml-mode "cargo run" "Cargo.toml") (use-package flycheck-rust - :config (add-hook! rust-mode 'flycheck-mode)) + :config (add-hook 'rust-mode-hook 'flycheck-mode)) (use-package racer :preface diff --git a/private/my-bindings.el b/private/my-bindings.el index 1d4095178..593fcd212 100644 --- a/private/my-bindings.el +++ b/private/my-bindings.el @@ -159,8 +159,7 @@ (:prefix "x" :n "." 'narf/org-find-file :n "/" 'narf/org-find-file-in-notes - :n "e" 'narf/org-find-exported-file - )) + :n "e" 'narf/org-find-exported-file)) (:localleader :n "\\" 'narf/neotree