summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMatthew Lemon <lemon@matthewlemon.com>2019-12-27 16:24:47 +0000
committerMatthew Lemon <lemon@matthewlemon.com>2019-12-27 16:24:47 +0000
commit84b25b7e38e36becb29c56fa9f58f56717f2d814 (patch)
treeb3600aa3c2801fc6ca05e8715ed10d922f755e1c
parent530bd977aeca63a72195d51c666bbc140af74bc0 (diff)
python-pytest package installed and Dump Jump enhanced
Diffstat (limited to '')
-rw-r--r--custom-settings.el2
-rw-r--r--init.el14
2 files changed, 14 insertions, 2 deletions
diff --git a/custom-settings.el b/custom-settings.el
index 46d1440..8750113 100644
--- a/custom-settings.el
+++ b/custom-settings.el
@@ -68,7 +68,7 @@
'(org-sort-agenda-notime-is-late nil)
'(package-selected-packages
(quote
- (password-store 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)))
+ (python-pytest password-store 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 2707a12..f24b6fe 100644
--- a/init.el
+++ b/init.el
@@ -272,7 +272,14 @@
;; Dump Jump
(use-package dumb-jump
- :bind ("C-M-." . dumb-jump-go))
+ :bind (("M-g o" . dumb-jump-go-other-window)
+ ("M-g j" . dumb-jump-go)
+ ("M-g b" . dumb-jump-back)
+ ("M-g i" . dumb-jump-go-prompt)
+ ("M-g x" . dumb-jump-go-prefer-external)
+ ("M-g z" . dumb-jump-go-prefer-external-other-window))
+ :config (setq dumb-jump-selector 'ivy)
+ :ensure)
;; GUI stuff
(scroll-bar-mode -1)
@@ -709,6 +716,11 @@
(setq elpy-modules (delq 'elpy-module-flymake elpy-modules))
(add-hook 'elpy-mode-hook 'flycheck-mode)))
+(use-package python-pytest
+ :bind
+ ("C-c ESC t" . python-pytest-popup)
+ )
+
;; Go programming
(use-package lsp-mode
:hook (go-mode . lsp-deferred)