From ae6cd87ecc5439d6250ff1e47f3dcaeab734aecf Mon Sep 17 00:00:00 2001
From: mjallen18 <matt.l.jallen@gmail.com>
Date: Fri, 30 May 2025 18:05:19 -0500
Subject: [PATCH] Desktop Updates Fri May 30 06:05:19 PM CDT 2025

---
 base/base-gui/default.nix       |  1 -
 hosts/deck/configuration.nix    |  2 ++
 hosts/desktop/configuration.nix | 34 +++++++++++++++++----------------
 3 files changed, 20 insertions(+), 17 deletions(-)

diff --git a/base/base-gui/default.nix b/base/base-gui/default.nix
index 5cb0538..38d50f4 100644
--- a/base/base-gui/default.nix
+++ b/base/base-gui/default.nix
@@ -29,7 +29,6 @@
         zlib
       ];
     };
-    coolercontrol.enable = true;
     seahorse.enable = true;
   };
 
diff --git a/hosts/deck/configuration.nix b/hosts/deck/configuration.nix
index 4326913..528d424 100755
--- a/hosts/deck/configuration.nix
+++ b/hosts/deck/configuration.nix
@@ -49,6 +49,8 @@
     root.shell = pkgs.zsh;
   };
 
+  programs.coolercontrol.enable = true;
+
   services = {
     btrfs = {
       autoScrub.enable = lib.mkDefault true;
diff --git a/hosts/desktop/configuration.nix b/hosts/desktop/configuration.nix
index f4c6b45..b35900f 100755
--- a/hosts/desktop/configuration.nix
+++ b/hosts/desktop/configuration.nix
@@ -28,7 +28,7 @@ let
     kdePackages.ksvg
     memtest86-efi
     memtest86plus
-    occt
+    # occt
     os-prober
     nil
     qemu_full
@@ -76,26 +76,26 @@ let
         voltage_offset: 0
         power_states: {}
   '';
-  occt = pkgs.stdenv.mkDerivation {
-      pname = "occt";
-      version = "14.0.10";
+  # occt = pkgs.stdenv.mkDerivation {
+  #     pname = "occt";
+  #     version = "14.0.10";
 
-      src = pkgs.fetchurl {
-        url = "https://www.ocbase.com/download-bin/edition:Personal/os:Linux";
-        sha256 = "sha256-AomQNi7ODGaznFaHqxlFUcrV36QeLNC65MoCV2y6HZ8=";
-      };
+  #     src = pkgs.fetchurl {
+  #       url = "https://www.ocbase.com/download-bin/edition:Personal/os:Linux";
+  #       sha256 = "sha256-AomQNi7ODGaznFaHqxlFUcrV36QeLNC65MoCV2y6HZ8=";
+  #     };
 
-      dontUnpack = true;
+  #     dontUnpack = true;
 
-      buildPhase = ''
-        mkdir -p $out/bin
-        cp $src $out/bin/OCCT
-        chmod +x $out/bin/OCCT
-      '';
+  #     buildPhase = ''
+  #       mkdir -p $out/bin
+  #       cp $src $out/bin/OCCT
+  #       chmod +x $out/bin/OCCT
+  #     '';
 
 
-      installPhase = "true";
-    };
+  #     installPhase = "true";
+  #   };
 in
 {
   imports = [
@@ -157,6 +157,8 @@ in
     };
   };
 
+  programs.coolercontrol.enable = true;
+
   # Time configuration
   time = {
     hardwareClockInLocalTime = lib.mkDefault false;