joachim/dotfiles
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

update .emacs

Browse source
This commit is contained in:
joachimschmidt557 2021-09-09 14:22:54 +02:00
parent afc10d425a
commit cfef16253c
No known key found for this signature in database
GPG key ID: E0B575BE2884ACC5
1 changed files with 42 additions and 22 deletions
Download patch file Download diff file Expand all files Collapse all files

64
emacs.el
View file

@ -61,10 +61,13 @@
(straight-use-package 'smartparens) (straight-use-package 'smartparens)
(straight-use-package 'rainbow-delimiters) (straight-use-package 'rainbow-delimiters)
(straight-use-package 'hl-todo) (straight-use-package 'hl-todo)
(straight-use-package 'counsel) ;; (straight-use-package 'counsel)
(straight-use-package 'selectrum)
(straight-use-package 'consult)
(straight-use-package 'marginalia)
(straight-use-package 'company) (straight-use-package 'company)
;; (straight-use-package 'eglot) ;; (straight-use-package 'eglot)
(straight-use-package 'lsp-mode) ;; (straight-use-package 'lsp-mode)
(straight-use-package 'speed-type) (straight-use-package 'speed-type)
(straight-use-package 'magit) (straight-use-package 'magit)
(straight-use-package 'restart-emacs) (straight-use-package 'restart-emacs)
@ -81,6 +84,8 @@
(global-unset-key (kbd "C-z")) (global-unset-key (kbd "C-z"))
;; (set-face-attribute 'default nil :height 140) ;; (set-face-attribute 'default nil :height 140)
(setq use-package-compute-statistics t)
(use-package display-line-numbers-mode (use-package display-line-numbers-mode
:hook (prog-mode text-mode conf-mode)) :hook (prog-mode text-mode conf-mode))
@ -95,6 +100,11 @@
(use-package nix-mode (use-package nix-mode
:mode "\\.nix\\'") :mode "\\.nix\\'")
(use-package zig-mode
:custom
(zig-format-show-buffer nil)
(zig-zig-bin "~/src/zig/build/zig"))
;; (use-package promela-mode ;; (use-package promela-mode
;; :mode "\\.pml\\'") ;; :mode "\\.pml\\'")
@ -128,16 +138,29 @@
(use-package hl-todo-mode (use-package hl-todo-mode
:hook prog-mode) :hook prog-mode)
(use-package ivy ;; (use-package ivy
;; :init
;; (ivy-mode 1)
;; ;; (setq ivy-use-virtual-buffers t)
;; (counsel-mode 1)
;; :bind (("C-c i" . counsel-imenu)
;; ("C-x M-r" . counsel-rg)
;; ("C-x M-f" . counsel-fzf)
;; ("C-x C-r" . counsel-recentf)
;; ("C-c C-r" . ivy-resume)))
(use-package selectrum
:init :init
(ivy-mode 1) (ido-mode nil)
;; (setq ivy-use-virtual-buffers t) (selectrum-mode t))
(counsel-mode 1)
:bind (("C-c i" . counsel-imenu) (use-package consult
("C-x M-r" . counsel-rg) :bind (("C-c i" . consult-imenu)
("C-x M-f" . counsel-fzf) ("C-x b" . consult-buffer)))
("C-x C-r" . counsel-recentf)
("C-c C-r" . ivy-resume))) (use-package marginalia
:init
(marginalia-mode 1))
(use-package company (use-package company
:config :config
@ -149,17 +172,14 @@
;; :config ;; :config
;; (add-to-list 'eglot-server-programs '(zig-mode . ("~/src/zls/zig-cache/bin/zls")))) ;; (add-to-list 'eglot-server-programs '(zig-mode . ("~/src/zls/zig-cache/bin/zls"))))
(use-package lsp ;; (use-package lsp
:config ;; :config
(add-to-list 'lsp-language-id-configuration '(zig-mode . "zig")) ;; (add-to-list 'lsp-language-id-configuration '(zig-mode . "zig"))
(lsp-register-client ;; (lsp-register-client
(make-lsp-client ;; (make-lsp-client
:new-connection (lsp-stdio-connection "~/src/zls/zig-out/bin/zls") ;; :new-connection (lsp-stdio-connection "~/src/zls/zig-out/bin/zls")
:major-modes '(zig-mode) ;; :major-modes '(zig-mode)
:server-id 'zls))) ;; :server-id 'zls)))
(use-package magit
:bind (("C-M-g" . magit)))
(use-package ace-window (use-package ace-window
:config :config