Use emacsUnstable from emacs-overlay

It has been updated to Emacs 29
This commit is contained in:
Erwin Boskma 2023-05-12 15:06:44 +02:00
parent 4320823d8e
commit 3afbd263c4
Signed by: erwin
SSH key fingerprint: SHA256:3F6Cm6I3erRqlBwEghZWAQl6eS5WrGTX1Vs/Evec1lQ
3 changed files with 23 additions and 21 deletions

View file

@ -101,10 +101,9 @@ LSP responses can be rather large, in the 800KiB - 3MiB range. 2MiB is a decent
** Package sources
Add repositories where packages are installed from. Setting =package-enable-at-startup= to =nil= prevents a second package load and improves startup time
Add repositories where packages are installed from.
#+begin_src emacs-lisp
(setq package-enable-at-startup nil)
(setq package-archives '(("gnu" . "https://elpa.gnu.org/packages/")
("nongnu" . "https://elpa.nongnu.org/nongnu/")
("melpa" . "https://melpa.org/packages/")
@ -497,14 +496,15 @@ Add a dashboard on startup
[[https://github.com/tarsius/minions][minions]] adds a menu for minor modes to the modeline
#+begin_src emacs-lisp
(use-package minions
:hook
(doom-modeline-mode . minions-mode))
(use-package minions
:config
(minions-mode 1))
#+end_src
Use [[https://github.com/seagle0128/doom-modeline][doom-modeline]] for a nice and fancy modeline
*2023-05-12* Disabled because it causes emacs to hang
#+begin_src emacs-lisp
#+begin_src emacs-lisp :tangle no
(use-package doom-modeline
:init
(doom-modeline-mode 1)
@ -524,6 +524,17 @@ Use [[https://github.com/seagle0128/doom-modeline][doom-modeline]] for a nice an
(mode-line-inactive ((t (:height 0.85)))))
#+end_src
[[https://github.com/tarsius/moody][moody]] cleans up the modeline a bit so it is nicer to look at
#+begin_src emacs-lisp
(use-package moody
:config
(setq x-underline-at-descent-line t)
(moody-replace-mode-line-buffer-identification)
(moody-replace-vc-mode)
(moody-replace-eldoc-minibuffer-message-function))
#+end_src
** Command completion
*** Ivy / Counsel

View file

@ -43,20 +43,9 @@ in
emacs = {
enable = true;
# package = with pkgs; ((emacsPackagesFor emacsPgtk).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
package =
let
emacs29 = pkgs.emacsPgtk.overrideAttrs (_: {
version = "29.0.90+git93005cd9dc2b";
src = pkgs.fetchFromSavannah {
repo = "emacs";
rev = "93005cd9dc2bab882e66ac7b81f593cd6c021e43";
sha256 = "uIndq8ra9Zv2FVzk/FpVnz0NYKR3kfT8wnjssRpmZLQ=";
};
});
in
emacs29.override {
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
};
package = pkgs.emacsUnstablePgtk.override {
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
};
daemon = true;
};

View file

@ -38,7 +38,9 @@ in
emacs = {
enable = true;
# package = with pkgs; ((emacsPackagesFor emacsUnstable).emacsWithPackages (epkgs: [ epkgs.emacsql epkgs.emacsql-sqlite ]));
package = pkgs.emacs;
package = pkgs.emacsUnstable.override {
treeSitterPlugins = builtins.attrValues (filterAttrs (_: isDerivation) pkgs.tree-sitter-grammars);
};
daemon = true;
};
firefox = {