config: replace nano-modeline with simple-modeline
This commit is contained in:
parent
7c3badaa42
commit
c6f69609cd
2 changed files with 9 additions and 39 deletions
21
config.el
21
config.el
|
@ -28,24 +28,8 @@
|
||||||
(enable-recursive-buffer t)
|
(enable-recursive-buffer t)
|
||||||
(read-extended-command-predicate #'command-completion-default-include-p)
|
(read-extended-command-predicate #'command-completion-default-include-p)
|
||||||
(tab-always-indent 'complete)
|
(tab-always-indent 'complete)
|
||||||
(mode-line-format nil)
|
|
||||||
:hook (prog-mode . display-line-numbers-mode))
|
: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
|
(use-package ivy
|
||||||
:custom
|
:custom
|
||||||
(ivy-use-virtual-buffers t)
|
(ivy-use-virtual-buffers t)
|
||||||
|
@ -112,8 +96,7 @@
|
||||||
(use-package tuareg
|
(use-package tuareg
|
||||||
:mode "\\.ml\\'")
|
:mode "\\.ml\\'")
|
||||||
|
|
||||||
(use-package nerd-icons
|
(use-package simple-modeline
|
||||||
:custom
|
:hook after-init)
|
||||||
(nerd-icons-font-family "Symbols Nerd Font Mono"))
|
|
||||||
|
|
||||||
(provide 'config)
|
(provide 'config)
|
||||||
|
|
27
lib.nix
27
lib.nix
|
@ -1,25 +1,13 @@
|
||||||
inputs:
|
inputs:
|
||||||
let
|
let
|
||||||
mkEmacsPackage =
|
|
||||||
{
|
|
||||||
epkgs,
|
|
||||||
pname,
|
|
||||||
version,
|
|
||||||
src,
|
|
||||||
deps ? (epkgs: [ ]),
|
|
||||||
}:
|
|
||||||
epkgs.trivialBuild {
|
|
||||||
inherit pname version src;
|
|
||||||
buildInputs = deps epkgs;
|
|
||||||
propagatedUserEnvPkgs = deps epkgs;
|
|
||||||
};
|
|
||||||
|
|
||||||
mkPankomacs =
|
mkPankomacs =
|
||||||
{
|
{
|
||||||
pkgs,
|
pkgs,
|
||||||
emacs,
|
emacs,
|
||||||
}:
|
}: let
|
||||||
(pkgs.appendOverlays [ inputs.emacs.overlays.default ]).emacsWithPackagesFromUsePackage {
|
pkgsWithEmacsOverlay = pkgs.appendOverlays [ inputs.emacs.overlays.default ];
|
||||||
|
in
|
||||||
|
pkgsWithEmacsOverlay.emacsWithPackagesFromUsePackage {
|
||||||
package = emacs;
|
package = emacs;
|
||||||
defaultInitFile = true;
|
defaultInitFile = true;
|
||||||
config = ./config.el;
|
config = ./config.el;
|
||||||
|
@ -28,7 +16,7 @@ let
|
||||||
builtins.attrValues {
|
builtins.attrValues {
|
||||||
inherit (epkgs)
|
inherit (epkgs)
|
||||||
spacious-padding
|
spacious-padding
|
||||||
nano-modeline
|
simple-modeline
|
||||||
ivy
|
ivy
|
||||||
counsel
|
counsel
|
||||||
swiper
|
swiper
|
||||||
|
@ -40,8 +28,7 @@ let
|
||||||
tuareg
|
tuareg
|
||||||
nushell-mode
|
nushell-mode
|
||||||
envrc
|
envrc
|
||||||
nerd-icons
|
;
|
||||||
;
|
|
||||||
treesit-grammars = epkgs.treesit-grammars.with-all-grammars;
|
treesit-grammars = epkgs.treesit-grammars.with-all-grammars;
|
||||||
};
|
};
|
||||||
override =
|
override =
|
||||||
|
@ -61,5 +48,5 @@ let
|
||||||
};
|
};
|
||||||
in
|
in
|
||||||
{
|
{
|
||||||
inherit mkPankomacs mkEmacsPackage;
|
inherit mkPankomacs;
|
||||||
}
|
}
|
||||||
|
|
Loading…
Add table
Add a link
Reference in a new issue