From 89e5dfae3ee054e83759e9295ea30b2c790db0c6 Mon Sep 17 00:00:00 2001
From: Aly Raffauf <aly@raffauflabs.com>
Date: Fri, 21 Jun 2024 17:24:33 -0400
Subject: [PATCH] home: use defaults from osConfig

---
 homeManagerModules/options.nix | 26 ++++++++++++++++++--------
 homes/aly.nix                  | 15 +++++++++++----
 homes/dustin.nix               |  5 -----
 3 files changed, 29 insertions(+), 17 deletions(-)

diff --git a/homeManagerModules/options.nix b/homeManagerModules/options.nix
index cf8cb276..a063e6b4 100644
--- a/homeManagerModules/options.nix
+++ b/homeManagerModules/options.nix
@@ -1,7 +1,8 @@
 {
-  pkgs,
-  lib,
   config,
+  lib,
+  osConfig,
+  pkgs,
   ...
 }: {
   options = {
@@ -183,13 +184,22 @@
         };
       };
       desktop = {
-        cinnamon.enable =
-          lib.mkEnableOption "Cinnamon with sane defaults.";
-        gnome.enable =
-          lib.mkEnableOption "GNOME with sane defaults.";
+        cinnamon.enable = lib.mkOption {
+          description = "Cinnamon with sane defaults";
+          default = osConfig.alyraffauf.desktop.cinnamon.enable;
+          type = lib.types.bool;
+        };
+        gnome.enable = lib.mkOption {
+          description = "GNOME with sane defaults.";
+          default = osConfig.alyraffauf.desktop.gnome.enable;
+          type = lib.types.bool;
+        };
         hyprland = {
-          enable =
-            lib.mkEnableOption "Hyprland with full desktop session components.";
+          enable = lib.mkOption {
+            description = "Hyprland with full desktop session components.";
+            default = osConfig.alyraffauf.desktop.hyprland.enable;
+            type = lib.types.bool;
+          };
           autoSuspend = lib.mkOption {
             description = "Whether to autosuspend on idle.";
             default = config.alyraffauf.desktop.hyprland.enable;
diff --git a/homes/aly.nix b/homes/aly.nix
index 0b28a6f9..3b78f509 100644
--- a/homes/aly.nix
+++ b/homes/aly.nix
@@ -146,6 +146,7 @@
       tmux.enable = true;
       vsCodium.enable = true;
     };
+
     defaultApps = {
       enable = true;
       webBrowser = {
@@ -153,19 +154,18 @@
         desktop = "brave-browser.desktop";
       };
     };
+
     desktop = {
       startupApps = [(lib.getExe' pkgs.keepassxc "keepassxc")];
-      hyprland = {
-        enable = true;
-        randomWallpaper = true;
-      };
     };
 
     scripts = {
       pp-adjuster.enable = true;
     };
+
     theme = {
       enable = true;
+
       gtk = {
         name = "Catppuccin-Frappe-Compact-Mauve-Dark";
         package = pkgs.catppuccin-gtk.override {
@@ -175,6 +175,7 @@
           tweaks = ["normal"];
         };
       };
+
       qt = {
         name = "Catppuccin-Frappe-Mauve";
         package = pkgs.catppuccin-kvantum.override {
@@ -182,6 +183,7 @@
           variant = "Frappe";
         };
       };
+
       iconTheme = {
         name = "Papirus-Dark";
         package = pkgs.catppuccin-papirus-folders.override {
@@ -189,21 +191,25 @@
           accent = "mauve";
         };
       };
+
       cursorTheme = {
         name = "Catppuccin-Frappe-Dark-Cursors";
         size = 24;
         package = pkgs.catppuccin-cursors.frappeDark;
       };
+
       font = {
         name = "NotoSans Nerd Font";
         size = 11;
         package = pkgs.nerdfonts.override {fonts = ["Noto"];};
       };
+
       terminalFont = {
         name = "NotoSansM Nerd Font";
         size = 11;
         package = pkgs.nerdfonts.override {fonts = ["Noto"];};
       };
+
       colors = {
         text = "#FAFAFA";
         background = "#232634";
@@ -212,6 +218,7 @@
         inactive = "#626880";
         shadow = "#1A1A1A";
       };
+      
       wallpaper = "${config.xdg.dataHome}/backgrounds/jr-korpa-9XngoIpxcEo-unsplash.jpg";
     };
   };
diff --git a/homes/dustin.nix b/homes/dustin.nix
index f3567a18..b5c6b521 100644
--- a/homes/dustin.nix
+++ b/homes/dustin.nix
@@ -43,11 +43,6 @@
     defaultApps.enable = true;
     desktop = {
       hyprland = {
-        enable = true;
-        randomWallpaper = false;
-      };
-      sway = {
-        enable = true;
         randomWallpaper = false;
       };
     };