fixed bug #124215 on nixpkgs

This commit is contained in:
Thorn Avery 2021-05-28 02:10:55 +00:00
parent 40d46340ce
commit 5d55315729
6 changed files with 44 additions and 3 deletions

View File

@ -80,11 +80,11 @@
}, },
"nixpkgs_2": { "nixpkgs_2": {
"locked": { "locked": {
"lastModified": 1621840840, "lastModified": 1622103435,
"narHash": "sha256-o6h6+d5ZwrFmOTe+ma9s1Z9kyHsCW1C84IA8RZ9/fIU=", "narHash": "sha256-5i5mGg402AANnSRQmWVo7lqiyw3taoMwX26oslOD9c4=",
"owner": "NixOS", "owner": "NixOS",
"repo": "nixpkgs", "repo": "nixpkgs",
"rev": "ea7d4aa9b8225abd6147339f0d56675d6f1f0fd1", "rev": "5658fadedb748cb0bdbcb569a53bd6065a5704a9",
"type": "github" "type": "github"
}, },
"original": { "original": {

View File

@ -27,6 +27,9 @@
# enabling window-manager # enabling window-manager
(import ./modules/bspwm) (import ./modules/bspwm)
# emacs + package override
(import ./modules/emacs)
# disk partitions and such (plus more that needs to be taken out) # disk partitions and such (plus more that needs to be taken out)
(import ./hardware/iwakura) (import ./hardware/iwakura)

View File

@ -0,0 +1,9 @@
{ pkgs, ... }: {
nixpkgs.overlays = [
(import ../../overlays/emacs.nix)
];
services.emacs = {
enable = true;
defaultEditor = true;
};
}

8
modules/emacs/home.nix Normal file
View File

@ -0,0 +1,8 @@
{ pkgs, ... }: {
home.file.".emacs".text = ''
(require 'package)
(setq package-archives nil)
(setq package-enable-at-startup nil)
(package-initialize)
'';
}

20
overlays/emacs.nix Normal file
View File

@ -0,0 +1,20 @@
final: prev:
let
myEmacs = prev.emacs;
emacsWithPackages = (prev.emacsPackagesGen myEmacs).emacsWithPackages;
in {
emacs = emacsWithPackages (epkgs:
(with epkgs.melpaStablePackages; [
magit
zerodark-theme
]) ++ (with epkgs.melpaPackages; [
# undo-tree
# zoom-frm
]) ++ (with epkgs.elpaPackages; [
auctex
beacon
nameless
]) ++ [
#prev.notmuch
]);
}

View File

@ -17,6 +17,7 @@
../../modules/urxvt/home.nix ../../modules/urxvt/home.nix
../../modules/picom/home.nix ../../modules/picom/home.nix
../../modules/zsh/home.nix ../../modules/zsh/home.nix
../../modules/emacs/home.nix
./fonts/home.nix ./fonts/home.nix
./xresources.nix ./xresources.nix