Compare commits

..

No commits in common. "0e2bfb07b3e6fa0e5399b0675cd213afa7d003e5" and "cd7de3db22305e0b65c5877b041d584d5530d5fa" have entirely different histories.

8 changed files with 1 additions and 61 deletions

View File

@ -63,20 +63,9 @@
;; Consult adds a bunch of completing-read based utilities ;; Consult adds a bunch of completing-read based utilities
(use-package consult (use-package consult
:commands (consult-xref)
:init
(setq xref-show-xrefs-function #'consult-xref
xref-show-definitions-function #'consult-xref)
:custom
(consult-project-root-function #'projectile-project-root)
:general :general
([remap switch-to-buffer] #'consult-buffer) ([remap switch-to-buffer] #'consult-buffer)
([remap imenu] #'consult-imenu) ([remap imenu] #'consult-imenu)
("C-c p" #'consult-yank)) ("C-c p" #'consult-yank))
(use-package consult-flycheck
:after flycheck
:general
(flycheck-command-map "!" #'consult-flycheck))
(provide 'init-completion) (provide 'init-completion)

View File

@ -79,10 +79,4 @@
:general :general
("C-c o" #'olivetti-mode)) ("C-c o" #'olivetti-mode))
;; Multiple cursors
(use-package evil-multiedit
:defer 2
:config
(evil-multiedit-default-keybinds))
(provide 'init-editing) (provide 'init-editing)

View File

@ -18,12 +18,6 @@
"|" "|"
"DONE(d)" "DONE(d)"
"CANCELLED(c)"))) "CANCELLED(c)")))
(org-capture-templates `(("l" "Lola task" entry
(file+headline ,(expand-file-name "~/org/todo.org") "Lola")
"* TODO %i%?")
("p" "Personal task" entry
(file+headline ,(expand-file-name "~/org/todo.org") "Personal")
"* TODO %i%?")))
(org-return-follows-link t) (org-return-follows-link t)
(org-ellipsis "") (org-ellipsis "")
(org-src-fontify-natively t) (org-src-fontify-natively t)

View File

@ -2,7 +2,6 @@
;; Project management ;; Project management
(use-package projectile (use-package projectile
:commands (projectile-project-root)
:config :config
(projectile-mode 1) (projectile-mode 1)
(leader-def-key "p" '(projectile-command-map :which-key "projectile")) (leader-def-key "p" '(projectile-command-map :which-key "projectile"))

View File

@ -53,12 +53,4 @@
:general :general
(python-mode-map "C-c C-d" #'lsp-describe-thing-at-point)) (python-mode-map "C-c C-d" #'lsp-describe-thing-at-point))
;; isort to sort Python imports
(use-package py-isort
:commands (py-isort-buffer py-isort-region)
:config
(setq py-isort-options '("-m=3"))
:general
(python-mode-map "C-c C-i" #'py-isort-buffer))
(provide 'init-python) (provide 'init-python)

View File

@ -186,7 +186,6 @@
:general :general
(leader-map "\"" #'run-command) (leader-map "\"" #'run-command)
(run-command-term-minor-mode-map [remap recompile] #'run-command-term-recompile) (run-command-term-minor-mode-map [remap recompile] #'run-command-term-recompile)
(normal run-command-term-minor-mode-map "gr" #'run-command-term-recompile)
:custom :custom
(run-command-run-method 'async-shell) (run-command-run-method 'async-shell)
(run-command-recipes '(run-command-recipe-terraform (run-command-recipes '(run-command-recipe-terraform

View File

@ -43,8 +43,7 @@
"PIPENV_VERBOSITY" "PIPENV_DONT_LOAD_ENV" "PIPENV_VERBOSITY" "PIPENV_DONT_LOAD_ENV"
"PIPENV_MAX_DEPTH" "PYENV_ROOT" "KOPS_STATE_STORE" "PIPENV_MAX_DEPTH" "PYENV_ROOT" "KOPS_STATE_STORE"
"PLAID_CLIENT_ID" "PLAID_SECRET" "PLAID_ENVIRONMENT")) "PLAID_CLIENT_ID" "PLAID_SECRET" "PLAID_ENVIRONMENT"))
(exec-path-from-shell-check-startup-files nil) (exec-path-from-shell-check-startup-files nil))
(exec-path-from-shell-arguments '("-l")))
;; Don't use this file as the custom-file ;; Don't use this file as the custom-file

View File

@ -1,26 +0,0 @@
if [ -d ~/lola ];
then
export LOLA_HOME=~/lola/lola-server
export MODELS_HOME=~/lola/models
export LOLA_TRAVEL_SERVICE_HOME=~/lola/lola-travel-service
fi
export LEDGER_FILE="$HOME/journal.ledger"
export PATH="$HOME/bin/":"$HOME/.local/bin":"$HOME/.gem/ruby/2.6.0/bin":"$HOME/.gem/ruby/2.5.0/bin":"$HOME/go/bin":"/opt/local/bin":"$PATH"
EDITOR="$(which emacsclient)"
export EDITOR
export PATH="$HOME/.cargo/bin:$PATH"
export NVM_DIR="$HOME/.nvm"
export WORKON_HOME="$HOME/.local/share/virtualenvs"
GPG_TTY=$(tty)
export GPG_TTY
if [ -d /Applications/Postgres.app ];
then
export PATH=/Applications/Postgres.app/Contents/Versions/latest/bin:"$PATH"
fi