byteio/nixos-config
1
0
Fork 0
mirror of https://github.com/librephoenix/nixos-config synced 2025-07-05 22:44:34 +05:30
Code Issues Projects Releases Packages Wiki Activity

Pinned doom emacs so system updates are quicker and more stable

Browse source
This commit is contained in:
Emmet 2024-03-22 13:43:56 -05:00
parent 7d2f529896
commit 3cffd54525
5 changed files with 54 additions and 23 deletions
Download patch file Download diff file Expand all files Collapse all files

2
user/app/doom-emacs/config.el
View file

@ -1246,7 +1246,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.12.1")
(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8")
(require 'mu4e)
(require 'mu4e-contrib)
(require 'mu4e-actions)

22
user/app/doom-emacs/doom.nix
View file

@ -1,13 +1,19 @@
{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings,
{ config, lib, pkgs-emacs, pkgs-stable, userSettings, systemSettings,
org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
let
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
in
{
imports = [
../git/git.nix
../../shell/sh.nix
../../shell/cli-collection.nix
];
programs.doom-emacs = {
enable = true;
emacsPackage = pkgs.emacs29-pgtk;
emacsPackage = pkgs-emacs.emacs29-pgtk;
doomPrivateDir = ./.;
# This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
# Only init/packages so we only rebuild when those change.
@ -18,7 +24,7 @@ in
filter = path: type:
builtins.elem (baseNameOf path) [ "init.el" "packages.el" ];
};
in pkgs.linkFarm "doom-packages-dir" [
in pkgs-emacs.linkFarm "doom-packages-dir" [
{
name = "init.el";
path = "${filteredPath}/init.el";
@ -29,7 +35,7 @@ in
}
{
name = "config.el";
path = pkgs.emptyFile;
path = pkgs-emacs.emptyFile;
}
];
# End block
@ -40,18 +46,16 @@ in
extension = ".el";
};
home.packages = (with pkgs; [
home.packages = (with pkgs-emacs; [
nil
nixfmt
git
file
wmctrl
jshon
aria
hledger
hunspell hunspellDicts.en_US-large
pandoc
(pkgs.mu.override { emacs = emacs29-pgtk; })
(pkgs-emacs.mu.override { emacs = emacs29-pgtk; })
emacsPackages.mu4e
isync
msmtp
@ -70,7 +74,7 @@ in
services.mbsync = {
enable = true;
package = pkgs.isync;
package = pkgs-stable.isync;
frequency = "*:0/5";
};

24
user/app/doom-emacs/doom.org
View file

@ -1469,7 +1469,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.12.1")
(add-load-path! "~/.nix-profile/share/emacs/site-lisp/elpa/mu4e-1.10.8")
(require 'mu4e)
(require 'mu4e-contrib)
(require 'mu4e-actions)
@ -1934,16 +1934,22 @@ Any git package can be configured for a particular commit or branch:
* Nix Integration
In order to have Nix load my Doom Emacs configuration [[./doom.nix][doom.nix]], which I source in the =imports= block of my [[../../../profiles/work/home.nix][home.nix]].
#+BEGIN_SRC nix :tangle doom.nix
{ config, lib, pkgs, pkgs-stable, userSettings, systemSettings,
{ config, lib, pkgs-emacs, pkgs-stable, userSettings, systemSettings,
org-nursery, org-yaap, org-side-tree, org-timeblock, phscroll, ... }:
let
themePolarity = lib.removeSuffix "\n" (builtins.readFile (./. + "../../../../themes"+("/"+userSettings.theme)+"/polarity.txt"));
dashboardLogo = ./. + "/nix-" + themePolarity + ".png";
in
{
imports = [
../git/git.nix
../../shell/sh.nix
../../shell/cli-collection.nix
];
programs.doom-emacs = {
enable = true;
emacsPackage = pkgs.emacs29-pgtk;
emacsPackage = pkgs-emacs.emacs29-pgtk;
doomPrivateDir = ./.;
# This block from https://github.com/znewman01/dotfiles/blob/be9f3a24c517a4ff345f213bf1cf7633713c9278/emacs/default.nix#L12-L34
# Only init/packages so we only rebuild when those change.
@ -1954,7 +1960,7 @@ in
filter = path: type:
builtins.elem (baseNameOf path) [ "init.el" "packages.el" ];
};
in pkgs.linkFarm "doom-packages-dir" [
in pkgs-emacs.linkFarm "doom-packages-dir" [
{
name = "init.el";
path = "${filteredPath}/init.el";
@ -1965,7 +1971,7 @@ in
}
{
name = "config.el";
path = pkgs.emptyFile;
path = pkgs-emacs.emptyFile;
}
];
# End block
@ -1976,18 +1982,16 @@ in
extension = ".el";
};
home.packages = (with pkgs; [
home.packages = (with pkgs-emacs; [
nil
nixfmt
git
file
wmctrl
jshon
aria
hledger
hunspell hunspellDicts.en_US-large
pandoc
(pkgs.mu.override { emacs = emacs29-pgtk; })
(pkgs-emacs.mu.override { emacs = emacs29-pgtk; })
emacsPackages.mu4e
isync
msmtp
@ -2006,7 +2010,7 @@ in
services.mbsync = {
enable = true;
package = pkgs.isync;
package = pkgs-stable.isync;
frequency = "*:0/5";
};