clean

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";

hosts/desktop1/hardware-configuration.nix

@@ -1,37 +1,53 @@
 # Do not modify this file!  It was generated by ‘nixos-generate-config’
 # and may be overwritten by future invocations.  Please make changes
 # to /etc/nixos/configuration.nix instead.
-{ config, lib, pkgs, modulesPath, ... }:
+{
+  config,
+  lib,
+  pkgs,
+  modulesPath,
+  ...
+}:
 
 {
-  imports =
+  imports = [
-    [ (modulesPath + "/installer/scan/not-detected.nix")
+    (modulesPath + "/installer/scan/not-detected.nix")
-    ];
+  ];
 
-  boot.initrd.availableKernelModules = [ "xhci_pci" "ahci" "nvme" "usb_storage" "usbhid" "sd_mod" ];
+  boot.initrd.availableKernelModules = [
+    "xhci_pci"
+    "ahci"
+    "nvme"
+    "usb_storage"
+    "usbhid"
+    "sd_mod"
+  ];
   boot.initrd.kernelModules = [ ];
   boot.kernelModules = [ "kvm-amd" ];
   boot.extraModulePackages = [ ];
 
-  fileSystems."/" =
+  fileSystems."/" = {
-    { device = "/dev/disk/by-uuid/05e716ac-e6a2-407d-9941-5ad95db74698";
+    device = "/dev/disk/by-uuid/05e716ac-e6a2-407d-9941-5ad95db74698";
-      fsType = "ext4";
+    fsType = "ext4";
-    };
+  };
 
-  fileSystems."/boot" =
+  fileSystems."/boot" = {
-    { device = "/dev/disk/by-uuid/A238-B4BF";
+    device = "/dev/disk/by-uuid/A238-B4BF";
-      fsType = "vfat";
+    fsType = "vfat";
-      options = [ "fmask=0077" "dmask=0077" ];
+    options = [
-    };
+      "fmask=0077"
-
+      "dmask=0077"
-  fileSystems."/home" =
-    { device = "/dev/disk/by-uuid/30759de4-934a-4c89-aca5-2e4fed7fe94f";
-      fsType = "ext4";
-    };
-
-  swapDevices =
-    [ { device = "/dev/disk/by-uuid/5baebd62-0a58-47c0-b2de-1f5c2970fadf"; }
     ];
+  };
+
+  fileSystems."/home" = {
+    device = "/dev/disk/by-uuid/30759de4-934a-4c89-aca5-2e4fed7fe94f";
+    fsType = "ext4";
+  };
+
+  swapDevices = [
+    { device = "/dev/disk/by-uuid/5baebd62-0a58-47c0-b2de-1f5c2970fadf"; }
+  ];
 
   # Enables DHCP on each ethernet and wireless interface. In case of scripted networking
   # (the default) this is the recommended approach. When using systemd-networkd it's

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 {
+  config = mkIf smayzy.base-cli-pkgs.enable {
-    type = types.bool;
-    default = false;
-    description = "set to true if you want to use a nvidia GC";
-  };
-
-  config = mkIf config.smayzy.lf.enable {
     xdg.configFile."lf/icons".source = ./icons;
 
     programs.lf = {

modules/home-manager/notif/mako.nix

@@ -7,11 +7,11 @@ in
     services.mako = {
       enable = true;
       settings = {
-        font="JetBrainsMono 10";
+        font = "JetBrainsMono 10";
-        background-color="#282828";
+        background-color = "#282828";
-        text-color="#ebdbb2";
+        text-color = "#ebdbb2";
-        border-color="#98971a";
+        border-color = "#98971a";
-        border-size=2;
+        border-size = 2;
       };
     };
   };

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 {
+  config = mkIf smayzy.kitty.enable {
-    type = types.bool;
-    default = false;
-    description = "kitty config";
-  };
-
-  config = mkIf config.smayzy.kitty.enable {
     programs.kitty = {
       enable = true;
       settings = {

modules/nix/browser/chromium.nix

@@ -1,4 +1,9 @@
-{ lib, config, pkgs, ... }:
+{
+  lib,
+  config,
+  pkgs,
+  ...
+}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/notif/mako.nix

@@ -1,4 +1,9 @@
-{ config, lib, pkgs, ...}:
+{
+  config,
+  lib,
+  pkgs,
+  ...
+}:
 let
   inherit (lib) mkIf mkOption types;
 in

modules/nix/terminal/default.nix

@@ -2,5 +2,6 @@
 {
   imports = [
     ./alacritty.nix
+    ./kitty.nix
   ];
 }

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 ];
+  };
+}

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
     ];