From 1f6904cbc9e79a41044a70e5a97d10663117556a Mon Sep 17 00:00:00 2001
From: smayzy <smayzy@smayzy.ovh>
Date: Sat, 2 Aug 2025 15:20:59 +0200
Subject: [PATCH] clean

---
 hosts/common/home.nix                   |  4 ----
 modules/home-manager/lf/lf.nix          | 12 +++---------
 modules/home-manager/terminal/kitty.nix | 12 +++---------
 modules/nix/terminal/default.nix        |  1 +
 modules/nix/terminal/kitty.nix          | 20 ++++++++++++++++++++
 modules/nix/wm/hyprland.nix             |  3 ++-
 6 files changed, 29 insertions(+), 23 deletions(-)
 create mode 100644 modules/nix/terminal/kitty.nix

diff --git a/hosts/common/home.nix b/hosts/common/home.nix
index bfec83d..a742022 100644
--- a/hosts/common/home.nix
+++ b/hosts/common/home.nix
@@ -5,10 +5,6 @@
     ../../modules/home-manager/default.nix
   ];
 
-  smayzy.lf.enable = true;
-
-  smayzy.kitty.enable = true;
-
   home.username = "smayzy";
   home.homeDirectory = "/home/smayzy";
   home.stateVersion = "25.05";
diff --git a/modules/home-manager/lf/lf.nix b/modules/home-manager/lf/lf.nix
index 993be6b..407fd0f 100644
--- a/modules/home-manager/lf/lf.nix
+++ b/modules/home-manager/lf/lf.nix
@@ -1,20 +1,14 @@
 {
   pkgs,
   lib,
-  config,
+  smayzy,
   ...
 }:
 let
-  inherit (lib) mkIf mkOption types;
+  inherit (lib) mkIf;
 in
 {
-  options.smayzy.lf.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "set to true if you want to use a nvidia GC";
-  };
-
-  config = mkIf config.smayzy.lf.enable {
+  config = mkIf smayzy.base-cli-pkgs.enable {
     xdg.configFile."lf/icons".source = ./icons;
 
     programs.lf = {
diff --git a/modules/home-manager/terminal/kitty.nix b/modules/home-manager/terminal/kitty.nix
index 551b8ca..b0a2780 100644
--- a/modules/home-manager/terminal/kitty.nix
+++ b/modules/home-manager/terminal/kitty.nix
@@ -1,15 +1,9 @@
-{ config, lib, ... }:
+{ smayzy, lib, ... }:
 let
-  inherit (lib) mkIf mkOption types;
+  inherit (lib) mkIf;
 in
 {
-  options.smayzy.kitty.enable = mkOption {
-    type = types.bool;
-    default = false;
-    description = "kitty config";
-  };
-
-  config = mkIf config.smayzy.kitty.enable {
+  config = mkIf smayzy.kitty.enable {
     programs.kitty = {
       enable = true;
       settings = {
diff --git a/modules/nix/terminal/default.nix b/modules/nix/terminal/default.nix
index 8e51b46..cfce850 100644
--- a/modules/nix/terminal/default.nix
+++ b/modules/nix/terminal/default.nix
@@ -2,5 +2,6 @@
 {
   imports = [
     ./alacritty.nix
+    ./kitty.nix
   ];
 }
diff --git a/modules/nix/terminal/kitty.nix b/modules/nix/terminal/kitty.nix
new file mode 100644
index 0000000..284d15f
--- /dev/null
+++ b/modules/nix/terminal/kitty.nix
@@ -0,0 +1,20 @@
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
+let
+  inherit (lib) mkIf mkOption types;
+in
+{
+  options.smayzy.kitty.enable = mkOption {
+    type = types.bool;
+    default = false;
+    description = "kitty";
+  };
+
+  config = mkIf config.smayzy.kitty.enable {
+    environment.systemPackages = with pkgs; [ kitty ];
+  };
+}
diff --git a/modules/nix/wm/hyprland.nix b/modules/nix/wm/hyprland.nix
index 0f99527..3080440 100644
--- a/modules/nix/wm/hyprland.nix
+++ b/modules/nix/wm/hyprland.nix
@@ -27,6 +27,8 @@ in
 
     smayzy.mako.enable = true;
 
+    smayzy.kitty.enable = true;
+
     environment.systemPackages = with pkgs; [
       wofi
       wlogout
@@ -38,7 +40,6 @@ in
       hyprlock
       pavucontrol
       cliphist
-      kitty
       grim
       slurp
     ];