From 28595adedbd8b2def8cc6b6fc012eb115ca9e4f2 Mon Sep 17 00:00:00 2001
From: Tim Keller <tjk@tjkeller.xyz>
Date: Tue, 27 May 2025 18:43:39 -0500
Subject: update to 25.05

---
 modules/root/fonts.nix             | 4 +---
 modules/root/software/desktop.nix  | 2 +-
 modules/root/software/overlays.nix | 3 ---
 3 files changed, 2 insertions(+), 7 deletions(-)

(limited to 'modules/root')

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
@@ -6,9 +6,6 @@
 		(final: prev: {
 			lowbat = (callPackage ./derivations/lowbat {});
 		})
-		(final: prev: {
-			pavolctld = (callPackage ./derivations/pavolctld {});
-		})
 		(final: prev: {
 			st = (callPackage ./derivations/st {});
 		})
-- 
cgit v1.2.3