From e943ee9688e839c50e1c0858e37547eed29263f7 Mon Sep 17 00:00:00 2001
From: albert <albert@sysctl.io>
Date: Sat, 8 Jun 2024 10:31:53 +0900
Subject: [PATCH] Update stylix theme

---
 flake.nix                                      |  4 ++--
 .../common/software/cli/nixvim/base.nix        |  3 +--
 stylix/themes/stylix-day/default.nix           | 10 ++++++++++
 .../themes/stylix-day/home-manager/nixvim.nix  |  4 ++++
 stylix/themes/stylix-day/sakura-night.yaml     | 18 ++++++++++++++++++
 stylix/themes/stylix/default.nix               |  2 +-
 6 files changed, 36 insertions(+), 5 deletions(-)
 create mode 100644 stylix/themes/stylix-day/default.nix
 create mode 100644 stylix/themes/stylix-day/home-manager/nixvim.nix
 create mode 100644 stylix/themes/stylix-day/sakura-night.yaml

diff --git a/flake.nix b/flake.nix
index 17392f79..e098e7f4 100644
--- a/flake.nix
+++ b/flake.nix
@@ -64,7 +64,7 @@
       framework-server = libx.mkHost { hostname = "framework-server"; };
       nuc-server       = libx.mkHost { hostname = "nuc-server"; };
       nixos-desktop    = libx.mkHost { hostname = "nixos-desktop";   unfree = true; desktop = "hyprland"; theme = "green"; };
-      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; };
+      nixos-framework  = libx.mkHost { hostname = "nixos-framework"; unfree = true; desktop = "plasma6"; theme = "stylix-day"; };
       backups-rpi4     = libx.mkHost { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       piaware-rpi4     = libx.mkHost { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
       quitman-rpi4     = libx.mkHost { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
@@ -77,7 +77,7 @@
       "albert@framework-server" = libx.mkHome { hostname = "framework-server"; };
       "albert@nuc-server"       = libx.mkHome { hostname = "nuc-server";  };
       "albert@nixos-desktop"    = libx.mkHome { hostname = "nixos-desktop";   desktop = "hyprland"; theme = "green"; };
-      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; };
+      "albert@nixos-framework"  = libx.mkHome { hostname = "nixos-framework"; desktop = "plasma6"; theme = "stylix-day";};
       "albert@backups-rpi4"     = libx.mkHome { hostname = "backups-rpi4";     system = "aarch64-linux"; type = "small"; };
       "albert@piaware-rpi4"     = libx.mkHome { hostname = "piaware-rpi4";     system = "aarch64-linux"; type = "small"; };
       "albert@quitman-rpi4"     = libx.mkHome { hostname = "quitman-rpi4";     system = "aarch64-linux"; type = "small"; };
diff --git a/home-manager/common/software/cli/nixvim/base.nix b/home-manager/common/software/cli/nixvim/base.nix
index 8051550d..e4ac8eac 100644
--- a/home-manager/common/software/cli/nixvim/base.nix
+++ b/home-manager/common/software/cli/nixvim/base.nix
@@ -43,8 +43,7 @@
   
     # pretty stuff
       # Fancify markdown et al 
-      # TODO  Re-enable this after 24.05
-      # headlines.enable = true;
+      headlines.enable = true;
       # Rainbow matching {} [] () 's
       rainbow-delimiters.enable = true;
       # Colorize hex colors inline
diff --git a/stylix/themes/stylix-day/default.nix b/stylix/themes/stylix-day/default.nix
new file mode 100644
index 00000000..17bf61ba
--- /dev/null
+++ b/stylix/themes/stylix-day/default.nix
@@ -0,0 +1,10 @@
+{ pkgs, ... }: {
+  # Themes https://github.com/tinted-theming/base16-schemes
+  stylix  = {
+    image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png;
+    polarity = "light";
+    # base16Scheme = ./sakura-night.yaml;
+    base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";
+    autoEnable = true;
+  };
+}
diff --git a/stylix/themes/stylix-day/home-manager/nixvim.nix b/stylix/themes/stylix-day/home-manager/nixvim.nix
new file mode 100644
index 00000000..b51eda1b
--- /dev/null
+++ b/stylix/themes/stylix-day/home-manager/nixvim.nix
@@ -0,0 +1,4 @@
+{ lib, ... }: {
+  programs.nixvim.colorscheme = lib.mkForce "ayu-mirage";
+  stylix.targets.nixvim.enable = false;
+}
diff --git a/stylix/themes/stylix-day/sakura-night.yaml b/stylix/themes/stylix-day/sakura-night.yaml
new file mode 100644
index 00000000..a4ff1ca5
--- /dev/null
+++ b/stylix/themes/stylix-day/sakura-night.yaml
@@ -0,0 +1,18 @@
+scheme: "Rosé Pine Moon"
+variant: "dark"
+base00: "232136"
+base01: "2a273f"
+base02: "393552"
+base03: "6e6a86"
+base04: "908caa"
+base05: "e0def4"
+base06: "e0def4"
+base07: "56526e"
+base08: "eb6f92"
+base09: "f6c177"
+base0A: "ea9a97"
+base0B: "3e8fb0"
+base0C: "9ccfd8"
+base0D: "c4a7e7"
+base0E: "f6c177"
+base0F: "56526e"
diff --git a/stylix/themes/stylix/default.nix b/stylix/themes/stylix/default.nix
index de977e00..55f087a7 100644
--- a/stylix/themes/stylix/default.nix
+++ b/stylix/themes/stylix/default.nix
@@ -1,7 +1,7 @@
 { pkgs, ... }: {
   # Themes https://github.com/tinted-theming/base16-schemes
   stylix  = {
-    image = /etc/nixos/git/docs/icons/nixos/white.png;
+    image = /etc/nixos/git/wallpapers/stylix/wallpaper1.png;
     polarity = "dark";
     # base16Scheme = ./sakura-night.yaml;
     base16Scheme = "${pkgs.base16-schemes}/share/themes/atelier-cave.yaml";