Changeset 9294741 in dotfiles

Timestamp:

Jan 30, 2020, 7:14:41 PM (5 years ago)

Author:

Mikhail Kirillov <w96k@…>

Branches:

master

Children:

d6209df

Parents:

1b1a5176

Message:

Update config for python

Location:

emacs

Files:

• .emacs (modified) (2 diffs)
• .emacs-config.org (modified) (8 diffs)

emacs/.emacs

@@ -32 +32 @@
 (require 'bind-key)
 
- (use-package exec-path-from-shell
-   :config
-   (when (memq window-system '(mac ns x))
-     (exec-path-from-shell-initialize)
-     (exec-path-from-shell-copy-env "PATH")))
+(use-package exec-path-from-shell
+  :config
+  (when (memq window-system '(mac ns x))
+    (exec-path-from-shell-copy-env "PATH")
+    (exec-path-from-shell-copy-env "PYTHONPATH")
+    (exec-path-from-shell-initialize)))
+
+(setq python-shell-interpreter "/home/w96k/.guix-profile/bin/python3")
 
 (org-babel-load-file "~/.emacs-config.org")
@@ -47 +50 @@
  '(package-selected-packages
    (quote
-    (pos-tip keycast org-mime flycheck-lilypond flymd epresent org-journal intero vue-mode js2-mode company-anaconda anaconda-mode mwim yasnippet-snippets column-enforce-mode swiper ivy browse-kill-ring git-gutter+ magit-gitflow magit aggressive-indent mood-line color-theme-sanityinc-tomorrow auto-package-update use-package))))
+    (pos-tip yasnippet-snippets vue-mode use-package swiper org-mime org-journal mwim mood-line magit-gitflow keycast js2-mode intero git-gutter+ flymd flycheck-lilypond epresent company-anaconda column-enforce-mode color-theme-sanityinc-tomorrow browse-kill-ring auto-package-update aggressive-indent))))
 (custom-set-faces
  ;; custom-set-faces was added by Custom.

emacs/.emacs-config.org

@@ -147 +147 @@
 #+END_SRC
 ** Поиск (ivy + swiper + councel)
-
-# #+BEGIN_SRC emacs-lisp
-# (use-package ido
-#     :config
-#     (setq ido-enable-flex-matching t)
-#     (setq ido-everywhere t)
-#     (setq ido-use-ilename-at-point 'guess)
-#     (ido-mode))
-# #+END_SRC
-
-# #+BEGIN_SRC emacs-lisp
-# (use-package ido-vertical-mode
-#   :config
-#   (ido-vertical-mode)
-#   (setq ido-vertical-define-keys 'C-n-and-C-p-only))
-# #+END_SRC
-
-# #+BEGIN_SRC emacs-lisp
-#   (use-package ido-completing-read+
-#     :after ido
-#     :config
-#     (ido-ubiquitous-mode))
-# #+END_SRC
-
-# #+BEGIN_SRC emacs-lisp
-# (use-package smex
-#   :init (smex-initialize)
-#   :bind 
-#   ("M-x" . smex)
-#   ("M-X" . smex-major-mode-commands)
-#   :ensure t)
-# #+END_SRC
 
 #+BEGIN_SRC emacs-lisp
@@ -216 +184 @@
 ** Автодополнение
 #+BEGIN_SRC emacs-lisp
-;;(use-package pos-tip)
+(use-package pos-tip
+  :ensure t)
 
 (use-package company
@@ -233 +202 @@
 
 (use-package company-quickhelp
-  :after company 
+  :after company pos-tip
   :config (company-quickhelp-mode))
 #+END_SRC
@@ -345 +314 @@
   :ensure
   :hook (python-mode . anaconda-mode)
-  :config (setq python-shell-interpreter "python3"))
+  (python-mode . anaconda-eldoc-mode))
 #+END_SRC
 *** Автодополнение
@@ -352 +321 @@
   :ensure
   :after company
-  :config (add-to-list 'company-backends '(company-anaconda :with company-capf)))
+  :config
+  (add-to-list 'company-backends '(company-anaconda :with company-capf)))
 #+END_SRC
 *** Документация
@@ -361 +331 @@
   :config (setq pydoc-command "python3 -m pydoc"))
 #+END_SRC
-*** Статический анализ
-#+BEGIN_SRC emacs-lisp
-(use-package company-jedi
-  :after company
-  :hook (python-mode . enable-jedi)
-  :config  (add-to-list 'company-backends 'company-jedi))
-#+END_SRC
+
+# *** Статический анализ
+# #+BEGIN_SRC emacs-lisp
+#   (use-package company-jedi
+#     :after company epc
+#     :hook (python-mode . enable-jedi)
+#     :config 
+#   (add-to-list 'company-backends 'company-jedi)
+#   (defvar jedi-config:with-virtualenv nil)
+#   (defvar jedi-config:use-system-python t)
+#   (jedi:install-server))
+# #+END_SRC
 ** Javascript
 *** Основной мод
@@ -549 +524 @@
 (setq-default confirm-nonexistent-file-or-buffer t)
 #+END_SRC
+*** Уничтожать текущий буфер
+#+BEGIN_SRC emacs-lisp
+(global-set-key (kbd "C-x C-k") 'kill-this-buffer)
+#+END_SRC
 *** Спрашивать покороче
     Не спрашивать yes/no, вместо этого спрашивать y/n
@@ -599 +578 @@
   scroll-step 1
   scroll-conservatively 10000
-  scroll-preserve-screen-position 10)
+  scroll-preserve-screen-position 100)
 #+END_SRC
 ** Системные пакеты