From ba768687ae22904b0473555028e4a0f10ca4065a Mon Sep 17 00:00:00 2001
From: Christoph Hollizeck <christoph.hollizeck@hey.com>
Date: Wed, 27 Mar 2024 13:25:57 +0100
Subject: [PATCH] move kitty to apps instead of cli-apps

---
 homes/x86_64-linux/cholli@workvm/default.nix        | 3 +--
 modules/home/apps/cli-apps/home-manager/default.nix | 9 +++++----
 modules/home/apps/{cli-apps => }/kitty/default.nix  | 4 ++--
 3 files changed, 8 insertions(+), 8 deletions(-)
 rename modules/home/apps/{cli-apps => }/kitty/default.nix (85%)

diff --git a/homes/x86_64-linux/cholli@workvm/default.nix b/homes/x86_64-linux/cholli@workvm/default.nix
index 5e3dc3b..8a954b9 100644
--- a/homes/x86_64-linux/cholli@workvm/default.nix
+++ b/homes/x86_64-linux/cholli@workvm/default.nix
@@ -8,9 +8,8 @@
 }:
 with lib.wyrdgard; {
   wyrdgard = {
-    apps.cli-apps = {
+    apps = {
       kitty = enabled;
-      home-manager = enabled;
     };
 
     tools = {
diff --git a/modules/home/apps/cli-apps/home-manager/default.nix b/modules/home/apps/cli-apps/home-manager/default.nix
index 091627c..511606e 100644
--- a/modules/home/apps/cli-apps/home-manager/default.nix
+++ b/modules/home/apps/cli-apps/home-manager/default.nix
@@ -2,14 +2,15 @@
   lib,
   config,
   ...
-}: let
-  inherit (lib) mkEnableOption mkIf;
-  inherit (lib.wyrdgard) enabled;
+}: 
+with lib;
+with lib.wyrdgard;
+let
 
   cfg = config.wyrdgard.apps.cli-apps.home-manager;
 in {
   options.wyrdgard.apps.cli-apps.home-manager = {
-    enable = mkEnableOption "home-manager";
+    enable = mkBoolOpt true "Enable home-manager";
   };
 
   config = mkIf cfg.enable {
diff --git a/modules/home/apps/cli-apps/kitty/default.nix b/modules/home/apps/kitty/default.nix
similarity index 85%
rename from modules/home/apps/cli-apps/kitty/default.nix
rename to modules/home/apps/kitty/default.nix
index b11c3ed..0444067 100644
--- a/modules/home/apps/cli-apps/kitty/default.nix
+++ b/modules/home/apps/kitty/default.nix
@@ -6,9 +6,9 @@
 }:
 with lib;
 with lib.wyrdgard; let
-  cfg = config.wyrdgard.apps.cli-apps.kitty;
+  cfg = config.wyrdgard.apps.kitty;
 in {
-  options.wyrdgard.apps.cli-apps.kitty = {
+  options.wyrdgard.apps.kitty = {
     enable = mkEnableOption "Kity";
   };