From 40e25399f529f86f0f91626d6f101441dad88ab9 Mon Sep 17 00:00:00 2001
From: Alexander Bantyev <balsoft@balsoft.ru>
Date: Wed, 20 Jan 2021 17:54:50 +0300
Subject: [PATCH] Fix cursor

---
 modules/applications/packages.nix    |  1 -
 modules/workspace/gnome3/default.nix |  4 ++++
 modules/workspace/gtk.nix            |  2 +-
 modules/workspace/kde/default.nix    |  1 -
 modules/workspace/misc.nix           | 15 +++++++++++----
 5 files changed, 16 insertions(+), 7 deletions(-)

diff --git a/modules/applications/packages.nix b/modules/applications/packages.nix
index a841c7b..374b6d7 100644
--- a/modules/applications/packages.nix
+++ b/modules/applications/packages.nix
@@ -31,7 +31,6 @@
       abiword
       gnumeric
       gcalcli
-      breeze-icons
       xdg_utils
       inputs.yt-utilities.defaultPackage.x86_64-linux
       lambda-launcher
diff --git a/modules/workspace/gnome3/default.nix b/modules/workspace/gnome3/default.nix
index 26238bf..835b13b 100644
--- a/modules/workspace/gnome3/default.nix
+++ b/modules/workspace/gnome3/default.nix
@@ -12,6 +12,10 @@
     gnome-online-accounts.enable = true;
     gnome-online-miners.enable = true;
   };
+
+  environment.sessionVariables.XDG_CURRENT_DESKTOP = "X-Generic";
+
+
   services.gvfs.enable = true;
   services.geoclue2.enable = true;
   home-manager.users.balsoft = {
diff --git a/modules/workspace/gtk.nix b/modules/workspace/gtk.nix
index 669e7f5..25dba15 100644
--- a/modules/workspace/gtk.nix
+++ b/modules/workspace/gtk.nix
@@ -67,7 +67,7 @@ in {
         ] ++ map (machine: "sftp://${machine}/home/balsoft ${machine}")
           (builtins.attrNames config.devices);
         extraConfig = {
-          gtk-cursor-theme-name = "breeze";
+          gtk-cursor-theme-name = "Breeze";
         };
       };
 
diff --git a/modules/workspace/kde/default.nix b/modules/workspace/kde/default.nix
index 93dfa71..05e1aae 100644
--- a/modules/workspace/kde/default.nix
+++ b/modules/workspace/kde/default.nix
@@ -15,7 +15,6 @@ with import ../../../support.nix { inherit lib config; }; {
     DESKTOP_SESSION = "kde";
     QT_XFT = "true";
     QT_SELECT = "5";
-    XDG_CURRENT_DESKTOP = "KDE";
     KDE_SESSION_VERSION = "5";
     QT_SCALE_FACTOR = "1";
     QT_AUTO_SCREEN_SCALE_FACTOR = "0";
diff --git a/modules/workspace/misc.nix b/modules/workspace/misc.nix
index bf7e9e0..7c66903 100644
--- a/modules/workspace/misc.nix
+++ b/modules/workspace/misc.nix
@@ -2,7 +2,7 @@
   programs.sway.enable = true;
   users.users.balsoft.extraGroups = [ "sway" ];
   systemd.coredump.enable = true;
-  environment.sessionVariables = {
+  environment.sessionVariables = config.home-manager.users.balsoft.home.sessionVariables // {
     EDITOR = config.defaultApplications.editor.cmd;
     VISUAL = config.defaultApplications.editor.cmd;
     LESS = "-asrRix8";
@@ -10,7 +10,8 @@
     QT_QPA_PLATFORM = "wayland";
     QT_WAYLAND_DISABLE_WINDOWDECORATION = "1";
     NIX_AUTO_RUN = "1";
-  } // config.home-manager.users.balsoft.home.sessionVariables;
+    XCURSOR_PATH = lib.mkForce "/home/balsoft/.icons";
+  };
 
   services.atd.enable = true;
 
@@ -61,9 +62,15 @@
       options = [ "grp:win_space_toggle,grp_led:caps,ctrl:nocaps" ];
       layout = "us,ru";
     };
-    home.file.".icons/default".source =
-      "${pkgs.breeze-qt5}/share/icons/breeze_cursors";
     systemd.user.startServices = true;
     services.kdeconnect.enable = true;
+
+    xsession.pointerCursor = {
+      package = pkgs.breeze-qt5;
+      name = "Breeze";
+    };
+
+    home.file.".icons/default".source = "${pkgs.breeze-qt5}/share/icons/breeze_cursors";
   };
+
 }