From a455d2cd07c653440f481f08c5dbdac058317fb4 Mon Sep 17 00:00:00 2001
From: NullBite <me@nullbite.com>
Date: Fri, 16 Aug 2024 11:42:52 +0200
Subject: [PATCH] Update stylix

---
 flake.lock            | 17 ++++++++---------
 flake.nix             |  2 +-
 home/common/theme.nix |  7 ++++---
 home/standalone.nix   |  3 ++-
 home/stylix.nix       |  3 ++-
 system/stylix.nix     |  5 ++---
 6 files changed, 19 insertions(+), 18 deletions(-)

diff --git a/flake.lock b/flake.lock
index 1784646..213b2a3 100644
--- a/flake.lock
+++ b/flake.lock
@@ -157,15 +157,15 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1663659192,
-        "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
-        "owner": "chriskempson",
+        "lastModified": 1722597040,
+        "narHash": "sha256-F4XRYPXhN47vwBQWPhWS5mBRNNwrgZ+n+n2WsRSh+vQ=",
+        "owner": "tinted-theming",
         "repo": "base16-vim",
-        "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
+        "rev": "5a200412c9856085ce726beb4c14c47326c19700",
         "type": "github"
       },
       "original": {
-        "owner": "chriskempson",
+        "owner": "tinted-theming",
         "repo": "base16-vim",
         "type": "github"
       }
@@ -931,16 +931,15 @@
         ]
       },
       "locked": {
-        "lastModified": 1716384443,
-        "narHash": "sha256-utea2y5nEwzMM9rWJXDN0qmV4tJjRcMERQEcgk/ng00=",
+        "lastModified": 1722946882,
+        "narHash": "sha256-mxtnMye8gs82tdQbVC+g6v3aPOZlH150f9WyntHIkTg=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
+        "rev": "5853f1a8bd072f2ebabfc3de3973084353cf6f1e",
         "type": "github"
       },
       "original": {
         "owner": "danth",
-        "ref": "e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8",
         "repo": "stylix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 2f6bf58..bc69add 100644
--- a/flake.nix
+++ b/flake.nix
@@ -70,7 +70,7 @@
     };
 
     stylix = {
-      url = "github:danth/stylix?ref=e8e3304c2f8cf2ca60dcfc736a7422af2f24b8a8";
+      url = "github:danth/stylix";
       inputs.nixpkgs.follows = "nixpkgs";
       inputs.home-manager.follows = "home-manager";
     };
diff --git a/home/common/theme.nix b/home/common/theme.nix
index fb45da7..6e71377 100644
--- a/home/common/theme.nix
+++ b/home/common/theme.nix
@@ -1,6 +1,7 @@
 { config, lib, pkgs, ... }:
 let
   cfg = config.nixfiles.theming;
+  mkDefaultStylix = lib.mkOverride 999;
 
   toCaps = s: with lib.strings; with builtins;
     (toUpper (substring 0 1 s)) + toLower (substring 1 ((stringLength s)-1) s);
@@ -80,9 +81,9 @@ in {
       enable = true;
       autoEnable = true;
       cursor = {
-        package = lib.mkDefault ctp.packages.cursors;
-        name = lib.mkDefault ctp.names.cursors;
-        size = lib.mkDefault 24;
+        package = mkDefaultStylix ctp.packages.cursors;
+        name = mkDefaultStylix ctp.names.cursors;
+        size = mkDefaultStylix 24;
         # x11.enable = lib.mkDefault true;
         # gtk.enable = lib.mkDefault true;
       };
diff --git a/home/standalone.nix b/home/standalone.nix
index 7bbe3cc..0404ea4 100644
--- a/home/standalone.nix
+++ b/home/standalone.nix
@@ -1,9 +1,10 @@
 # Home Manager default nixfiles entrypoint. This serves as an alternative to
 # default.nix, which sets up some more appropriate options for home-manager
-{ pkgs, config, lib, ... }:
+{ inputs, pkgs, config, lib, ... }:
 {
   imports = [
     ./.
+    inputs.stylix.homeManagerModules.stylix
   ];
   config = {
     # bash is more common on my standalone machines for some reason (low
diff --git a/home/stylix.nix b/home/stylix.nix
index d4d606e..d99e85f 100644
--- a/home/stylix.nix
+++ b/home/stylix.nix
@@ -1,10 +1,11 @@
 { pkgs, lib, config, inputs, ... }@args:
 {
-  imports = [ inputs.stylix.homeManagerModules.stylix ];
+  imports = [ ];
   config = {
     stylix = lib.mkMerge [
       {
         targets.vim.enable = lib.mkDefault false;
+        targets.neovim.enable = lib.mkDefault false;
         targets.gtk.enable = lib.mkDefault false;
         targets.fzf.enable = lib.mkDefault false;
         # the ring is styled light so it's light on light which looks worse than the default theme
diff --git a/system/stylix.nix b/system/stylix.nix
index c391269..2647950 100644
--- a/system/stylix.nix
+++ b/system/stylix.nix
@@ -10,7 +10,7 @@
       # this naming is confusing as shit
       # this enables color theming of things by stylix
       autoEnable = lib.mkDefault config.stylix.enable;
-      # this enables installation of fonts/images/etc
+      # this enables the entire module. keep this off by default.
       enable = lib.mkDefault false;
 
       # an image i like
@@ -22,8 +22,7 @@
         # use system config in home-manager
         followSystem = lib.mkDefault true;
 
-        # I will manually import within home-manager so it works standalone
-        autoImport = lib.mkDefault false;
+        autoImport = lib.mkDefault true;
       };
     };
   };