From 533b1978256fe55b69fe1c1a2293ba97d58e7417 Mon Sep 17 00:00:00 2001
From: osbm <osbm@osbm.dev>
Date: Wed, 22 Oct 2025 21:20:10 +0300
Subject: [PATCH] set home manager options properly

---
 modules/home-manager/programs/alacritty.nix | 36 ++++++++++------
 modules/home-manager/programs/ghostty.nix   | 12 +++---
 modules/home-manager/programs/mpv.nix       | 24 +++++++----
 modules/home-manager/programs/wezterm.nix   | 48 +++++++++++----------
 4 files changed, 71 insertions(+), 49 deletions(-)

diff --git a/modules/home-manager/programs/alacritty.nix b/modules/home-manager/programs/alacritty.nix
index a3c6b41..7a60352 100644
--- a/modules/home-manager/programs/alacritty.nix
+++ b/modules/home-manager/programs/alacritty.nix
@@ -1,18 +1,26 @@
-{ lib, ... }:
+{ lib, nixosConfig, ... }:
 {
-  programs.alacritty = {
-    enable = lib.mkDefault false;
-    settings = {
-      window = {
-        opacity = 0.95;
-        padding = {
-          x = 10;
-          y = 10;
+  config = lib.mkMerge [
+    (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") {
+      # Set enableAlacritty to true by default when there's a desktop environment
+      programs.alacritty.enable = lib.mkDefault true;
+    })
+
+    {
+      programs.alacritty = {
+        settings = {
+          window = {
+            opacity = 0.95;
+            padding = {
+              x = 10;
+              y = 10;
+            };
+          };
+          font = {
+            size = 11.0;
+          };
         };
       };
-      font = {
-        size = 11.0;
-      };
-    };
-  };
+    }
+  ];
 }
diff --git a/modules/home-manager/programs/ghostty.nix b/modules/home-manager/programs/ghostty.nix
index e5977bf..6c50f2e 100644
--- a/modules/home-manager/programs/ghostty.nix
+++ b/modules/home-manager/programs/ghostty.nix
@@ -1,7 +1,9 @@
-{ lib, ... }:
+{ lib, nixosConfig, ... }:
 {
-  programs.ghostty = {
-    enable = lib.mkDefault false;
-    # Configuration can be added as needed
-  };
+  config = lib.mkMerge [
+    (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") {
+      # Set enableGhostty to true by default when there's a desktop environment
+      programs.ghostty.enable = lib.mkDefault true;
+    })
+  ];
 }
diff --git a/modules/home-manager/programs/mpv.nix b/modules/home-manager/programs/mpv.nix
index f08f20c..0353ae2 100644
--- a/modules/home-manager/programs/mpv.nix
+++ b/modules/home-manager/programs/mpv.nix
@@ -1,10 +1,18 @@
-{ lib, ... }:
+{ lib, nixosConfig, ... }:
 {
-  programs.mpv = {
-    enable = lib.mkDefault false;
-    config = {
-      hwdec = "auto";
-      vo = "gpu";
-    };
-  };
+  config = lib.mkMerge [
+    (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") {
+      programs.mpv.enable = lib.mkDefault true;
+    })
+
+    {
+      programs.mpv = {
+        config = {
+          hwdec = "auto";
+          vo = "gpu";
+        };
+      };
+    }
+
+  ];
 }
diff --git a/modules/home-manager/programs/wezterm.nix b/modules/home-manager/programs/wezterm.nix
index 7a5a93c..2282220 100644
--- a/modules/home-manager/programs/wezterm.nix
+++ b/modules/home-manager/programs/wezterm.nix
@@ -1,32 +1,36 @@
 {
   lib,
-  config,
   pkgs,
+  nixosConfig,
   ...
 }:
 {
-  options.enableWezterm = lib.mkEnableOption "Wezterm terminal emulator";
-  config = {
-    programs.wezterm = {
-      enable = config.enableWezterm;
-      extraConfig = ''
-        _G.shells = {
-          fish = '${lib.getExe pkgs.fish}'
-        };
+  config = lib.mkMerge [
+    (lib.mkIf (nixosConfig != null && nixosConfig.osbmModules.desktopEnvironment != "none") {
+      programs.wezterm.enable = lib.mkDefault true;
+    })
 
-        wezterm.on('gui-startup', function(cmd)
-          local tab, pane, window = wezterm.mux.spawn_window(cmd or {})
-          window:gui_window():maximize()
-        end)
+    {
+      programs.wezterm = {
+        extraConfig = ''
+          _G.shells = {
+            fish = '${lib.getExe pkgs.fish}'
+          };
+
+          wezterm.on('gui-startup', function(cmd)
+            local tab, pane, window = wezterm.mux.spawn_window(cmd or {})
+            window:gui_window():maximize()
+          end)
 
 
-        return {
-          default_prog = { _G.shells.fish },
-          window_decorations = "NONE",
-          hide_tab_bar_if_only_one_tab = true,
-          enable_wayland = false,
-        }
-      '';
-    };
-  };
+          return {
+            default_prog = { _G.shells.fish },
+            window_decorations = "NONE",
+            hide_tab_bar_if_only_one_tab = true,
+            enable_wayland = false,
+          }
+        '';
+      };
+    }
+  ];
 }