From 3e8aa1abcf922ceb4150bfcbc483fecf17f50695 Mon Sep 17 00:00:00 2001
From: Natsu Kagami <nki@nkagami.me>
Date: Wed, 4 May 2022 10:23:09 -0400
Subject: [PATCH] Use a more consistent cursor setting

---
 home/firefox.nix                          | 58 +++++++++++------------
 home/modules/linux/graphical/default.nix  |  4 +-
 home/modules/programs/my-sway/default.nix |  5 ++
 3 files changed, 36 insertions(+), 31 deletions(-)

diff --git a/home/firefox.nix b/home/firefox.nix
index 56e81fb..06246bc 100644
--- a/home/firefox.nix
+++ b/home/firefox.nix
@@ -1,33 +1,33 @@
-{ pkgs, config, lib, ... } :
+{ pkgs, config, lib, ... }:
 
 {
-    programs.firefox = {
-        enable = true;
-        package = pkgs.firefox.override {
-            cfg = {
-                # Tridactyl native connector
-                enableTridactylNative = true;
-            };
-        };
-        extensions = with pkgs.nur.repos.rycee.firefox-addons; [
-            bitwarden
-            grammarly
-            https-everywhere
-            multi-account-containers
-            octotree
-            reddit-enhancement-suite
-            refined-github
-            simple-tab-groups
-            sponsorblock
-            tridactyl
-            ublock-origin
-            web-scrobbler
-        ];
-
-        profiles.nki.id = 0;
-        profiles.nki.isDefault = true;
-        profiles.nki.settings = {
-            "browser.search.region" = "CA";
-        };
+  programs.firefox = {
+    enable = true;
+    package = pkgs.firefox-wayland.override {
+      cfg = {
+        # Tridactyl native connector
+        enableTridactylNative = true;
+      };
     };
+    extensions = with pkgs.nur.repos.rycee.firefox-addons; [
+      bitwarden
+      grammarly
+      https-everywhere
+      multi-account-containers
+      octotree
+      reddit-enhancement-suite
+      refined-github
+      simple-tab-groups
+      sponsorblock
+      tridactyl
+      ublock-origin
+      web-scrobbler
+    ];
+
+    profiles.nki.id = 0;
+    profiles.nki.isDefault = true;
+    profiles.nki.settings = {
+      "browser.search.region" = "CA";
+    };
+  };
 }
diff --git a/home/modules/linux/graphical/default.nix b/home/modules/linux/graphical/default.nix
index dc80556..a356645 100644
--- a/home/modules/linux/graphical/default.nix
+++ b/home/modules/linux/graphical/default.nix
@@ -40,8 +40,8 @@ in
     # Cursor
     xsession.pointerCursor = {
       package = pkgs.numix-cursor-theme;
-      name = "Numix-Cursor-Light";
-      size = 32;
+      name = "Numix-Cursor";
+      size = 24;
     };
 
     # MIME set ups
diff --git a/home/modules/programs/my-sway/default.nix b/home/modules/programs/my-sway/default.nix
index 9726029..10a1257 100644
--- a/home/modules/programs/my-sway/default.nix
+++ b/home/modules/programs/my-sway/default.nix
@@ -79,6 +79,11 @@ in
       # Wallpaper
       output."*".bg = if cfg.wallpaper == "" then "#000000 solid_color" else "${cfg.wallpaper} fill";
 
+      ### Seats
+      #
+      # Cursor
+      seat."*".xcursor_theme = "${config.xsession.pointerCursor.name} ${toString config.xsession.pointerCursor.size}";
+
       ### Programs
       #
       # Terminal