aciceri/nixfleet
1
0
Fork 0
Code Issues Pull requests 1 Projects Releases Packages Wiki Activity Actions

Support extra packages again

Browse source
This commit is contained in:
Andrea Ciceri 2024-11-08 10:21:49 +01:00
parent e671f7a375
commit a0f97d1a10
Signed by: aciceri
SSH key fingerprint: SHA256:/AagBweyV4Hlfg9u092n8hbHwD5fcB6A3qhDiDA65Rg
1 changed files with 28 additions and 29 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

57
packages/emacs/packages.nix
View file

@ -2,13 +2,33 @@ pkgs: epkgs:
let let
inherit (epkgs) melpaPackages nongnuPackages elpaPackages; inherit (epkgs) melpaPackages nongnuPackages elpaPackages;
# *Attrset* containig extra emacs packages from flake inputs buildEmacsPackage = args:
epkgs.trivialBuild {
pname = args.name;
inherit (args) src;
version = args.src.rev;
propagatedUserEnvPkgs = args.deps;
buildInputs = args.deps;
};
# *Attrset* containig extra emacs packages
extraPackages = {
combobulate = buildEmacsPackage {
name = "combobulate";
src = pkgs.fetchFromGitHub {
owner = "mickeynp";
repo = "combobulate";
rev = "e9c5be84062e8183f556d7133d5a477a57e37e51";
hash = "sha256-r6jObsYx7RRTJUmrCN5h3+0WcHqJA67emhr4/W3rBrM=";
};
deps = [ ];
};
};
# *List* containing emacs packages from (M)ELPA # *List* containing emacs packages from (M)ELPA
mainPackages = mainPackages = builtins.filter
# builtins.filter
# if an extra package has the same name then give precedence to it # if an extra package has the same name then give precedence to it
# (package: ! builtins.elem package.pname (builtins.attrNames extraPackages)) (package: !builtins.elem package.pname (builtins.attrNames extraPackages))
(with melpaPackages; [ (with melpaPackages; [
meow meow
meow-tree-sitter meow-tree-sitter
@ -78,33 +98,12 @@ let
notmuch notmuch
consult-notmuch consult-notmuch
poly-org poly-org
casual-calc casual
gptel gptel
agenix agenix
solidity-mode solidity-mode
# org-re-reveal # FIXME very not nice hash mismatch when building # org-re-reveal # FIXME very not nice hash mismatch when building
# gptel # TODO uncomment when there will be a new release including GPT-4o # gptel # TODO uncomment when there will be a new release including GPT-4o
]) ]) ++ (with elpaPackages; [ delight kind-icon ef-themes indent-bars ement ])
++ (with elpaPackages; [ ++ (with nongnuPackages; [ eat corfu-terminal haskell-ts-mode ]);
delight in mainPackages ++ (builtins.attrValues extraPackages)
kind-icon
ef-themes
indent-bars
ement
])
++ (with nongnuPackages; [
eat
corfu-terminal
haskell-ts-mode
]);
in
mainPackages
# ++ (builtins.attrValues extraPackages)
# Playing with EAF
++ [
# Disabled because pymupdf was broken
# (pkgs.callPackage ./eaf.nix {
# inherit (epkgs) melpaBuild;
# inherit (melpaPackages) ctable deferred epc s;
# })
]