Fuck it, just manually create a package
This commit is contained in:
parent
ed345c171f
commit
b08a7e0e23
10
home.nix
10
home.nix
|
@ -4,6 +4,8 @@
|
||||||
|
|
||||||
with lib;
|
with lib;
|
||||||
let
|
let
|
||||||
|
|
||||||
|
doom-emacs-package = pkgs.callPackage ./doom-emacs-package.nix {};
|
||||||
|
|
||||||
gui-packages = with pkgs;
|
gui-packages = with pkgs;
|
||||||
let
|
let
|
||||||
|
@ -46,10 +48,10 @@ let
|
||||||
clj2nix
|
clj2nix
|
||||||
cmake
|
cmake
|
||||||
curl
|
curl
|
||||||
user-doom-emacs
|
|
||||||
enca
|
enca
|
||||||
file
|
file
|
||||||
fortune
|
fortune
|
||||||
|
doom-emacs-package
|
||||||
git
|
git
|
||||||
gnutls
|
gnutls
|
||||||
gnupg
|
gnupg
|
||||||
|
@ -99,10 +101,6 @@ let
|
||||||
ensure-directories = [ ".emacs.d/.local/etc/eshell" ];
|
ensure-directories = [ ".emacs.d/.local/etc/eshell" ];
|
||||||
|
|
||||||
in {
|
in {
|
||||||
|
|
||||||
nixpkgs.overlays = [
|
|
||||||
(import ./package-overlay.nix)
|
|
||||||
];
|
|
||||||
|
|
||||||
programs = {
|
programs = {
|
||||||
bash.enable = true;
|
bash.enable = true;
|
||||||
|
@ -127,7 +125,7 @@ in {
|
||||||
services = {
|
services = {
|
||||||
emacs = {
|
emacs = {
|
||||||
enable = true;
|
enable = true;
|
||||||
package = doom-emacs;
|
package = doom-emacs-package;
|
||||||
client = {
|
client = {
|
||||||
enable = true;
|
enable = true;
|
||||||
arguments = [ "-t" ];
|
arguments = [ "-t" ];
|
||||||
|
|
|
@ -1,38 +0,0 @@
|
||||||
final: prev: {
|
|
||||||
|
|
||||||
doom-emacs-config = prev.fetchgit {
|
|
||||||
url = "https://git.fudo.org/niten/doom-emacs.git";
|
|
||||||
rev = "0ab1532c856ccdb6ce46c5948054279f439eb1f2";
|
|
||||||
sha256 = "06mh74i5hmb15xid7w31wjc4v339cgddd667bpaphqnw666sm08h";
|
|
||||||
};
|
|
||||||
|
|
||||||
doom-emacs-pkg = prev.fetchgit {
|
|
||||||
url = "https://github.com/vlaci/nix-doom-emacs.git";
|
|
||||||
rev = "fee14d217b7a911aad507679dafbeaa8c1ebf5ff";
|
|
||||||
sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6";
|
|
||||||
};
|
|
||||||
|
|
||||||
user-doom-emacs = prev.callPackage final.doom-emacs-pkg {
|
|
||||||
doomPrivateDir = final.doom-emacs-config;
|
|
||||||
extraPackages = with prev.emacsPackages; [
|
|
||||||
elpher
|
|
||||||
use-package
|
|
||||||
];
|
|
||||||
emacsPackagesOverlay = final: prev: {
|
|
||||||
irony = prev.irony.overrideAttrs (esuper: {
|
|
||||||
buildInputs = esuper.buildInputs
|
|
||||||
++ [ prev.cmake prev.libclang prev.clang ];
|
|
||||||
});
|
|
||||||
spinner = let version = "1.7.4";
|
|
||||||
in prev.emacsPackages.trivialBuild {
|
|
||||||
inherit version;
|
|
||||||
pname = "spinner";
|
|
||||||
src = builtins.fetchTarball {
|
|
||||||
url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
|
|
||||||
sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
|
|
||||||
};
|
|
||||||
buildPhase = ":";
|
|
||||||
};
|
|
||||||
};
|
|
||||||
};
|
|
||||||
}
|
|
Loading…
Reference in New Issue