emacs: move to emacsPgtkGcc properly

This commit is contained in:
kat witch 2021-08-22 05:41:03 +01:00
parent 910dbad4bd
commit 4602d4e1f9
No known key found for this signature in database
GPG key ID: 1B477797DCA5EC72
2 changed files with 18 additions and 3 deletions

View file

@ -1,7 +1,7 @@
{ config, lib, pkgs, sources, ... }: { config, lib, pkgs, sources, ... }:
let let
emacs = pkgs.callPackage sources.nix-doom-emacs { doom-emacs = pkgs.callPackage sources.nix-doom-emacs {
doomPrivateDir = "${./doom.d}"; doomPrivateDir = "${./doom.d}";
emacsPackages = pkgs.emacsPackagesFor pkgs.emacsPgtkGcc; emacsPackages = pkgs.emacsPackagesFor pkgs.emacsPgtkGcc;
bundledPackages = false; bundledPackages = false;
@ -9,12 +9,15 @@ let
magit-delta = super.magit-delta.overrideAttrs (esuper: { magit-delta = super.magit-delta.overrideAttrs (esuper: {
buildInputs = esuper.buildInputs ++ [ pkgs.git ]; buildInputs = esuper.buildInputs ++ [ pkgs.git ];
}); });
straight = self.straightBuild {
pname = "straight";
};
}; };
}; };
in { in {
home.packages = [ emacs pkgs.sqlite ]; home.packages = [ doom-emacs pkgs.sqlite ];
home.file.".emacs.d/init.el".text = '' home.file.".emacs.d/init.el".text = ''
(load "default.el") (load "default.el")
(load-theme 'base16-${lib.elemAt (lib.splitString "." config.base16.alias.default) 1} t) (load-theme 'base16-${lib.elemAt (lib.splitString "." config.base16.alias.default) 1} t)
''; '';

View file

@ -83,6 +83,18 @@
"url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz", "url": "https://github.com/nmattia/niv/archive/e0ca65c81a2d7a4d82a189f1e23a48d59ad42070.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz" "url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
}, },
"nix-doom-emacs": {
"branch": "develop",
"description": "doom-emacs packaged for Nix",
"homepage": "",
"owner": "vlaci",
"repo": "nix-doom-emacs",
"rev": "1020f27f1fab123f0ce3ed5f6e9c0637d888c884",
"sha256": "1fgrxzmkbh699ah1sqr0937bysfx0v1q805k6kpjjfwbrfn6113h",
"type": "tarball",
"url": "https://github.com/vlaci/nix-doom-emacs/archive/1020f27f1fab123f0ce3ed5f6e9c0637d888c884.tar.gz",
"url_template": "https://github.com/<owner>/<repo>/archive/<rev>.tar.gz"
},
"nixos-mailserver": { "nixos-mailserver": {
"branch": "master", "branch": "master",
"ref": "master", "ref": "master",