upgrade to NixOS 22.05

1 files changed, 17 insertions, 19 deletions

diff --git a/usecases/desktop/graphical.nix b/usecases/desktop/graphical.nix
index afc61a4..059087d 100644
--- a/usecases/desktop/graphical.nix
+++ b/usecases/desktop/graphical.nix
@@ -15,7 +15,7 @@ inputs:
 
   users.extraUsers.minijackson.packages = with pkgs; [
     arandr
-    gnome3.dconf
+    dconf
     gnome3.eog
     gnome3.evince
     gnome3.file-roller
@@ -87,26 +87,24 @@ inputs:
   networking.firewall.allowedUDPPortRanges = [{ from = 1714; to = 1764; }];
 
   home-manager.users.minijackson = {
-    gtk =
-      let
-        override-arc-theme = import ../../lib/override-arc-theme.nix {
-          inherit lib;
-          themeConfig = config.theme;
-        };
-      in
-      {
-        enable = true;
-        iconTheme = {
-          # TODO: properly modify the colors
-          package = pkgs.arc-icon-theme;
-          name = "Arc";
-        };
-        theme = {
-          package = override-arc-theme pkgs.arc-theme;
-          name = "Arc-Dark";
-        };
+    gtk = {
+      enable = true;
+      iconTheme = {
+        # TODO: properly modify the colors
+        package = pkgs.gruvbox-dark-icons-gtk;
+        name = "oomox-gruvbox-dark";
+      };
+      theme = {
+        # package = override-arc-theme pkgs.arc-theme;
+        package = pkgs.gruvbox-dark-gtk;
+        name = "gruvbox-dark";
       };
 
+      gtk4.extraConfig = {
+        gtk-application-prefer-dark-theme = true;
+      };
+    };
+
     services.kdeconnect = {
       enable = true;
       indicator = true;