foosinn/emacs.d
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

updates

Browse source
This commit is contained in:
Stefan Schwarz 2020-04-01 20:58:58 +02:00
parent 209204b7b6
commit 35f00faafb
1 changed files with 26 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

36
init.el
View file

@ -47,8 +47,8 @@
(use-package doom-modeline :ensure t (use-package doom-modeline :ensure t
:hook (after-init . doom-modeline-mode)) :hook (after-init . doom-modeline-mode))
(set-face-attribute 'default nil (set-face-attribute 'default nil
:family "Meslo LG S DZ" :family "Fira Code"
:height 105 :height 125
:weight 'normal :weight 'normal
:width 'normal) :width 'normal)
@ -73,7 +73,7 @@
(setq enable-recursive-minibuffers t) (setq enable-recursive-minibuffers t)
(setq ivy-re-builders-alist (setq ivy-re-builders-alist
'((swiper . ivy--regex-plus) '((swiper . ivy--regex-plus)
(t . ivy--regex-fuzzy))) (t . ivy--regex-plus)))
;; better movement ;; better movement
(define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line) (define-key ivy-minibuffer-map (kbd "C-j") 'ivy-next-line)
(define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line) (define-key ivy-minibuffer-map (kbd "C-k") 'ivy-previous-line)
@ -84,7 +84,7 @@
(ivy-mode 1) (ivy-mode 1)
(use-package ivy-xref :ensure t (use-package ivy-xref :ensure t
:init (if (< emacs-major-version 27) :init (if (< emacs-major-version 27)
(setq xref-show-xrefs-function #'ivy-xref-show-xrefs) (setq xref-show-xrefs-function #'ivy-xref-show-xrefs)
(setq xref-show-definitions-function #'ivy-xref-show-defs))) (setq xref-show-definitions-function #'ivy-xref-show-defs)))
(use-package ivy-rich :ensure t (use-package ivy-rich :ensure t
:config (ivy-rich-mode 1)) :config (ivy-rich-mode 1))
@ -109,6 +109,8 @@
) )
;; langs ;; langs
(use-package rust-mode :ensure t
:config (add-to-list 'auto-mode-alist '("\\.rs\\'" . rust-mode)))
(use-package go-mode :ensure t (use-package go-mode :ensure t
:config (add-to-list 'auto-mode-alist '("\\.go\\'" . go-mode))) :config (add-to-list 'auto-mode-alist '("\\.go\\'" . go-mode)))
(use-package yaml-mode :ensure t (use-package yaml-mode :ensure t
@ -118,9 +120,22 @@
) )
(use-package dockerfile-mode :ensure t (use-package dockerfile-mode :ensure t
:config (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode))) :config (add-to-list 'auto-mode-alist '("Dockerfile\\'" . dockerfile-mode)))
(use-package evil-org
:ensure t
:after org
:config
(add-hook 'org-mode-hook 'evil-org-mode)
(add-hook 'evil-org-mode-hook
(lambda ()
(evil-org-set-key-theme)))
(require 'evil-org-agenda)
(evil-org-agenda-set-keys))
;; code-with-fun ;; code-with-fun
(use-package company (use-package rainbow-mode :ensure t)
(use-package hl-todo :ensure t)
(use-package company :ensure t
:config :config
(global-company-mode 1) (global-company-mode 1)
(define-key company-active-map (kbd "C-n") 'company-select-next) (define-key company-active-map (kbd "C-n") 'company-select-next)
@ -132,7 +147,7 @@
company-require-match nil company-require-match nil
company-dabbrev-ignore-case nil company-dabbrev-ignore-case nil
company-dabbrev-downcase nil) company-dabbrev-downcase nil)
) )
(use-package lsp-mode :ensure t (use-package lsp-mode :ensure t
:commands (lsp lsp-deferred) :commands (lsp lsp-deferred)
:hook :hook
@ -141,6 +156,7 @@
(python-mode . lsp-deferred) (python-mode . lsp-deferred)
(javascript-mode . lsp-deferred) (javascript-mode . lsp-deferred)
(js-mode . lsp-deferred) (js-mode . lsp-deferred)
(rust-mode . lsp-deferred)
:config :config
(setq lsp-auto-configure t (setq lsp-auto-configure t
lsp-prefer-flymake nil lsp-prefer-flymake nil
@ -210,7 +226,7 @@
"fr" 'counsel-recentf "fr" 'counsel-recentf
"fR" 'rename-current-buffer-file "fR" 'rename-current-buffer-file
"fD" 'delete-current-buffer-file "fD" 'delete-current-buffer-file
"fc" 'copy-file' "fc" 'foo-copy-file'
;; Git ;; Git
"g" '(:ignore t :which-key "Magit") "g" '(:ignore t :which-key "Magit")
@ -391,7 +407,7 @@ initialized with the current directory instead of filename."
;; ?\a = C-g, ?\e = Esc and C-[ ;; ?\a = C-g, ?\e = Esc and C-[
((memq key '(?\a ?\e)) (keyboard-quit)))))))) ((memq key '(?\a ?\e)) (keyboard-quit))))))))
(defun copy-file () (defun foo-copy-file ()
"Write the file under new name." "Write the file under new name."
(interactive) (interactive)
(call-interactively 'write-file)) (call-interactively 'write-file))
@ -405,10 +421,10 @@ initialized with the current directory instead of filename."
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(custom-safe-themes '(custom-safe-themes
(quote (quote
("427fa665823299f8258d8e27c80a1481edbb8f5463a6fb2665261e9076626710" "614e5089876ea69b515c50b6d7fa0a37eb7ed50fda224623ec49e1c91a0af6a1" "93a0885d5f46d2aeac12bf6be1754faa7d5e28b27926b8aa812840fe7d0b7983" "b0fd04a1b4b614840073a82a53e88fe2abc3d731462d6fde4e541807825af342" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "ef4edbfc3ec509612f3cf82476beddd2aeb3da7bdc3a35726337a0cc838a4ef4" "a16e816774b437acb78beb9916a60ea236cfcd05784227a7d829623f8468c5a2" "8c847a5675ece40017de93045a28ebd9ede7b843469c5dec78988717f943952a" "e3c87e869f94af65d358aa279945a3daf46f8185f1a5756ca1c90759024593dd" "db10381a554231a40b7474eaac28bd58f05067faacce3b25d294bb179a3511a1" "34c99997eaa73d64b1aaa95caca9f0d64229871c200c5254526d0062f8074693" "868abc288f3afe212a70d24de2e156180e97c67ca2e86ba0f2bf9a18c9672f07" default))) ("ab9456aaeab81ba46a815c00930345ada223e1e7c7ab839659b382b52437b9ea" "f8c30fa07ba7e8fe884f22b428dae6724955fa61ad84a658c3b0164ae391fb52" "e838d6375a73fda607820c65eb3ea1f9336be7bd9a5528c9161e10c4aa663b5b" "4ea0aa360264ff861fb0212abe4161b83ad1d8c8b74d8a04bcd1baf0ebdceeae" "427fa665823299f8258d8e27c80a1481edbb8f5463a6fb2665261e9076626710" "614e5089876ea69b515c50b6d7fa0a37eb7ed50fda224623ec49e1c91a0af6a1" "93a0885d5f46d2aeac12bf6be1754faa7d5e28b27926b8aa812840fe7d0b7983" "b0fd04a1b4b614840073a82a53e88fe2abc3d731462d6fde4e541807825af342" "cdb3e7a8864cede434b168c9a060bf853eeb5b3f9f758310d2a2e23be41a24ae" "ef4edbfc3ec509612f3cf82476beddd2aeb3da7bdc3a35726337a0cc838a4ef4" "a16e816774b437acb78beb9916a60ea236cfcd05784227a7d829623f8468c5a2" "8c847a5675ece40017de93045a28ebd9ede7b843469c5dec78988717f943952a" "e3c87e869f94af65d358aa279945a3daf46f8185f1a5756ca1c90759024593dd" "db10381a554231a40b7474eaac28bd58f05067faacce3b25d294bb179a3511a1" "34c99997eaa73d64b1aaa95caca9f0d64229871c200c5254526d0062f8074693" "868abc288f3afe212a70d24de2e156180e97c67ca2e86ba0f2bf9a18c9672f07" default)))
'(package-selected-packages '(package-selected-packages
(quote (quote
(smartparens yaml-mode ivy-hydra ivy-rich evy use-package general evil avy)))) (rainbow-mode smartparens yaml-mode ivy-hydra ivy-rich evy use-package general evil avy))))
(custom-set-faces (custom-set-faces
;; custom-set-faces was added by Custom. ;; custom-set-faces was added by Custom.
;; If you edit it by hand, you could mess it up, so be careful. ;; If you edit it by hand, you could mess it up, so be careful.