summaryrefslogtreecommitdiff
path: root/modules
diff options
context:
space:
mode:
authorTim Keller <tjk@tjkeller.xyz>2025-05-27 18:43:39 -0500
committerTim Keller <tjk@tjkeller.xyz>2025-05-27 18:43:39 -0500
commit28595adedbd8b2def8cc6b6fc012eb115ca9e4f2 (patch)
tree06ab423b72fce5b8b3c3b8bc91ac72bb5f1a65d2 /modules
parent487f937dcf8cdbf6f1e67a0270d70fab6e09a245 (diff)
downloadnixos-28595adedbd8b2def8cc6b6fc012eb115ca9e4f2.tar.xz
nixos-28595adedbd8b2def8cc6b6fc012eb115ca9e4f2.zip
update to 25.05
Diffstat (limited to 'modules')
-rw-r--r--modules/root/fonts.nix4
-rw-r--r--modules/root/software/desktop.nix2
-rw-r--r--modules/root/software/overlays.nix3
3 files changed, 2 insertions, 7 deletions
diff --git a/modules/root/fonts.nix b/modules/root/fonts.nix
index 3ae8eef..256e1ab 100644
--- a/modules/root/fonts.nix
+++ b/modules/root/fonts.nix
@@ -7,10 +7,8 @@
fonts.packages = with pkgs; [
commit-mono
inter
+ nerd-fonts.jetbrains-mono
tamzen
- (nerdfonts.override {
- fonts = [ "JetBrainsMono" ];
- })
];
};
}
diff --git a/modules/root/software/desktop.nix b/modules/root/software/desktop.nix
index dfddab1..dbcce1e 100644
--- a/modules/root/software/desktop.nix
+++ b/modules/root/software/desktop.nix
@@ -53,8 +53,8 @@
inkscape
] ++ pkgs.lib.optionals config.software.desktop.office.enable [
# Office
+ kdePackages.okular
libreoffice
- okular
pdfchain
thunderbird
] ++ pkgs.lib.optionals config.software.desktop.utilities.enable [
diff --git a/modules/root/software/overlays.nix b/modules/root/software/overlays.nix
index 670acfb..bd867d5 100644
--- a/modules/root/software/overlays.nix
+++ b/modules/root/software/overlays.nix
@@ -7,9 +7,6 @@
lowbat = (callPackage ./derivations/lowbat {});
})
(final: prev: {
- pavolctld = (callPackage ./derivations/pavolctld {});
- })
- (final: prev: {
st = (callPackage ./derivations/st {});
})
];