Browse Source

fixed bug #124215 on nixpkgs

master
Thorn Avery 2 years ago
parent
commit
5d55315729
6 changed files with 44 additions and 3 deletions
  1. +3
    -3
      flake.lock
  2. +3
    -0
      flake.nix
  3. +9
    -0
      modules/emacs/default.nix
  4. +8
    -0
      modules/emacs/home.nix
  5. +20
    -0
      overlays/emacs.nix
  6. +1
    -0
      users/thorn/home.nix

+ 3
- 3
flake.lock View File

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


+ 3
- 0
flake.nix View File

@@ -27,6 +27,9 @@
# enabling window-manager
(import ./modules/bspwm)

# emacs + package override
(import ./modules/emacs)

# disk partitions and such (plus more that needs to be taken out)
(import ./hardware/iwakura)



+ 9
- 0
modules/emacs/default.nix View File

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

+ 8
- 0
modules/emacs/home.nix 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
- 0
overlays/emacs.nix 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
]);
}

+ 1
- 0
users/thorn/home.nix View File

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

./fonts/home.nix
./xresources.nix


Loading…
Cancel
Save