larstvei/emacs-flake
1
0
Fork 0
mirror of https://github.com/larstvei/emacs-flake.git synced 2025-08-31 01:00:12 +00:00
Code Issues Actions 2 Packages Projects Releases Wiki Activity

Compare commits

base: larstvei:8e643d23c2804f2a8883adba40dcd238e527bfa8
Branches Tags
larstvei:main
..
compare: larstvei:89b8619b12bbd876b1958403c8afb22cfec6474e
Branches Tags
larstvei:main

No commits in common. "8e643d23c2804f2a8883adba40dcd238e527bfa8" and "89b8619b12bbd876b1958403c8afb22cfec6474e" have entirely different histories.
8e643d23c2 ... 89b8619b12

3 changed files with 6 additions and 10 deletions
Show Stats Expand all files Collapse all files

2
.github/workflows/cachix.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up Nix - name: Set up Nix
uses: cachix/install-nix-action@v31 uses: cachix/install-nix-action@v27
- name: Authenticate with Cachix - name: Authenticate with Cachix
uses: cachix/cachix-action@v15 uses: cachix/cachix-action@v15

2
.github/workflows/update-flake.yml vendored
View File

@ -16,7 +16,7 @@ jobs:
- uses: actions/checkout@v4 - uses: actions/checkout@v4
- name: Set up Nix - name: Set up Nix
uses: cachix/install-nix-action@v31 uses: cachix/install-nix-action@v27
- name: Update flake - name: Update flake
run: nix flake update run: nix flake update

12
flake.nix
View File

@ -34,22 +34,18 @@
emacs-overlay.overlays.package emacs-overlay.overlays.package
]; ];
}; };
patched-emacs = (pkgs.emacs-git).overrideAttrs (o: {
emacsDarwin = (pkgs.emacs-unstable).overrideAttrs (_: {
patches = [ patches = [
"${emacs-plus}/patches/emacs-30/round-undecorated-frame.patch" "${emacs-plus}/patches/emacs-31/round-undecorated-frame.patch"
"${emacs-plus}/patches/emacs-30/system-appearance.patch" "${emacs-plus}/patches/emacs-31/system-appearance.patch"
]; ];
}); });
emacsLinux = pkgs.emacs-unstable-pgtk;
emacsPkg = if pkgs.stdenv.isDarwin then emacsDarwin else emacsLinux;
in in
{ {
defaultPackage = pkgs.emacsWithPackagesFromUsePackage { defaultPackage = pkgs.emacsWithPackagesFromUsePackage {
config = "${emacs-config}/init.org"; config = "${emacs-config}/init.org";
package = emacsPkg; package = patched-emacs;
defaultInitFile = true; defaultInitFile = true;
alwaysEnsure = true; alwaysEnsure = true;
alwaysTangle = true; alwaysTangle = true;