From 3283c5e1dc961d8825d64f215ded3c7e7afc336c Mon Sep 17 00:00:00 2001
From: Daniel Siepmann <coding@daniel-siepmann.de>
Date: Sun, 22 May 2022 18:31:08 +0200
Subject: [PATCH] Use home-manager pointerCursor module

This removes need to setup everything myself. Didn't know about it
earlier.
Does exactly what this commit removes.
---
 home.nix            | 3 ---
 home/gtk.nix        | 6 ------
 home/home.nix       | 8 ++++++++
 home/systemd.nix    | 2 +-
 home/xresources.nix | 8 --------
 5 files changed, 9 insertions(+), 18 deletions(-)
 delete mode 100644 home/xresources.nix

diff --git a/home.nix b/home.nix
index 43a45c4..718f74b 100644
--- a/home.nix
+++ b/home.nix
@@ -54,9 +54,6 @@
   xdg = import ./home/xdg.nix {
     inherit pkgs;
   };
-  xresources = import ./home/xresources.nix {
-    inherit config;
-  };
 
   qt = import ./home/qt.nix {
     inherit pkgs;
diff --git a/home/gtk.nix b/home/gtk.nix
index fe41559..1e2caaa 100644
--- a/home/gtk.nix
+++ b/home/gtk.nix
@@ -13,12 +13,6 @@
     name = "Qogir-ubuntu-dark";
   };
 
-  cursorTheme = {
-    package = pkgs.qogir-icon-theme;
-    name = "Qogir-ubuntu-dark";
-    size = 16;
-  };
-
   font = {
     package = pkgs.roboto-mono;
     name = "Roboto Mono";
diff --git a/home/home.nix b/home/home.nix
index a6c26ee..1f4dfe8 100644
--- a/home/home.nix
+++ b/home/home.nix
@@ -35,6 +35,14 @@ in {
       ];
     };
 
+    pointerCursor = {
+      package = pkgs.qogir-icon-theme;
+      name = "Qogir-ubuntu-dark";
+      size = 16;
+      x11.enable = true;
+      gtk.enable = true;
+    };
+
     sessionVariables = {
       TERMINAL = "${pkgs.st}/bin/st";
       EDITOR = "${pkgs.neovim}/bin/nvim";
diff --git a/home/systemd.nix b/home/systemd.nix
index dbc9165..6b806c3 100644
--- a/home/systemd.nix
+++ b/home/systemd.nix
@@ -19,7 +19,7 @@
 
   tmpfiles.rules = [
     "L ${config.home.homeDirectory}/.themes - - - - ${config.home.profileDirectory}/share/themes"
-    "L ${config.home.homeDirectory}/.icons/default - - - - ${config.home.profileDirectory}/share/icons/${config.gtk.iconTheme.name}"
+    "L ${config.home.homeDirectory}/.icons/${config.gtk.iconTheme.name} - - - - ${config.home.profileDirectory}/share/icons/${config.gtk.iconTheme.name}"
     "L ${config.home.homeDirectory}/.local/share/applications - - - - ${config.home.profileDirectory}/share/applications"
   ];
 }
diff --git a/home/xresources.nix b/home/xresources.nix
deleted file mode 100644
index 0ad1345..0000000
--- a/home/xresources.nix
+++ /dev/null
@@ -1,8 +0,0 @@
-{ config }:
-
-{
-  properties = {
-    "Xcursor.theme" = "${config.gtk.cursorTheme.name}";
-    "Xcursor.size" = 16;
-  };
-}