diff --git a/config.el b/config.el index 60cee69..27e87ce 100644 --- a/config.el +++ b/config.el @@ -28,24 +28,8 @@ (enable-recursive-buffer t) (read-extended-command-predicate #'command-completion-default-include-p) (tab-always-indent 'complete) - (mode-line-format nil) :hook (prog-mode . display-line-numbers-mode)) -(use-package nano-modeline - :hook ((prog-mode . nano-modeline-prog-mode) - (text-mode . nano-modeline-text-mode) - (org-mode . nano-modeline-org-mode) - (pdf-view-mode . nano-modeline-pdf-mode) - (mu4e-headers-mode . nano-modeline-mu4e-headers-mode) - (mu4e-view-mode . nano-modeline-mu4e-message-mode) - (elfeed-show-mode . nano-modeline-elfeed-entry-mode) - (elfeed-search-mode . nano-modeline-elfeed-search-mode) - (term-mode . nano-modeline-term-mode) - (xwidget-webkit-mode . nano-modeline-xwidget-mode) - (messages-buffer-mode . nano-modeline-message-mode) - (org-capture-mode . nano-modeline-org-capture-mode) - (org-agenda-mode . nano-modeline-org-agenda-mode))) - (use-package ivy :custom (ivy-use-virtual-buffers t) @@ -112,8 +96,7 @@ (use-package tuareg :mode "\\.ml\\'") -(use-package nerd-icons - :custom - (nerd-icons-font-family "Symbols Nerd Font Mono")) +(use-package simple-modeline + :hook after-init) (provide 'config) diff --git a/lib.nix b/lib.nix index 9f5fb61..87a8a0b 100644 --- a/lib.nix +++ b/lib.nix @@ -1,25 +1,13 @@ inputs: let - mkEmacsPackage = - { - epkgs, - pname, - version, - src, - deps ? (epkgs: [ ]), - }: - epkgs.trivialBuild { - inherit pname version src; - buildInputs = deps epkgs; - propagatedUserEnvPkgs = deps epkgs; - }; - mkPankomacs = { pkgs, emacs, - }: - (pkgs.appendOverlays [ inputs.emacs.overlays.default ]).emacsWithPackagesFromUsePackage { + }: let + pkgsWithEmacsOverlay = pkgs.appendOverlays [ inputs.emacs.overlays.default ]; + in + pkgsWithEmacsOverlay.emacsWithPackagesFromUsePackage { package = emacs; defaultInitFile = true; config = ./config.el; @@ -28,7 +16,7 @@ let builtins.attrValues { inherit (epkgs) spacious-padding - nano-modeline + simple-modeline ivy counsel swiper @@ -40,8 +28,7 @@ let tuareg nushell-mode envrc - nerd-icons - ; + ; treesit-grammars = epkgs.treesit-grammars.with-all-grammars; }; override = @@ -61,5 +48,5 @@ let }; in { - inherit mkPankomacs mkEmacsPackage; + inherit mkPankomacs; }