From b419f6e26edff4575aef6109f2e17a2ab1ac6053 Mon Sep 17 00:00:00 2001
From: Dave Gallant <dave.gallant@gmail.com>
Date: Tue, 18 Jun 2024 08:30:51 -0400
Subject: [PATCH] Pin stylix to 24.05

---
 flake.lock                            | 37 +++++++++++++++++++--------
 flake.nix                             |  5 +---
 home/default.nix                      | 10 ++++++--
 machines/hephaestus/configuration.nix |  1 +
 machines/zelus/configuration.nix      |  7 ++---
 5 files changed, 40 insertions(+), 20 deletions(-)

diff --git a/flake.lock b/flake.lock
index 119b19b..7caa3fc 100644
--- a/flake.lock
+++ b/flake.lock
@@ -101,15 +101,15 @@
     "base16-vim": {
       "flake": false,
       "locked": {
-        "lastModified": 1716150083,
-        "narHash": "sha256-ZMhnNmw34ogE5rJZrjRv5MtG3WaqKd60ds2VXvT6hEc=",
-        "owner": "tinted-theming",
+        "lastModified": 1663659192,
+        "narHash": "sha256-uJvaYYDMXvoo0fhBZUhN8WBXeJ87SRgof6GEK2efFT0=",
+        "owner": "chriskempson",
         "repo": "base16-vim",
-        "rev": "6e955d704d046b0dc3e5c2d68a2a6eeffd2b5d3d",
+        "rev": "3be3cd82cd31acfcab9a41bad853d9c68d30478d",
         "type": "github"
       },
       "original": {
-        "owner": "tinted-theming",
+        "owner": "chriskempson",
         "repo": "base16-vim",
         "type": "github"
       }
@@ -454,6 +454,22 @@
         "type": "github"
       }
     },
+    "nixpkgs_2": {
+      "locked": {
+        "lastModified": 1718470082,
+        "narHash": "sha256-u2F0MMYE+Efc+ocruTbtU/wWHuYHWcJafp5zJ++n/YE=",
+        "owner": "NixOS",
+        "repo": "nixpkgs",
+        "rev": "3027ba73dfef68eb555fc2fa97aed4e999e74f97",
+        "type": "github"
+      },
+      "original": {
+        "owner": "NixOS",
+        "ref": "nixpkgs-unstable",
+        "repo": "nixpkgs",
+        "type": "github"
+      }
+    },
     "nixvim": {
       "inputs": {
         "devshell": "devshell",
@@ -505,20 +521,19 @@
         "flake-compat": "flake-compat_3",
         "gnome-shell": "gnome-shell",
         "home-manager": "home-manager_3",
-        "nixpkgs": [
-          "nixpkgs"
-        ]
+        "nixpkgs": "nixpkgs_2"
       },
       "locked": {
-        "lastModified": 1718634635,
-        "narHash": "sha256-REUyeY+gD/QuTwAhuJycheej0FWFGPTosI+jiG5TsQk=",
+        "lastModified": 1718122552,
+        "narHash": "sha256-A+dBkSwp8ssHKV/WyXb9uqIYrHBqHvtSedU24Lq9lqw=",
         "owner": "danth",
         "repo": "stylix",
-        "rev": "f13c946181730f98e1a5cd09714100490207b250",
+        "rev": "e59d2c1725b237c362e4a62f5722f5b268d566c7",
         "type": "github"
       },
       "original": {
         "owner": "danth",
+        "ref": "release-24.05",
         "repo": "stylix",
         "type": "github"
       }
diff --git a/flake.nix b/flake.nix
index 6158246..209fb54 100644
--- a/flake.nix
+++ b/flake.nix
@@ -17,10 +17,7 @@
       url = "github:nix-community/nixvim/nixos-24.05";
       inputs.nixpkgs.follows = "nixpkgs";
     };
-    stylix = {
-      url = "github:danth/stylix";
-      inputs.nixpkgs.follows = "nixpkgs";
-    };
+    stylix.url = "github:danth/stylix/release-24.05";
   };
 
   outputs =
diff --git a/home/default.nix b/home/default.nix
index 384d8f6..16a4a6b 100644
--- a/home/default.nix
+++ b/home/default.nix
@@ -12,9 +12,15 @@ in
   home.packages = with pkgs; [ just ];
 
   stylix = {
+    enable = true;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/tokyo-night-dark.yaml";
-    targets.vscode.enable = false; # overrides synced settings
-    targets.tmux.enable = true;
+    targets = {
+      alacritty.enable = true;
+      tmux.enable = true;
+      vscode.enable = false; # overrides synced settings
+    };
+
+    opacity.terminal = 1.0;
 
     fonts.sizes =
       if stdenv.isLinux
diff --git a/machines/hephaestus/configuration.nix b/machines/hephaestus/configuration.nix
index ca52607..98d622b 100644
--- a/machines/hephaestus/configuration.nix
+++ b/machines/hephaestus/configuration.nix
@@ -24,6 +24,7 @@ in
   imports = [ (modulesPath + "/installer/scan/not-detected.nix") ];
 
   stylix = {
+    enable = true;
     base16Scheme = "${unstable.base16-schemes}/share/themes/tokyo-night-dark.yaml";
     image = pkgs.fetchurl {
       url = "https://github.com/davegallant/nix-config/blob/main/nixos-wallpaper.png?raw=true";
diff --git a/machines/zelus/configuration.nix b/machines/zelus/configuration.nix
index b342726..b81cfbb 100644
--- a/machines/zelus/configuration.nix
+++ b/machines/zelus/configuration.nix
@@ -109,8 +109,9 @@ in
     ];
   };
 
-  stylix.image = "/Library/tokyo-night.jpg";
-
-  stylix.autoEnable = false;
+  stylix = {
+    # enable = true;
+    image = "/Library/tokyo-night.jpg";
+  };
 
 }