maciej/emacs
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Add undo-tree package

Browse source
This commit is contained in:
Maciej 2020-11-27 21:20:11 +02:00
parent 81c60f404d
commit affdeb52fe
Signed by: maciej
GPG key ID: 41D62D42D3B0D765
4 changed files with 18 additions and 2 deletions
Download patch file Download diff file Expand all files Collapse all files

2
init.el
View file

@ -64,7 +64,7 @@
;; Your init file should contain only one such instance. ;; Your init file should contain only one such instance.
;; If there is more than one, they won't work right. ;; If there is more than one, they won't work right.
'(package-selected-packages '(package-selected-packages
'(helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package)) '(undo-tree helpful lsp-haskell dashboard fsharp-mode dash-at-point racer racer-mode flycheck-rust rust-mode haskell-mode dune which-key erlang gitignore-mode yaml-mode nginx-mode ansible terraform-mode dockerfile-mode reason-mode merlin tuareg clj-refactor cider clojure-mode elixir-mode js2-mode web-mode enh-ruby-mode ruby-end rspec-mode planet-theme flatui-theme base16-theme smart-mode-line lsp-ui lsp-mode deft counsel-projectile flycheck company yasnippet-snippets yasnippet visual-regexp column-enforce-mode rainbow-mode rainbow-delimiters magit hydra counsel keyfreq exec-path-from-shell buffer-move use-package))
'(safe-local-variable-values '(safe-local-variable-values
'((haskell-process-use-ghci . t) '((haskell-process-use-ghci . t)
(haskell-indent-spaces . 4)))) (haskell-indent-spaces . 4))))

12
pkg/base.el
View file

@ -155,6 +155,18 @@
(keyfreq-mode t) (keyfreq-mode t)
(keyfreq-autosave-mode t) (keyfreq-autosave-mode t)
;;;;;;;;;;;;;;;;; Use more advanced undo options
(use-package undo-tree
:defer t
:ensure t
:config (setq-default
;; Show diff
undo-tree-visualizer-diff t
;; Show timestamps
undo-tree-visualizer-timestamps t))
(global-undo-tree-mode t)
;;;;;;;;;;;;;;;;; Show hints about key combinations ;;;;;;;;;;;;;;;;; Show hints about key combinations
(use-package which-key (use-package which-key
:defer t :defer t

3
pkg/hydra.el
View file

@ -43,7 +43,7 @@ _d_: Deft _c_: Invalidate cache
^^^^^^^^----------------------------------------------------------------------- ^^^^^^^^-----------------------------------------------------------------------
_c_: Comment line _y_: Yasnippet _c_: Comment line _y_: Yasnippet
_r_: Regex replace _m_: Company _r_: Regex replace _m_: Company
_i_: Indent region _i_: Indent region _u_: Undo tree
_a_: Align regexp _a_: Align regexp
_e_: Eval region _e_: Eval region
_s_: Swiper _s_: Swiper
@ -57,6 +57,7 @@ _s_: Swiper
("e" eval-region) ("e" eval-region)
("s" swiper) ("s" swiper)
("u" undo-tree-visualize)
("y" company-yasnippet) ("y" company-yasnippet)
("m" company-complete)) ("m" company-complete))

3
themes/themes.el
View file

@ -46,8 +46,11 @@
(defun set-font-to-screen () (defun set-font-to-screen ()
"Automatically set font size to suit the monitor." "Automatically set font size to suit the monitor."
(interactive) (interactive)
;; If display is set to emulate FullHD resultion or less, make the font
;; smaller.
(if (>= 1080 (x-display-pixel-height)) (if (>= 1080 (x-display-pixel-height))
(set-font "Hack" 13) (set-font "Hack" 13)
;; Else, set to default size.
(set-font "Hack" 16))) (set-font "Hack" 16)))
;; Do it automatically on startup ;; Do it automatically on startup