diff --git a/emacs/config.el b/emacs/config.el index c8b7b5f..86af8a9 100644 --- a/emacs/config.el +++ b/emacs/config.el @@ -183,6 +183,7 @@ (load-theme 'base16-oxocarbon-dark t)) (use-package nix-mode + :ensure t :mode "\\.nix\\'") (use-package rust-mode @@ -190,6 +191,11 @@ :mode "\\.rs\\'") (use-package envrc + :ensure t :hook (after-init . envrc-global-mode)) +(use-package qml-ts-mode + :ensure t + :mode "\\.qml\\'") + (provide 'config) diff --git a/emacs/mkEmacs.nix b/emacs/mkEmacs.nix index bbb319c..c4cef85 100644 --- a/emacs/mkEmacs.nix +++ b/emacs/mkEmacs.nix @@ -1,7 +1,13 @@ { pkgs, ... }: let mkEmacsPackage = - epkgs: pname: version: src: deps: + { + epkgs, + pname, + version, + src, + deps ? [ ], + }: epkgs.callPackage ( { trivialBuild }: trivialBuild { @@ -20,9 +26,9 @@ in alwaysEnsure = true; config = ./config.el; extraEmacsPackages = - e: + epkgs: builtins.attrValues { - inherit (e) + inherit (epkgs) spacious-padding nano-modeline orderless @@ -33,13 +39,16 @@ in consult embark embark-consult - base16-theme + base16-theme nix-mode rust-mode envrc ; - treesit-grammars = e.treesit-grammars.with-all-grammars; + treesit-grammars = epkgs.treesit-grammars.with-all-grammars; }; - override = _: prev: { use-package = prev.emacs; }; + override = _: prev: { + use-package = prev.emacs; + savehist = prev.emacs; + }; }; } diff --git a/flake.nix b/flake.nix index 2572cc8..ea12ba4 100644 --- a/flake.nix +++ b/flake.nix @@ -38,12 +38,16 @@ }; packages = { - pankomacs = mkEmacs (pkgs.emacs29-pgtk.override { - withSystemd = false; - }); - pankomacs-x11 = mkEmacs (pkgs.emacs-gtk.overide { - withSystemd = false; - }); + pankomacs = mkEmacs ( + pkgs.emacs29-pgtk.override { + withSystemd = false; + } + ); + pankomacs-x11 = mkEmacs ( + pkgs.emacs-gtk.overide { + withSystemd = false; + } + ); }; formatter = pkgs.nixfmt-rfc-style;