fix emacs for newer version
This commit is contained in:
parent
26f029b6d5
commit
52632dc3c5
42
.emacs
42
.emacs
|
|
@ -3,16 +3,16 @@
|
|||
;; * Зонгор * ᛣᚩᛝᚩᚱ *
|
||||
;;------------------------------------------------------------------------------
|
||||
|
||||
(require 'package)
|
||||
(add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
|
||||
(add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t)
|
||||
(package-initialize)
|
||||
;; (require 'package)
|
||||
;; (add-to-list 'package-archives '("melpa" . "https://melpa.org/packages/") t)
|
||||
;; (add-to-list 'package-archives '("org" . "https://orgmode.org/elpa/") t)
|
||||
;; (package-initialize)
|
||||
|
||||
(when (not package-archive-contents)
|
||||
(package-refresh-contents))
|
||||
;; (when (not package-archive-contents)
|
||||
;; (package-refresh-contents))
|
||||
|
||||
(unless (package-installed-p 'use-package)
|
||||
(package-install 'use-package))
|
||||
;; (unless (package-installed-p 'use-package)
|
||||
;; (package-install 'use-package))
|
||||
|
||||
;; install packages automatically if not already present on your
|
||||
;; system to be global for all packages
|
||||
|
|
@ -231,7 +231,8 @@ If no region is active, convert the entire buffer."
|
|||
(global-set-key (kbd "C-s") 'ripgrep-regexp)
|
||||
(global-set-key (kbd "C-,") 'move-to-previous-window)
|
||||
(global-set-key (kbd "C-.") 'move-to-next-window)
|
||||
(global-set-key (kbd "M-i") 'xref-find-definitions)
|
||||
;; (global-set-key (kbd "M-i") 'xref-find-definitions)
|
||||
(global-set-key (kbd "M-i") 'dumb-jump-go)
|
||||
(global-set-key (kbd "C-M-i") 'xref-pop-marker-stack)
|
||||
|
||||
(evil-define-operator wrap-with-parens (beg end)
|
||||
|
|
@ -272,7 +273,8 @@ If no region is active, convert the entire buffer."
|
|||
(define-key evil-normal-state-map (kbd "J") 'forward-paragraph)
|
||||
(define-key evil-normal-state-map (kbd "C-x l") 'list-buffers)
|
||||
(define-key evil-normal-state-map (kbd "C-.") 'move-to-next-window)
|
||||
(define-key evil-normal-state-map (kbd "C-M-p") 'compile)
|
||||
;; (define-key evil-normal-state-map (kbd "C-M-p") 'compile)
|
||||
(define-key evil-normal-state-map (kbd "C-M-p") 'projectile-compile-project)
|
||||
(define-key evil-normal-state-map (kbd "M-/") 'dabbrev-expand)
|
||||
(define-key evil-normal-state-map (kbd "C-M-\\") 'format-all-buffer)
|
||||
(evil-define-key 'normal neotree-mode-map (kbd "TAB") 'neotree-enter)
|
||||
|
|
@ -303,8 +305,8 @@ If no region is active, convert the entire buffer."
|
|||
;; Global settings (defaults)
|
||||
(setq doom-themes-enable-bold t ; if nil, bold is universally disabled
|
||||
doom-themes-enable-italic t) ; if nil, italics is universally disabled
|
||||
;; (load-theme 'doom-monokai-classic t)
|
||||
(load-theme 'mazarbul t)
|
||||
(load-theme 'doom-monokai-classic t)
|
||||
;; (load-theme 'mazarbul t)
|
||||
;; Enable custom neotree theme (all-the-icons must be installed!)
|
||||
(doom-themes-neotree-config)
|
||||
;; Corrects (and improves) org-mode's native fontification.
|
||||
|
|
@ -683,24 +685,23 @@ Other buffer group by `centaur-tabs-get-group-name' with project name."
|
|||
(use-package lsp-mode
|
||||
:commands (lsp lsp-deferred)
|
||||
:ensure t
|
||||
:diminish lsp-mode
|
||||
:init
|
||||
(setq lsp-keymap-prefix "C-c l")
|
||||
(setq lsp-keymap-prefix "C-c l"))
|
||||
;;(add-to-list 'exec-path "/home/zongor/lib/elixir-ls")
|
||||
:hook
|
||||
(
|
||||
;; :hook
|
||||
;; (
|
||||
;; (elixir-mode . lsp)
|
||||
;;(rust-mode . lsp)
|
||||
(go-mode . lsp)))
|
||||
;; (go-mode . lsp)))
|
||||
|
||||
(use-package lsp-ui
|
||||
:hook (lsp-mode . lsp-ui-mode)
|
||||
:config
|
||||
(setq lsp-ui-doc-enable t))
|
||||
|
||||
(use-package ztl-mode
|
||||
(use-package undar-mode
|
||||
:straight
|
||||
(:host nil :repo "https://git.alfrescocavern.com/zongor/ztl-mode.git" :branch "main"))
|
||||
(:host nil :repo "https://git.alfrescocavern.com/zongor/undar-mode.git" :branch "main"))
|
||||
|
||||
;;(use-package sly
|
||||
;; :ensure t
|
||||
|
|
@ -727,6 +728,9 @@ Other buffer group by `centaur-tabs-get-group-name' with project name."
|
|||
;; 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.
|
||||
'(custom-safe-themes
|
||||
'("4d714a034e7747598869bef1104e96336a71c3d141fa58618e4606a27507db4c"
|
||||
default))
|
||||
'(inhibit-startup-screen t)
|
||||
'(neo-theme 'icons))
|
||||
(custom-set-faces
|
||||
|
|
|
|||
Loading…
Reference in New Issue