Skip to content

Commit 74b8af6

Browse files
authored
feat: migrate to more built-in packages (#378)
* feat: use isearch instead of ctrlf * fix: ensure compile on save only removes itself * feat: remove hide-lines package * feat: remove zoom-window package * feat: remove rustic-mode package
1 parent e0051e3 commit 74b8af6

File tree

3 files changed

+15
-200
lines changed

3 files changed

+15
-200
lines changed

init.org

+14-61
Original file line numberDiff line numberDiff line change
@@ -1231,14 +1231,6 @@ Manage "popups".
12311231
help-mode)))))))
12321232
#+end_src
12331233

1234-
Zoom a window to display as a single window temporarily.
1235-
#+begin_src emacs-lisp :tangle yes
1236-
(use-package zoom-window
1237-
:ensure t
1238-
:general
1239-
(:prefix window-prefix "z" 'zoom-window-zoom))
1240-
#+end_src
1241-
12421234
** Buffer
12431235
*** Cursor
12441236
#+begin_src emacs-lisp :tangle yes
@@ -1737,17 +1729,6 @@ Descriptive buffer names or project relative paths for buffer names.
17371729
(cl-pushnew #'epithet-relative-project-name epithet-suggesters :test #'equal))
17381730
#+end_src
17391731

1740-
*** hide-lines
1741-
Hide lines in buffer based on a regular expressions.
1742-
#+begin_src emacs-lisp :tangle yes
1743-
(use-package hide-lines
1744-
:ensure t
1745-
:commands
1746-
(hide-lines-matching)
1747-
:general
1748-
(:prefix search-prefix "H" 'hide-lines))
1749-
#+end_src
1750-
17511732
*** pairable
17521733
#+begin_src emacs-lisp :tangle yes
17531734
(use-package pairable :ensure t)
@@ -1865,6 +1846,13 @@ Striped dired buffers.
18651846
")" 'dired-git-info-mode))
18661847
#+end_src
18671848

1849+
** Isearch
1850+
#+begin_src emacs-lisp :tangle yes
1851+
(use-package isearch
1852+
:init
1853+
(setq isearch-lazy-count t))
1854+
#+end_src
1855+
18681856
** Occur
18691857
#+begin_src emacs-lisp :tangle yes
18701858
(use-package replace
@@ -1911,14 +1899,6 @@ Keep track of bookmarks
19111899
(setq bookmark-save-flag 1))
19121900
#+end_src
19131901

1914-
*** ctrlf
1915-
#+begin_src emacs-lisp :tangle yes
1916-
(use-package ctrlf
1917-
:ensure t
1918-
:hook
1919-
(after-init-hook . ctrlf-mode))
1920-
#+end_src
1921-
19221902
*** deadgrep
19231903
#+begin_src emacs-lisp :tangle yes
19241904
(use-package deadgrep
@@ -2073,7 +2053,7 @@ nothing happens."
20732053
(if compile-on-save-mode
20742054
(progn (make-local-variable 'after-save-hook)
20752055
(add-hook 'after-save-hook 'compile-on-save-start nil t))
2076-
(kill-local-variable 'after-save-hook)))
2056+
(remove-hook 'after-save-hook 'compile-on-save-start t)))
20772057

20782058
(make-variable-buffer-local 'compile-command)
20792059
:init
@@ -2818,7 +2798,7 @@ Improve readability of escape characters in regular expressions.
28182798
(setq org-log-done 'time)
28192799
(setq org-modules '(ol-info))
28202800
(setq org-special-ctrl-a/e t)
2821-
2801+
28222802
(setq org-confirm-babel-evaluate nil)
28232803
(setq org-edit-src-content-indentation 0)
28242804
(setq org-src-preserve-indentation nil)
@@ -3753,14 +3733,8 @@ Pretty check-boxes
37533733
** rst
37543734
#+begin_src emacs-lisp :tangle yes
37553735
(use-package rst
3756-
:preface
3757-
(defvar rst-adornment-regexp nil
3758-
"Regular expression to match adornments.")
37593736
:hook
3760-
(rst-mode-hook . auto-fill-mode)
3761-
:config
3762-
(setq rst-adornment-regexp
3763-
(concat "^[" rst-adornment-chars "]\\{3,\\}$")))
3737+
(rst-mode-hook . auto-fill-mode))
37643738
#+end_src
37653739

37663740
*** Appearance
@@ -3773,16 +3747,6 @@ Use variable-pitch font but still make sure everything aligns.
37733747
'append)
37743748
#+end_src
37753749

3776-
**** Heading
3777-
Hide heading adornments.
3778-
#+begin_src emacs-lisp :tangle yes
3779-
(defun +rst-hide-heading-adornment ()
3780-
"Hide heading adornment for `rst-mode'."
3781-
(interactive)
3782-
(hide-lines-matching rst-adornment-regexp))
3783-
(add-hook 'rst-mode-hook #'+rst-hide-heading-adornment)
3784-
#+end_src
3785-
37863750
**** Bullet lists
37873751
Pretty check-boxes as well as bullet lists.
37883752
#+begin_src emacs-lisp :tangle yes
@@ -3878,21 +3842,13 @@ Pretty check-boxes as well as bullet lists.
38783842

38793843
** rust
38803844
#+begin_src emacs-lisp :tangle yes
3881-
(use-package rustic
3882-
:ensure t
3883-
:mode
3884-
("\\.rs\\'" . rustic-mode)
3845+
(use-package rust-ts-mode
3846+
:mode "\\.rs\\'"
38853847
:hook
3886-
(rustic-mode-hook . eglot-ensure)
3887-
:general
3888-
(:keymaps
3889-
'rustic-mode-map
3890-
:prefix local-leader-key
3891-
"t" 'rustic-cargo-test)
3848+
(rust-ts-mode-hook . eglot-ensure)
38923849
:init
3893-
(setq rustic-lsp-client 'eglot)
38943850
(with-eval-after-load 'org
3895-
(cl-pushnew '("rust" . rustic) org-src-lang-modes :test #'equal)))
3851+
(cl-pushnew '("rust" . rust-ts-mode) org-src-lang-modes :test #'equal)))
38963852
#+end_src
38973853

38983854
** scala
@@ -4391,7 +4347,6 @@ I am trying to reduce the amount of custom keybindings, therefore I present a ta
43914347
- apheleia
43924348
- consult
43934349
- corfu
4394-
- ctrlf (deprecate?)
43954350
- deadgrep
43964351
- defrepeater
43974352
- dtrt-indent
@@ -4463,7 +4418,6 @@ I am trying to reduce the amount of custom keybindings, therefore I present a ta
44634418
- visual-replace
44644419
- vterm
44654420
- ws-butler (deprecate?)
4466-
- zoom-window (deprecate C-x 1)
44674421

44684422
**** Full
44694423
- bibliothek
@@ -4492,7 +4446,6 @@ I am trying to reduce the amount of custom keybindings, therefore I present a ta
44924446
- groovy-mode
44934447
- guess-language
44944448
- haskell-mode
4495-
- hide-lines (deprecate?)
44964449
- hl-todo
44974450
- inf-crystal
44984451
- inf-ruby

lock/flake.lock

+1-103
Some generated files are not rendered by default. Learn more about customizing how changed files appear on GitHub.

lock/flake.nix

-36
Original file line numberDiff line numberDiff line change
@@ -139,12 +139,6 @@
139139
repo = "emacs-crystal-mode";
140140
type = "github";
141141
};
142-
ctrlf = {
143-
flake = false;
144-
owner = "radian-software";
145-
repo = "ctrlf";
146-
type = "github";
147-
};
148142
d2-mode = {
149143
flake = false;
150144
owner = "andorsk";
@@ -432,12 +426,6 @@
432426
repo = "helpful";
433427
type = "github";
434428
};
435-
hide-lines = {
436-
flake = false;
437-
owner = "vapniks";
438-
repo = "hide-lines";
439-
type = "github";
440-
};
441429
hide-mode-line = {
442430
flake = false;
443431
owner = "hlissner";
@@ -851,18 +839,6 @@
851839
repo = "rspec-mode";
852840
type = "github";
853841
};
854-
rust-mode = {
855-
flake = false;
856-
owner = "rust-lang";
857-
repo = "rust-mode";
858-
type = "github";
859-
};
860-
rustic = {
861-
flake = false;
862-
owner = "emacs-rustic";
863-
repo = "rustic";
864-
type = "github";
865-
};
866842
"s" = {
867843
flake = false;
868844
owner = "magnars";
@@ -1024,18 +1000,6 @@
10241000
repo = "ws-butler";
10251001
type = "github";
10261002
};
1027-
xterm-color = {
1028-
flake = false;
1029-
owner = "atomontage";
1030-
repo = "xterm-color";
1031-
type = "github";
1032-
};
1033-
zoom-window = {
1034-
flake = false;
1035-
owner = "emacsorphanage";
1036-
repo = "zoom-window";
1037-
type = "github";
1038-
};
10391003
};
10401004
outputs = { ... }: { };
10411005
}

0 commit comments

Comments
 (0)