From 6b7db342e0ac03664dffe268f7b13bd056aae704 Mon Sep 17 00:00:00 2001
From: Adrian Kummerlaender
Date: Fri, 28 Jun 2024 18:09:07 +0200
Subject: Update to and adapt environment for 24.05

---
 gui/default.nix |  7 -------
 gui/emacs.nix   | 14 +++++++++-----
 gui/gtk.nix     |  2 +-
 3 files changed, 10 insertions(+), 13 deletions(-)

(limited to 'gui')

diff --git a/gui/default.nix b/gui/default.nix
index 7289e1d..2cebeaf 100644
--- a/gui/default.nix
+++ b/gui/default.nix
@@ -22,13 +22,6 @@
     iosevka
   ];
 
-  qt = {
-    enable = true;
-    platformTheme = "gtk";
-  };
-
-  services.gpg-agent.pinentryFlavor = "gtk2";
-
   home.sessionVariables = {
     QT_AUTO_SCREEN_SCALE_FACTOR = 0;
   };
diff --git a/gui/emacs.nix b/gui/emacs.nix
index 7197e85..eb3bc8b 100644
--- a/gui/emacs.nix
+++ b/gui/emacs.nix
@@ -1,4 +1,4 @@
-{ config, pkgs, pkgs-oldstable, pkgs-unstable, ... }:
+{ config, pkgs, pkgs-unstable, ... }:
 
 {
   programs.emacs = let
@@ -47,6 +47,10 @@
     enable = true;
 
     package = pkgs.emacsWithPackagesFromUsePackage {
+      override = final: prev: {
+        org = prev.org.overrideAttrs(old: { patches = []; } );
+      };
+
       package = pkgs.emacs29;
 
       config = ./conf/init.el;
@@ -60,9 +64,9 @@
       ]) ++ (with epkgs.nongnuPackages; [
         org-contrib
       ])++ [
+        epkgs.mu4e
         akr-color-theme
         custom-runtime-env
-        pkgs-oldstable.mu
       ];
     };
   };
@@ -87,9 +91,9 @@
 
   in with pkgs; [
     symbola
-    (iosevka-bin.override { variant = "aile"; })
-    (iosevka-bin.override { variant = "etoile"; })
-    pkgs-oldstable.mu
+    (iosevka-bin.override { variant = "Aile"; })
+    (iosevka-bin.override { variant = "Etoile"; })
+    mu
     org-protocol-shortcut
   ];
 
diff --git a/gui/gtk.nix b/gui/gtk.nix
index 150fab0..d593a55 100644
--- a/gui/gtk.nix
+++ b/gui/gtk.nix
@@ -63,7 +63,7 @@
 
   qt = {
     enable = true;
-    platformTheme = "gtk";
+    platformTheme.name = "gtk";
   };
 
   home.sessionVariables = {
-- 
cgit v1.2.3