diff --git a/custom.el b/custom.el index 9d1adc2..fa7b6fc 100644 --- a/custom.el +++ b/custom.el @@ -3,11 +3,24 @@ ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. + '(conda-anaconda-home "~/opt/anaconda3") '(custom-safe-themes - '("29addd67feb95ca1179e60d476bb92c1f11835548e2efaec15c9ac6af2a8e6a8" "9b7a425c38c4894e161887c26381c2a6fc1de3c1407158507caaf469d76eb27b" "bce055e1681dd343659957710af77f7a6ad106677d42c61f86ebeedf637c4493" "f62c69472d3f506179d797131c014fe4095d9609dddf14542c50e0388f1e8d6d" "cf143bf23fa8160f87331893cdadc40b876556634621dfa373fcf93c4c97c444" "f459dfd377e9cb98d90e53383dcca7d73396cc0a22b31d39af24fb1cf3548fb5" "fcc14e1a22c99d77f7b1455b0c8a320f8afd0c1f4a9c5c50b45f676eb0c54ba2" "a6bae299481c3c0058e611d2c32ca169fa27203345a880806a5a8554cdd2e588" "feb9556e03558588e29e6659c8e01ea3d2a17a1e7a13e9bf9fc9e59cacba4b72" default))) + '("29addd67feb95ca1179e60d476bb92c1f11835548e2efaec15c9ac6af2a8e6a8" "9b7a425c38c4894e161887c26381c2a6fc1de3c1407158507caaf469d76eb27b" "bce055e1681dd343659957710af77f7a6ad106677d42c61f86ebeedf637c4493" "f62c69472d3f506179d797131c014fe4095d9609dddf14542c50e0388f1e8d6d" "cf143bf23fa8160f87331893cdadc40b876556634621dfa373fcf93c4c97c444" "f459dfd377e9cb98d90e53383dcca7d73396cc0a22b31d39af24fb1cf3548fb5" "fcc14e1a22c99d77f7b1455b0c8a320f8afd0c1f4a9c5c50b45f676eb0c54ba2" "a6bae299481c3c0058e611d2c32ca169fa27203345a880806a5a8554cdd2e588" "feb9556e03558588e29e6659c8e01ea3d2a17a1e7a13e9bf9fc9e59cacba4b72" default)) + '(python-shell-process-environment '("PYTHONBREAKPOINT="))) (custom-set-faces ;; custom-set-faces was added by Custom. ;; If you edit it by hand, you could mess it up, so be careful. ;; Your init file should contain only one such instance. ;; If there is more than one, they won't work right. - ) + '(company-preview ((t (:background "#000000" :foreground "#ffffff")))) + '(company-preview-common ((t (:inherit company-preview :foreground "#ff00cf")))) + '(company-preview-search ((t (:inherit company-preview :background "black")))) + '(company-scrollbar-bg ((t (:background "grey35")))) + '(company-scrollbar-fg ((t (:background "#a22390")))) + '(company-template-field ((t (:background "grey75" :foreground "black")))) + '(company-tooltip ((t (:background "#353535" :foreground "white")))) + '(company-tooltip-common ((t (:foreground "magenta")))) + '(company-tooltip-mouse ((t (:inherit company-tooltip-selection)))) + '(company-tooltip-search ((t (:inherit company-tooltip-selection)))) + '(company-tooltip-search-selection ((t (:inherit company-tooltip-selection)))) + '(company-tooltip-selection ((t (:background "#4584a2" :foreground "white"))))) diff --git a/init.el b/init.el index f3e1029..f51a368 100644 --- a/init.el +++ b/init.el @@ -113,6 +113,11 @@ ; Python (use-package company-jedi) +(defun my/python-mode-hook () + (add-to-list 'company-backends 'company-jedi)) + +(add-hook 'python-mode-hook 'my/python-mode-hook) + ; C related (use-package company-ctags) (use-package company-c-headers) @@ -135,6 +140,7 @@ (use-package org-contrib) (use-package org :config + (require 'org-ref) (require 'org-tempo) (tempo-define-template "Lab Template" '("#+TITLE: PHY324: LAB TITLE"n @@ -190,7 +196,8 @@ org-ref-default-bibliography '("~/Documents/Bibliography/references.bib") org-ref-pdf-directory "~/Documents/Bibliography/bibtex-pdfs/") ) - +(use-package ox-pandoc + :after org) ; PDF preview etc. (use-package pdf-tools)