Add working doom packages file

This commit is contained in:
niten 2021-09-07 15:50:40 -07:00
parent 932f49fd76
commit 5a8601bc6e
2 changed files with 30 additions and 26 deletions

View File

@ -12,26 +12,30 @@
sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6"; sha256 = "1g0izscjh5nv4n0n1m58jc6z27i9pkbxs17mnb05a83ffdbmmva6";
}; };
in pkgs.callPackage doom-emacs-pkg { in {
doomPrivateDir = doom-emacs-config; doom-emacs-package = pkgs.callPackage doom-emacs-pkg {
extraPackages = with pkgs.emacsPackages; [ doomPrivateDir = doom-emacs-config;
elpher extraPackages = with pkgs.emacsPackages; [
use-package elpher
]; use-package
emacsPackagesOverlay = final: prev: { ];
irony = prev.irony.overrideAttrs (esuper: { emacsPackagesOverlay = final: prev: {
buildInputs = esuper.buildInputs irony = prev.irony.overrideAttrs (esuper: {
++ [ pkgs.cmake pkgs.libclang pkgs.clang ]; buildInputs = esuper.buildInputs
}); ++ [ pkgs.cmake pkgs.libclang pkgs.clang ];
spinner = let version = "1.7.4"; });
in prev.trivialBuild { spinner = let version = "1.7.4";
inherit version; in prev.trivialBuild {
pname = "spinner"; inherit version;
src = builtins.fetchTarball { pname = "spinner";
url = "https://elpa.gnu.org/packages/spinner-${version}.tar"; src = builtins.fetchTarball {
sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5"; url = "https://elpa.gnu.org/packages/spinner-${version}.tar";
sha256 = "1jj40d68lmz91ynzwqg0jqdjpa9cn5md1hmvjfhy0cr3l16qpfw5";
};
buildPhase = ":";
}; };
buildPhase = ":"; };
};
}; };
doom-emacs-config = doom-emacs-config;
} }

View File

@ -1,11 +1,11 @@
{ config, lib, pkgs, ... }: { config, lib, pkgs, ... }:
{ username, user-email, home-dir }: { username, user-email, home-dir }:
{ enable-gui ? true, ... }: { enable-gui ? false, ... }:
with lib; with lib;
let let
doom-emacs-package = pkgs.callPackage ./doom-emacs-package.nix {}; doom-emacs-packages = pkgs.callPackage ./doom-emacs-package.nix {};
gui-packages = with pkgs; gui-packages = with pkgs;
let let
@ -51,7 +51,7 @@ let
enca enca
file file
fortune fortune
doom-emacs-package doom-emacs-packages.doom-emacs-package
git git
gnutls gnutls
gnupg gnupg
@ -116,7 +116,7 @@ in {
xresources.properties = mkIf enable-gui { xresources.properties = mkIf enable-gui {
"Xft.antialias" = 1; "Xft.antialias" = 1;
"Xft.autohint" = 0; "Xft.autohint" = 0;
"Xft.dpi" = 192; # "Xft.dpi" = 192;
"Xft.hinting" = 1; "Xft.hinting" = 1;
"Xft.hintstyle" = "hintfull"; "Xft.hintstyle" = "hintfull";
"Xft.lcdfilter" = "lcddefault"; "Xft.lcdfilter" = "lcddefault";
@ -125,7 +125,7 @@ in {
services = { services = {
emacs = { emacs = {
enable = true; enable = true;
package = doom-emacs-package; package = doom-emacs-packages.doom-emacs-package;
client = { client = {
enable = true; enable = true;
arguments = [ "-t" ]; arguments = [ "-t" ];
@ -173,7 +173,7 @@ in {
# EDITOR = "${doom-emacs}/bin/emacsclient -t"; # EDITOR = "${doom-emacs}/bin/emacsclient -t";
ALTERNATE_EDITOR = ""; ALTERNATE_EDITOR = "";
DOOM_EMACS_SITE_PATH = "${doom-emacs-config}/site.d"; DOOM_EMACS_SITE_PATH = "${doom-emacs-packages.doom-emacs-config}/site.d";
HISTCONTROL = "ignoredups:ignorespace"; HISTCONTROL = "ignoredups:ignorespace";
}; };