From 6b285549694e16b1a9533147722d8ba1384dc03a Mon Sep 17 00:00:00 2001
From: Yorick Barbanneau <ephase@xieme-art.org>
Date: Tue, 5 Mar 2024 22:32:15 +0100
Subject: [PATCH] Change in packages name for neovim Base16 plugin

---
 hosts/luci/home-config.nix                            | 11 +++++++++++
 modules/home-manager/cli/neovim/default.nix           |  2 +-
 modules/home-manager/desktop/sway/default.nix         |  6 ++++++
 modules/home-manager/desktop/sway/includes/waybar.nix |  8 ++++++--
 4 files changed, 24 insertions(+), 3 deletions(-)

diff --git a/hosts/luci/home-config.nix b/hosts/luci/home-config.nix
index 3161587..dbd6042 100644
--- a/hosts/luci/home-config.nix
+++ b/hosts/luci/home-config.nix
@@ -20,6 +20,17 @@
     desktop.sway = {
       enable = true;
       kanshi = true;
+      waybar = {
+        laptop = true;
+        gpuThermal = {
+          enable = false;
+        };
+        cpuThermal = {
+          thermalZone = "2";
+          # hwmonPathAbs = "";
+          # inputFilename = "";
+        };
+      };
     };
   };
 }
diff --git a/modules/home-manager/cli/neovim/default.nix b/modules/home-manager/cli/neovim/default.nix
index 341cda8..5f5d485 100644
--- a/modules/home-manager/cli/neovim/default.nix
+++ b/modules/home-manager/cli/neovim/default.nix
@@ -49,7 +49,7 @@ in
           '';
         }
         {
-          plugin = nvim-base16;
+          plugin = base16-nvim;
           type = "lua";
           config = ''
             vim.cmd.colorscheme 'base16-default-dark'
diff --git a/modules/home-manager/desktop/sway/default.nix b/modules/home-manager/desktop/sway/default.nix
index 70c4aff..1c0c8fe 100644
--- a/modules/home-manager/desktop/sway/default.nix
+++ b/modules/home-manager/desktop/sway/default.nix
@@ -22,6 +22,12 @@ in
 
       cpuThermal = {
 
+        thermalZone = mkOption {
+          type = types.str;
+          default = "";
+          description = "CPU thermal hwmon thermal Zone";
+        };
+
         hwmonPathAbs = mkOption {
           type = types.str;
           default = "";
diff --git a/modules/home-manager/desktop/sway/includes/waybar.nix b/modules/home-manager/desktop/sway/includes/waybar.nix
index 7ff9f80..df1a1f1 100644
--- a/modules/home-manager/desktop/sway/includes/waybar.nix
+++ b/modules/home-manager/desktop/sway/includes/waybar.nix
@@ -121,8 +121,12 @@ in
           "temperature" = {
             "critical-threshold" = 80;
             "format" = "{temperatureC}°C  ";
-            "hwmon-path-abs" = "${cfg.waybar.cpuThermal.hwmonPathAbs}";
-            "input-filename" = "${cfg.waybar.cpuThermal.inputFilename}";
+            "thermal-zone" = mkIf ( cfg.waybar.cpuThermal.thermalZone != "" )
+              "${cfg.waybar.cpuThermal.thermalZone}";
+            "hwmon-path-abs" = mkIf ( cfg.waybar.cpuThermal.hwmonPathAbs != "" )
+              "${cfg.waybar.cpuThermal.hwmonPathAbs}";
+            "input-filename" = mkIf ( cfg.waybar.cpuThermal.inputFilename != "" )
+              "${cfg.waybar.cpuThermal.inputFilename}";
           };
           "temperature#gpu" = {
             "critical-threshold" = 80;