From 290ed2ea96f667249c9d08fb08ac7db5a05536e8 Mon Sep 17 00:00:00 2001 From: Artur Manuel Date: Tue, 25 Feb 2025 20:34:43 +0000 Subject: [PATCH] feat(packages): add some base packages --- config.el | 2 +- flake.nix | 6 ++++++ lib.nix | 15 +++++++++------ 3 files changed, 16 insertions(+), 7 deletions(-) diff --git a/config.el b/config.el index 59b66d1..e59b959 100644 --- a/config.el +++ b/config.el @@ -45,7 +45,7 @@ (use-package base16-theme :init - (load-theme 'base16-nord t)) + (load-theme 'base16-everforest-dark-hard t)) (use-package nix-mode :mode "\\.nix\\'") diff --git a/flake.nix b/flake.nix index 194056e..5d1f2bd 100644 --- a/flake.nix +++ b/flake.nix @@ -25,6 +25,12 @@ perSystem = {pkgs, ...}: { formatter = pkgs.alejandra; + packages = { + pgtk = inputs.self.lib.mkEmacs { + inherit pkgs; + emacs = pkgs.emacs30-pgtk; + }; + }; }; }; } diff --git a/lib.nix b/lib.nix index dbf1221..8fecdd1 100644 --- a/lib.nix +++ b/lib.nix @@ -30,22 +30,25 @@ (epkgs) spacious-padding mood-line - which-key helm base16-theme nix-mode rust-mode haskell-mode envrc - eat vterm ; treesit-grammars = epkgs.treesit-grammars.with-all-grammars; }; - override = _: prev: { - use-package = prev.emacs; - savehist = prev.emacs; - }; + override = _: prev: + builtins.listToAttrs (map (name: { + inherit name; + value = prev.emacs; + }) [ + "use-package" + "savehist" + "which-key" + ]); }; in { inherit mkEmacs mkEmacsPackage;