diff options
| -rw-r--r-- | user/emacs/init.el | 17 | ||||
| -rw-r--r-- | user/settings/emacs.nix | 20 |
2 files changed, 37 insertions, 0 deletions
diff --git a/user/emacs/init.el b/user/emacs/init.el index fe6e202a..9d6ec4e5 100644 --- a/user/emacs/init.el +++ b/user/emacs/init.el @@ -75,7 +75,12 @@ (when (or (daemonp) window-system) + (use-package doom-themes + :config (progn + (load-theme 'doom-one-light :noconfirm) + (doom-themes-org-config))) (use-package stimmung-themes + :disable t :config (progn (require 'stimmung-themes-light-theme) (let ((light-mode-theme 'stimmung-themes-light) @@ -130,6 +135,11 @@ (let ((foreground (face-attribute 'font-lock-comment-face :foreground))) (set-face-attribute 'doom-modeline-buffer-modified nil :foreground foreground)))) +(use-package solaire-mode + :defer 1 + :config (progn + (solaire-global-mode +1))) + (when (eq system-type 'darwin) (add-to-list 'default-frame-alist '(ns-transparent-titlebar . t)) (add-to-list 'default-frame-alist '(ns-appearance . 'light))) @@ -167,6 +177,13 @@ (add-hook 'evil-insert-state-entry-hook #'noct-absolute) (add-hook 'evil-insert-state-exit-hook #'noct-relative) +(use-package ultra-scroll + :defer 1 + :config (progn + (setq scroll-margin 0 + scroll-conservatively 101) + (ultra-scroll-mode +1))) + ;;; Encoding (setq-default bidi-paragraph-direction 'left-to-right diff --git a/user/settings/emacs.nix b/user/settings/emacs.nix index e6114e2a..a99a792e 100644 --- a/user/settings/emacs.nix +++ b/user/settings/emacs.nix @@ -84,6 +84,7 @@ in crux dired-git-info docker-compose-mode + doom-themes dtrt-indent envrc editorconfig @@ -145,6 +146,7 @@ in quickrun rainbow-mode rainbow-delimiters + solaire-mode ssh-deploy svelte-mode stimmung-themes @@ -159,6 +161,7 @@ in treesit-grammars.with-all-grammars treesit-auto try + ultra-scroll vc-msg vertico vertico-prescient @@ -169,6 +172,23 @@ in yasnippet-capf ]); overrides = self: super: { + ultra-scroll = self.melpaBuild rec { + pname = "ultra-scroll"; + version = "0.3.1"; + + src = pkgs.fetchFromGitHub { + owner = "jdtsmith"; + repo = pname; + rev = "2e3b9997ae1a469e878feaa0af23a23685a0fbed"; + hash = "sha256-9+3T5tXPRuRtENt/Rr0Ss3LZJlTOwpGePbREqofN2j0="; + }; + + meta = { + homepage = "https://github.com/jdtsmith/ultra-scroll"; + description = "scroll emacs like lightning"; + license = pkgs.lib.licenses.gpl3; + }; + }; apheleia = self.melpaPackages.apheleia.overrideAttrs (old: { patchPhase = '' |