diff --git a/flake.lock b/flake.lock index 546de95..048015d 100644 --- a/flake.lock +++ b/flake.lock @@ -247,16 +247,16 @@ }, "emacs-pin-nixpkgs": { "locked": { - "lastModified": 1707268954, - "narHash": "sha256-2en1kvde3cJVc3ZnTy8QeD2oKcseLFjYPLKhIGDanQ0=", + "lastModified": 1711731143, + "narHash": "sha256-P3rID/C2N9+emVlCr4ta0X591usRvFxqk1wON/2j+Dg=", "owner": "NixOS", "repo": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "f72123158996b8d4449de481897d855bc47c7bf6", "type": "github" }, "original": { "id": "nixpkgs", - "rev": "f8e2ebd66d097614d51a56a755450d4ae1632df1", + "rev": "f72123158996b8d4449de481897d855bc47c7bf6", "type": "indirect" } }, @@ -581,7 +581,7 @@ "nix-straight" ], "nixpkgs": [ - "nixpkgs" + "emacs-pin-nixpkgs" ], "nose": "nose", "ob-racket": "ob-racket", @@ -767,6 +767,22 @@ "type": "github" } }, + "org-krita": { + "flake": false, + "locked": { + "lastModified": 1619935377, + "narHash": "sha256-+HI8P0/LI8gdiCD7OiPKTAtLKrPt0REnQ+6oblHSHzU=", + "owner": "lepisma", + "repo": "org-krita", + "rev": "7e334951b8de8f2f1c8cbe5068e7dfe6b9e9808f", + "type": "github" + }, + "original": { + "owner": "lepisma", + "repo": "org-krita", + "type": "github" + } + }, "org-nursery": { "flake": false, "locked": { diff --git a/flake.nix b/flake.nix index 7d0c499..692b6cf 100644 --- a/flake.nix +++ b/flake.nix @@ -176,14 +176,14 @@ nixpkgs.url = "nixpkgs/nixos-unstable"; nixpkgs-stable.url = "nixpkgs/nixos-23.11"; nixpkgs-staging-next.url = "nixpkgs/staging-next"; - emacs-pin-nixpkgs.url = "nixpkgs/e8124a9c5db7f96c51ad8dd7587ed4e26ff44fd6"; + emacs-pin-nixpkgs.url = "nixpkgs/f72123158996b8d4449de481897d855bc47c7bf6"; kdenlive-pin-nixpkgs.url = "nixpkgs/cfec6d9203a461d9d698d8a60ef003cac6d0da94"; home-manager.url = "github:nix-community/home-manager/master"; home-manager.inputs.nixpkgs.follows = "nixpkgs"; nix-doom-emacs.url = "github:nix-community/nix-doom-emacs"; - nix-doom-emacs.inputs.nixpkgs.follows = "nixpkgs"; + nix-doom-emacs.inputs.nixpkgs.follows = "emacs-pin-nixpkgs"; nix-straight.url = "github:librephoenix/nix-straight.el/pgtk-patch"; nix-straight.flake = false; diff --git a/user/app/doom-emacs/config.el b/user/app/doom-emacs/config.el index ea24ade..d3834b0 100644 --- a/user/app/doom-emacs/config.el +++ b/user/app/doom-emacs/config.el @@ -1302,7 +1302,7 @@ https://github.com/magit/magit/issues/460 (@cpitclaudel)." "q" 'helpful-kill-buffers) ;;;------ helpful configuration ------;;; -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8") +(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.12.2") (require 'mu4e) (require 'mu4e-contrib) (require 'mu4e-actions) diff --git a/user/app/doom-emacs/doom.org b/user/app/doom-emacs/doom.org index 0e7a434..0c2b6a1 100644 --- a/user/app/doom-emacs/doom.org +++ b/user/app/doom-emacs/doom.org @@ -1537,7 +1537,7 @@ I don't have this active right now since it's kinda weird with pgtk... ** mu4e Configuration #+BEGIN_SRC emacs-lisp :tangle config.el ;;;------ helpful configuration ------;;; -(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8") +(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.12.2") (require 'mu4e) (require 'mu4e-contrib) (require 'mu4e-actions) @@ -1969,6 +1969,7 @@ Any git package can be configured for a particular commit or branch: (package! embark :pin "0908eea") (package! dashboard) (package! direnv) +(package! org :pin "5bdfc02c6fa1b9ad4f075ac1ad1e4086ead310db") (package! org-modern) (package! org-super-agenda) (package! emacsql :pin "c1a4407") diff --git a/user/app/doom-emacs/packages.el b/user/app/doom-emacs/packages.el index c590dfb..2d797b7 100644 --- a/user/app/doom-emacs/packages.el +++ b/user/app/doom-emacs/packages.el @@ -1,6 +1,7 @@ (package! embark :pin "0908eea") (package! dashboard) (package! direnv) +(package! org :pin "5bdfc02c6fa1b9ad4f075ac1ad1e4086ead310db") (package! org-modern) (package! org-super-agenda) (package! emacsql :pin "c1a4407")