Skip to content

Commit

Permalink
feat: migrate to more built-in packages (#378)
Browse files Browse the repository at this point in the history
* 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
  • Loading branch information
terlar authored Jul 23, 2024
1 parent e0051e3 commit 74b8af6
Show file tree
Hide file tree
Showing 3 changed files with 15 additions and 200 deletions.
75 changes: 14 additions & 61 deletions init.org
Original file line number Diff line number Diff line change
Expand Up @@ -1231,14 +1231,6 @@ Manage "popups".
help-mode)))))))
#+end_src

Zoom a window to display as a single window temporarily.
#+begin_src emacs-lisp :tangle yes
(use-package zoom-window
:ensure t
:general
(:prefix window-prefix "z" 'zoom-window-zoom))
#+end_src

** Buffer
*** Cursor
#+begin_src emacs-lisp :tangle yes
Expand Down Expand Up @@ -1737,17 +1729,6 @@ Descriptive buffer names or project relative paths for buffer names.
(cl-pushnew #'epithet-relative-project-name epithet-suggesters :test #'equal))
#+end_src

*** hide-lines
Hide lines in buffer based on a regular expressions.
#+begin_src emacs-lisp :tangle yes
(use-package hide-lines
:ensure t
:commands
(hide-lines-matching)
:general
(:prefix search-prefix "H" 'hide-lines))
#+end_src

*** pairable
#+begin_src emacs-lisp :tangle yes
(use-package pairable :ensure t)
Expand Down Expand Up @@ -1865,6 +1846,13 @@ Striped dired buffers.
")" 'dired-git-info-mode))
#+end_src

** Isearch
#+begin_src emacs-lisp :tangle yes
(use-package isearch
:init
(setq isearch-lazy-count t))
#+end_src

** Occur
#+begin_src emacs-lisp :tangle yes
(use-package replace
Expand Down Expand Up @@ -1911,14 +1899,6 @@ Keep track of bookmarks
(setq bookmark-save-flag 1))
#+end_src

*** ctrlf
#+begin_src emacs-lisp :tangle yes
(use-package ctrlf
:ensure t
:hook
(after-init-hook . ctrlf-mode))
#+end_src

*** deadgrep
#+begin_src emacs-lisp :tangle yes
(use-package deadgrep
Expand Down Expand Up @@ -2073,7 +2053,7 @@ nothing happens."
(if compile-on-save-mode
(progn (make-local-variable 'after-save-hook)
(add-hook 'after-save-hook 'compile-on-save-start nil t))
(kill-local-variable 'after-save-hook)))
(remove-hook 'after-save-hook 'compile-on-save-start t)))

(make-variable-buffer-local 'compile-command)
:init
Expand Down Expand Up @@ -2818,7 +2798,7 @@ Improve readability of escape characters in regular expressions.
(setq org-log-done 'time)
(setq org-modules '(ol-info))
(setq org-special-ctrl-a/e t)

(setq org-confirm-babel-evaluate nil)
(setq org-edit-src-content-indentation 0)
(setq org-src-preserve-indentation nil)
Expand Down Expand Up @@ -3753,14 +3733,8 @@ Pretty check-boxes
** rst
#+begin_src emacs-lisp :tangle yes
(use-package rst
:preface
(defvar rst-adornment-regexp nil
"Regular expression to match adornments.")
:hook
(rst-mode-hook . auto-fill-mode)
:config
(setq rst-adornment-regexp
(concat "^[" rst-adornment-chars "]\\{3,\\}$")))
(rst-mode-hook . auto-fill-mode))
#+end_src

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

**** Heading
Hide heading adornments.
#+begin_src emacs-lisp :tangle yes
(defun +rst-hide-heading-adornment ()
"Hide heading adornment for `rst-mode'."
(interactive)
(hide-lines-matching rst-adornment-regexp))
(add-hook 'rst-mode-hook #'+rst-hide-heading-adornment)
#+end_src

**** Bullet lists
Pretty check-boxes as well as bullet lists.
#+begin_src emacs-lisp :tangle yes
Expand Down Expand Up @@ -3878,21 +3842,13 @@ Pretty check-boxes as well as bullet lists.

** rust
#+begin_src emacs-lisp :tangle yes
(use-package rustic
:ensure t
:mode
("\\.rs\\'" . rustic-mode)
(use-package rust-ts-mode
:mode "\\.rs\\'"
:hook
(rustic-mode-hook . eglot-ensure)
:general
(:keymaps
'rustic-mode-map
:prefix local-leader-key
"t" 'rustic-cargo-test)
(rust-ts-mode-hook . eglot-ensure)
:init
(setq rustic-lsp-client 'eglot)
(with-eval-after-load 'org
(cl-pushnew '("rust" . rustic) org-src-lang-modes :test #'equal)))
(cl-pushnew '("rust" . rust-ts-mode) org-src-lang-modes :test #'equal)))
#+end_src

** scala
Expand Down Expand Up @@ -4391,7 +4347,6 @@ I am trying to reduce the amount of custom keybindings, therefore I present a ta
- apheleia
- consult
- corfu
- ctrlf (deprecate?)
- deadgrep
- defrepeater
- dtrt-indent
Expand Down Expand Up @@ -4463,7 +4418,6 @@ I am trying to reduce the amount of custom keybindings, therefore I present a ta
- visual-replace
- vterm
- ws-butler (deprecate?)
- zoom-window (deprecate C-x 1)

**** Full
- bibliothek
Expand Down Expand Up @@ -4492,7 +4446,6 @@ I am trying to reduce the amount of custom keybindings, therefore I present a ta
- groovy-mode
- guess-language
- haskell-mode
- hide-lines (deprecate?)
- hl-todo
- inf-crystal
- inf-ruby
Expand Down
104 changes: 1 addition & 103 deletions lock/flake.lock

Some generated files are not rendered by default. Learn more about how customized files appear on GitHub.

36 changes: 0 additions & 36 deletions lock/flake.nix
Original file line number Diff line number Diff line change
Expand Up @@ -139,12 +139,6 @@
repo = "emacs-crystal-mode";
type = "github";
};
ctrlf = {
flake = false;
owner = "radian-software";
repo = "ctrlf";
type = "github";
};
d2-mode = {
flake = false;
owner = "andorsk";
Expand Down Expand Up @@ -432,12 +426,6 @@
repo = "helpful";
type = "github";
};
hide-lines = {
flake = false;
owner = "vapniks";
repo = "hide-lines";
type = "github";
};
hide-mode-line = {
flake = false;
owner = "hlissner";
Expand Down Expand Up @@ -851,18 +839,6 @@
repo = "rspec-mode";
type = "github";
};
rust-mode = {
flake = false;
owner = "rust-lang";
repo = "rust-mode";
type = "github";
};
rustic = {
flake = false;
owner = "emacs-rustic";
repo = "rustic";
type = "github";
};
"s" = {
flake = false;
owner = "magnars";
Expand Down Expand Up @@ -1024,18 +1000,6 @@
repo = "ws-butler";
type = "github";
};
xterm-color = {
flake = false;
owner = "atomontage";
repo = "xterm-color";
type = "github";
};
zoom-window = {
flake = false;
owner = "emacsorphanage";
repo = "zoom-window";
type = "github";
};
};
outputs = { ... }: { };
}

0 comments on commit 74b8af6

Please sign in to comment.