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

Compare commits

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

3 Commits
89b8619b12 ... 8e643d23c2

Author SHA1 Message Date
larstvei
8e643d23c2 emacs-unstable is emacs-30
Some checks failed
Build and Cache with Cachix / build (push) Has been cancelled
Details
2025-08-24 16:37:02 +02:00
larstvei
1f969c1458 Only patch for macos and unstable over git 2025-08-24 16:31:04 +02:00
larstvei
09448b75a9 Update install-nix-action version 2025-08-24 13:34:32 +02:00
3 changed files with 10 additions and 6 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@v27 uses: cachix/install-nix-action@v31
- 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@v27 uses: cachix/install-nix-action@v31
- name: Update flake - name: Update flake
run: nix flake update run: nix flake update

12
flake.nix
View File

@ -34,18 +34,22 @@
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-31/round-undecorated-frame.patch" "${emacs-plus}/patches/emacs-30/round-undecorated-frame.patch"
"${emacs-plus}/patches/emacs-31/system-appearance.patch" "${emacs-plus}/patches/emacs-30/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 = patched-emacs; package = emacsPkg;
defaultInitFile = true; defaultInitFile = true;
alwaysEnsure = true; alwaysEnsure = true;
alwaysTangle = true; alwaysTangle = true;