remove emacs-overlay
emacs29-pgtk is now available from NixOS-unstable directly. the overlay still provides some updates, like more frequent ELPA/MELPA package updates, but they are incompatible with how doom manages package updates anyway. I might think about bringin back the overlay without emacs itself in future, but for now, I'm getting off the bandwagon. The plan was and still is to get off of overlay and emacs unstable completely. While the run was pretty good, I consider Emacs to be part of my digital infrastructure now, and having it broken means bad news. Removing overlay and going back to stable branch just means reducing the number of moving pieces, having more eyes on common friction points and faster resolution. Hope this works as well as I'm expecting now.
This commit is contained in:
parent
7854aee461
commit
d204e74648
3 changed files with 4 additions and 102 deletions
90
flake.lock
90
flake.lock
|
|
@ -64,26 +64,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"emacs-overlay": {
|
||||
"inputs": {
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": "nixpkgs_2",
|
||||
"nixpkgs-stable": "nixpkgs-stable"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685643624,
|
||||
"narHash": "sha256-thnUc3S+c79l6RJ4RqSYKmnj9AqYRvRgQAgrEZBFwnM=",
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"rev": "669d63975489ace6915437e04546edf300f7a847",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-community",
|
||||
"repo": "emacs-overlay",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-compat": {
|
||||
"flake": false,
|
||||
"locked": {
|
||||
|
|
@ -120,24 +100,6 @@
|
|||
"inputs": {
|
||||
"systems": "systems"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1685518550,
|
||||
"narHash": "sha256-o2d0KcvaXzTrPRIo0kOLV0/QXHhDQ5DTi+OxcjO8xqY=",
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"rev": "a1720a10a6cfe8234c0e93907ffe81be440f4cef",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "numtide",
|
||||
"repo": "flake-utils",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"flake-utils_2": {
|
||||
"inputs": {
|
||||
"systems": "systems_2"
|
||||
},
|
||||
"locked": {
|
||||
"lastModified": 1681202837,
|
||||
"narHash": "sha256-H+Rh19JDwRtpVPAWp64F+rlEtxUWBAQW28eAi3SRSzg=",
|
||||
|
|
@ -212,7 +174,7 @@
|
|||
"nixos-wsl": {
|
||||
"inputs": {
|
||||
"flake-compat": "flake-compat_2",
|
||||
"flake-utils": "flake-utils_2",
|
||||
"flake-utils": "flake-utils",
|
||||
"nixpkgs": [
|
||||
"nixpkgs"
|
||||
]
|
||||
|
|
@ -247,39 +209,7 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs-stable": {
|
||||
"locked": {
|
||||
"lastModified": 1685468986,
|
||||
"narHash": "sha256-YSj3K71KjRZgeL0hS3sYLYHI0g8aIVIf9lcsRMCIW2A=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "9af373a61647257d16ae6062cddaa9094d24920c",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-22.11",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_2": {
|
||||
"locked": {
|
||||
"lastModified": 1685383865,
|
||||
"narHash": "sha256-3uQytfnotO6QJv3r04ajSXbEFMII0dUtw0uqYlZ4dbk=",
|
||||
"owner": "NixOS",
|
||||
"repo": "nixpkgs",
|
||||
"rev": "5e871d8aa6f57cc8e0dc087d1c5013f6e212b4ce",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "NixOS",
|
||||
"ref": "nixos-unstable",
|
||||
"repo": "nixpkgs",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"nixpkgs_3": {
|
||||
"locked": {
|
||||
"lastModified": 1685564631,
|
||||
"narHash": "sha256-8ywr3AkblY4++3lIVxmrWZFzac7+f32ZEhH/A8pNscI=",
|
||||
|
|
@ -299,11 +229,10 @@
|
|||
"inputs": {
|
||||
"agenix": "agenix",
|
||||
"deploy-rs": "deploy-rs",
|
||||
"emacs-overlay": "emacs-overlay",
|
||||
"home-manager": "home-manager_2",
|
||||
"nixos-hardware": "nixos-hardware",
|
||||
"nixos-wsl": "nixos-wsl",
|
||||
"nixpkgs": "nixpkgs_3"
|
||||
"nixpkgs": "nixpkgs_2"
|
||||
}
|
||||
},
|
||||
"systems": {
|
||||
|
|
@ -321,21 +250,6 @@
|
|||
"type": "github"
|
||||
}
|
||||
},
|
||||
"systems_2": {
|
||||
"locked": {
|
||||
"lastModified": 1681028828,
|
||||
"narHash": "sha256-Vy1rq5AaRuLzOxct8nz4T6wlgyUR7zLU309k9mBC768=",
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"rev": "da67096a3b9bf56a91d16901293e51ba5b49a27e",
|
||||
"type": "github"
|
||||
},
|
||||
"original": {
|
||||
"owner": "nix-systems",
|
||||
"repo": "default",
|
||||
"type": "github"
|
||||
}
|
||||
},
|
||||
"utils": {
|
||||
"locked": {
|
||||
"lastModified": 1667395993,
|
||||
|
|
|
|||
|
|
@ -13,9 +13,6 @@
|
|||
url = "github:nix-community/home-manager";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
};
|
||||
emacs-overlay = {
|
||||
url = "github:nix-community/emacs-overlay";
|
||||
};
|
||||
agenix = {
|
||||
url = "github:ryantm/agenix";
|
||||
inputs.nixpkgs.follows = "nixpkgs";
|
||||
|
|
@ -29,7 +26,6 @@
|
|||
, nixpkgs
|
||||
, nixos-wsl
|
||||
, home-manager
|
||||
, emacs-overlay
|
||||
, agenix
|
||||
, nixos-hardware
|
||||
, deploy-rs
|
||||
|
|
@ -50,9 +46,6 @@
|
|||
system = "x86_64-linux";
|
||||
modules = common-modules ++ [
|
||||
|
||||
# Overlays
|
||||
{ nixpkgs.overlays = [ emacs-overlay.overlay ]; }
|
||||
|
||||
# Modules and module config
|
||||
./modules/fish.nix
|
||||
./modules/users.nix
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
{ pkgs, lib, emacs-overlay, ... }:
|
||||
{ pkgs, lib, ... }:
|
||||
let
|
||||
doombin = "/home/payas/.config/emacs/bin/doom";
|
||||
doomsync = ''
|
||||
|
|
@ -8,8 +8,6 @@ let
|
|||
'';
|
||||
in
|
||||
{
|
||||
nixpkgs.overlays = [ emacs-overlay.overlay ];
|
||||
|
||||
home = {
|
||||
file = {
|
||||
# Doomemacs config
|
||||
|
|
@ -36,12 +34,9 @@ in
|
|||
|
||||
programs = {
|
||||
# Emacs unstable (currently 29.0.91) with extra packages (that require native component)
|
||||
# Built via nix-community/emacs-overlay expressions
|
||||
emacs = {
|
||||
enable = true;
|
||||
package = pkgs.emacsUnstablePgtk.overrideAttrs (prev: {
|
||||
postFixup = builtins.replaceStrings [ "/bin/emacs" ] [ "/bin/.emacs-*-wrapped" ] prev.postFixup;
|
||||
});
|
||||
package = pkgs.emacs29-pgtk;
|
||||
extraPackages = epkgs: with epkgs; [
|
||||
jinx
|
||||
pdf-tools
|
||||
|
|
|
|||
Reference in a new issue