Updated system

This commit is contained in:
Emmet 2024-02-18 09:23:57 -06:00
parent 5ae14e31b2
commit f27c29cec3
8 changed files with 42 additions and 171 deletions

View file

@ -1,6 +1,5 @@
{ config, lib, pkgs, userSettings, systemSettings,
eaf, eaf-browser, org-nursery, org-yaap,
org-side-tree, org-timeblock, phscroll, ... }:
{ config, lib, pkgs, 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";
@ -41,19 +40,17 @@ in
extension = ".el";
};
home.packages = with pkgs; [
home.packages = (with pkgs; [
nil
nixfmt
git
file
nodejs
wmctrl
jshon
aria
hledger
hunspell hunspellDicts.en_US-large
pandoc
nodePackages.mermaid-cli
(pkgs.mu.override { emacs = emacs29-pgtk; })
emacsPackages.mu4e
isync
@ -61,29 +58,15 @@ in
(python3.withPackages (p: with p; [
pandas
requests
pyqt6 sip qtpy qt6.qtwebengine epc lxml pyqt6-webengine
epc lxml
pysocks
pymupdf
markdown
]))
];
nixpkgs.overlays = [
(self: super:
{
mu = super.mu.overrideAttrs (oldAttrs: rec {
pname = "mu";
version = "1.10.7";
src = super.fetchFromGitHub {
owner = "djcb";
repo = "mu";
rev = "v1.10.7";
hash = "sha256-x1TsyTOK5U6/Y3QInm+XQ7T32X49iwa+4UnaHdiyqCI=";
};
});
}
)
];
]) ++ (with pkgs-stable; [
nodejs
nodePackages.mermaid-cli
]);
services.mbsync = {
enable = true;
@ -91,11 +74,6 @@ in
frequency = "*:0/5";
};
home.file.".emacs.d/eaf" = {
source = "${eaf}";
recursive = true;
};
home.file.".emacs.d/org-yaap" = {
source = "${org-yaap}";
recursive = true;
@ -111,17 +89,6 @@ in
recursive = true;
};
home.file.".emacs.d/eaf/app/browser" = {
source = "${eaf-browser}";
recursive = true;
onChange = "
pushd ~/.emacs.d/eaf/app/browser;
rm package*.json;
npm install darkreader @mozilla/readability && rm package*.json;
popd;
";
};
home.file.".emacs.d/org-nursery" = {
source = "${org-nursery}";
};