diff --git a/flake.nix b/flake.nix index 1cbe04a..3ea9fef 100644 --- a/flake.nix +++ b/flake.nix @@ -52,6 +52,7 @@ (import inputs.nixpkgs { system = systemSettings.system; rocmSupport = (if systemSettings.gpu == "amd" then true else false); }).applyPatches { name = "nixpkgs-patched"; src = inputs.nixpkgs; + patches = [ ./patches/emacs-no-version-check.patch ]; }; # configure pkgs @@ -87,6 +88,10 @@ overlays = [ inputs.rust-overlay.overlays.default ]; }; + pkgs-emacs = import inputs.emacs-pin-nixpkgs { + system = systemSettings.system; + }; + pkgs-kdenlive = import inputs.kdenlive-pin-nixpkgs { system = systemSettings.system; }; @@ -132,6 +137,7 @@ extraSpecialArgs = { # pass config variables from above inherit pkgs-stable; + inherit pkgs-emacs; inherit pkgs-kdenlive; inherit pkgs-nwg-dock-hyprland; inherit systemSettings; @@ -164,6 +170,7 @@ extraSpecialArgs = { # pass config variables from above inherit pkgs-stable; + inherit pkgs-emacs; inherit systemSettings; inherit userSettings; inherit inputs; @@ -195,6 +202,7 @@ inputs = { nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-24.05"; + emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; nwg-dock-hyprland-pin-nixpkgs.url = "nixpkgs/2098d845d76f8a21ae4fe12ed7c7df49098d3f15"; @@ -224,6 +232,64 @@ hyprgrass.url = "github:horriblename/hyprgrass/736119f828eecaed2deaae1d6ff1f50d6dabaaba"; hyprgrass.inputs.hyprland.follows = "hyprland"; + nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; + nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; + + nix-straight.url = "github:librephoenix/nix-straight.el/pgtk-patch"; + nix-straight.flake = false; + nix-doom-emacs.inputs.nix-straight.follows = "nix-straight"; + + eaf = { + url = "github:emacs-eaf/emacs-application-framework"; + flake = false; + }; + eaf-browser = { + url = "github:emacs-eaf/eaf-browser"; + flake = false; + }; + org-nursery = { + url = "github:chrisbarrett/nursery"; + flake = false; + }; + org-yaap = { + url = "gitlab:tygrdev/org-yaap"; + flake = false; + }; + org-side-tree = { + url = "github:localauthor/org-side-tree"; + flake = false; + }; + org-timeblock = { + url = "github:ichernyshovvv/org-timeblock"; + flake = false; + }; + org-krita = { + url = "github:librephoenix/org-krita"; + flake = false; + }; + org-xournalpp = { + url = "gitlab:vherrmann/org-xournalpp"; + flake = false; + }; + org-sliced-images = { + url = "github:jcfk/org-sliced-images"; + flake = false; + }; + magit-file-icons = { + url = "github:librephoenix/magit-file-icons/abstract-icon-getters-compat"; + flake = false; + }; + phscroll = { + url = "github:misohena/phscroll"; + flake = false; + }; + mini-frame = { + url = "github:muffinmad/emacs-mini-frame"; + flake = false; + }; + + stylix.url = "github:danth/stylix"; + rust-overlay.url = "github:oxalica/rust-overlay"; blocklist-hosts = {