aboutsummaryrefslogtreecommitdiff
path: root/gui
diff options
context:
space:
mode:
authorAdrian Kummerlaender2024-06-28 18:09:07 +0200
committerAdrian Kummerlaender2024-06-28 18:09:07 +0200
commit6b7db342e0ac03664dffe268f7b13bd056aae704 (patch)
tree4eb70bfe3ad93c25b961fcaf0c3f77c13b901dfa /gui
parent9e3ce049bde28a902d97257e836a25daf4b0908a (diff)
downloadnixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.tar
nixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.tar.gz
nixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.tar.bz2
nixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.tar.lz
nixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.tar.xz
nixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.tar.zst
nixos_home-6b7db342e0ac03664dffe268f7b13bd056aae704.zip
Update to and adapt environment for 24.05
Diffstat (limited to 'gui')
-rw-r--r--gui/default.nix7
-rw-r--r--gui/emacs.nix14
-rw-r--r--gui/gtk.nix2
3 files changed, 10 insertions, 13 deletions
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 = {