diff options
Diffstat (limited to '.emacs.d/init.el')
| -rw-r--r-- | .emacs.d/init.el | 43 |
1 files changed, 26 insertions, 17 deletions
diff --git a/.emacs.d/init.el b/.emacs.d/init.el index 1bdee80..508c8e6 100644 --- a/.emacs.d/init.el +++ b/.emacs.d/init.el @@ -1,4 +1,3 @@ -;;Test 3 (require 'package) (setq package-archives '(("melpa" . "https://melpa.org/packages/") @@ -78,18 +77,18 @@ (use-package ivy :diminish :bind (("C-s" . swiper) - :map ivy-minibuffer-map - ("TAB" . ivy-alt-done) - ("C-l" . ivy-alt-done) - ("C-j" . ivy-next-line) - ("C-k" . ivy-previous-line) - :map ivy-switch-buffer-map - ("C-k" . ivy-previous-line) - ("C-l" . ivy-done) - ("C-d" . ivy-switch-buffer-kill) - :map ivy-reverse-i-search-map - ("C-k" . ivy-previous-line) - ("C-d" . ivy-reverse-i-search-kill)) + :map ivy-minibuffer-map + ("TAB" . ivy-alt-done) + ("C-l" . ivy-alt-done) + ("C-j" . ivy-next-line) + ("C-k" . ivy-previous-line) + :map ivy-switch-buffer-map + ("C-k" . ivy-previous-line) + ("C-l" . ivy-done) + ("C-d" . ivy-switch-buffer-kill) + :map ivy-reverse-i-search-map + ("C-k" . ivy-previous-line) + ("C-d" . ivy-reverse-i-search-kill)) :config (ivy-mode 1)) @@ -99,8 +98,9 @@ (use-package counsel :bind (("C-M-j" . 'counsel-switch-buffer) - :map minibuffer-local-map - ("C-r" . 'counsel-minibuffer-history)) + :map minibuffer-local-map + ("C-r" . 'counsel-minibuffer-history) + ("C-'" . 'counsel-find-file)) :config (counsel-mode 1)) @@ -147,7 +147,7 @@ (evil-global-set-key 'motion "k" 'evil-previous-visual-line) (evil-set-initial-state 'messages-buffer-mode 'normal) - ;; (evil-set-initial-state 'dashboard-mode 'normal) + (evil-set-initial-state 'dashboard-mode 'normal) (evil-define-key 'normal dired-mode-map (kbd "h") 'dired-up-directory (kbd "l") 'dired-find-file @@ -162,11 +162,17 @@ (evil-collection-init)) ;;Ibuffer (global-set-key (kbd "C-x C-b") 'ibuffer) +;;Counsel +(global-set-key (kbd "M-;") 'counsel-M-x) +(global-set-key (kbd "C-;") 'counsel-find-file) (apollo/leader-keys "g" '(:ignore t :which-key "Git") "gs" '(magit-status :which-key "status")) +(apollo/leader-keys +"f" '(counsel-find-file :which-key "Find File")) + (defun apollo/org-mode-setup () (setq evil-auto-indent nil) (apollo/org-theme-dracula)) @@ -303,7 +309,8 @@ :init (setq lsp-keymap-prefix "C-c l") ;; Or 'C-l', 's-l' :config - (lsp-enable-which-key-integration t)) + (lsp-enable-which-key-integration t) + ) (use-package lsp-ui :hook (lsp-mode . lsp-ui-mode) @@ -351,6 +358,8 @@ (use-package pyvenv :config (pyvenv-mode 1)) +;;set PATH of pyls +(setq lsp-pyls-server-command "/home/apollo/.local/bin/pylsp") (use-package company :after lsp-mode |