From ccac697b2613b077ef12077c3c7b706cec0bd601 Mon Sep 17 00:00:00 2001
From: LunarAkai <akai@lunarakai.de>
Date: Sat, 15 Mar 2025 16:19:21 +0100
Subject: [PATCH] some cleanup

---
 home-manager/luna/categories/cli/default.nix   | 13 +++++++++++++
 home-manager/luna/categories/games/default.nix |  0
 home-manager/luna/categories/rgb/default.nix   |  0
 home-manager/luna/common/default.nix           |  3 ---
 home-manager/luna/hummingbird.nix              | 14 +++-----------
 hosts/common/global/default.nix                |  4 ----
 hosts/common/global/nix-ld.nix                 |  4 +---
 hosts/common/global/nix.nix                    |  6 +-----
 hosts/common/users/luna/default.nix            |  5 ++---
 hosts/hummingbird/configuration.nix            |  6 ++----
 hosts/hummingbird/hardware-configuration.nix   |  1 -
 11 files changed, 22 insertions(+), 34 deletions(-)
 create mode 100644 home-manager/luna/categories/cli/default.nix
 create mode 100644 home-manager/luna/categories/games/default.nix
 create mode 100644 home-manager/luna/categories/rgb/default.nix

diff --git a/home-manager/luna/categories/cli/default.nix b/home-manager/luna/categories/cli/default.nix
new file mode 100644
index 0000000..0242d23
--- /dev/null
+++ b/home-manager/luna/categories/cli/default.nix
@@ -0,0 +1,13 @@
+{pkgs, ...}: {
+  imports = [
+    #./zsh
+  ];
+
+  home.packages = with pkgs; [
+    fd # better find
+    tldr # because 'man' is way too long for my brain :c
+
+    nixd # nix lsp
+    alejandra # formatter
+  ];
+}
diff --git a/home-manager/luna/categories/games/default.nix b/home-manager/luna/categories/games/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/home-manager/luna/categories/rgb/default.nix b/home-manager/luna/categories/rgb/default.nix
new file mode 100644
index 0000000..e69de29
diff --git a/home-manager/luna/common/default.nix b/home-manager/luna/common/default.nix
index 7315a5b..ec52ba7 100644
--- a/home-manager/luna/common/default.nix
+++ b/home-manager/luna/common/default.nix
@@ -1,9 +1,6 @@
 {
-  inputs,
   lib,
-  pkgs,
   config,
-  outputs,
   ...
 }: {
   imports = [
diff --git a/home-manager/luna/hummingbird.nix b/home-manager/luna/hummingbird.nix
index 6697cb0..a22fde9 100644
--- a/home-manager/luna/hummingbird.nix
+++ b/home-manager/luna/hummingbird.nix
@@ -1,18 +1,10 @@
-{
-  config,
-  inputs,
-  lib,
-  outputs,
-  pkgs,
-  ...
-}: {
+{...}: {
   imports = [
     ./common
+
+    ./categories/cli
   ];
 
   # The home.packages option allows you to install Nix packages into your
   # environment.
-  home.packages = with pkgs; [
-    alejandra
-  ];
 }
diff --git a/hosts/common/global/default.nix b/hosts/common/global/default.nix
index d5c7c04..dc3bb7c 100644
--- a/hosts/common/global/default.nix
+++ b/hosts/common/global/default.nix
@@ -1,7 +1,6 @@
 {
   inputs,
   outputs,
-  pkgs,
   ...
 }: {
   imports = [
@@ -16,8 +15,5 @@
     inherit inputs outputs;
   };
 
-  environment.systemPackages = with pkgs; [
-  ];
-
   system.stateVersion = "24.11";
 }
diff --git a/hosts/common/global/nix-ld.nix b/hosts/common/global/nix-ld.nix
index 92ae248..909ad01 100644
--- a/hosts/common/global/nix-ld.nix
+++ b/hosts/common/global/nix-ld.nix
@@ -1,6 +1,4 @@
-{pkgs, ...}: {
+{...}: {
   # dynamic linking
   programs.nix-ld.enable = true;
-  programs.nix-ld.libraries = with pkgs; [
-  ];
 }
diff --git a/hosts/common/global/nix.nix b/hosts/common/global/nix.nix
index 21b2c49..b52d13b 100644
--- a/hosts/common/global/nix.nix
+++ b/hosts/common/global/nix.nix
@@ -1,8 +1,4 @@
-{
-  inputs,
-  lib,
-  ...
-}: {
+{...}: {
   # flakes
   nix = {
     settings = {
diff --git a/hosts/common/users/luna/default.nix b/hosts/common/users/luna/default.nix
index c52cc35..b786e1a 100644
--- a/hosts/common/users/luna/default.nix
+++ b/hosts/common/users/luna/default.nix
@@ -1,7 +1,6 @@
 {
   pkgs,
   config,
-  lib,
   ...
 }: {
   # Define a user account. Don't forget to set a password with ‘passwd’.
@@ -9,8 +8,8 @@
     isNormalUser = true;
     description = "luna";
     extraGroups = [
-        "networkmanager" 
-        "wheel"
+      "networkmanager"
+      "wheel"
     ];
     packages = with pkgs; [
       #  thunderbird
diff --git a/hosts/hummingbird/configuration.nix b/hosts/hummingbird/configuration.nix
index ec27bc8..a082705 100644
--- a/hosts/hummingbird/configuration.nix
+++ b/hosts/hummingbird/configuration.nix
@@ -2,8 +2,6 @@
 # your system.  Help is available in the configuration.nix(5) man page
 # and in the NixOS manual (accessible by running ‘nixos-help’).
 {
-  config,
-  lib,
   pkgs,
   inputs,
   ...
@@ -65,11 +63,11 @@
   # ssh agent
   programs.ssh.startAgent = true;
 
-  hardware.ckb-next.enable = true;
-
   programs.steam = {
     enable = true;
     remotePlay.openFirewall = true; # Open ports in the firewall for Steam Remote Play
     dedicatedServer.openFirewall = true; # Open ports in the firewall for Source Dedicated Server
   };
+
+  hardware.ckb-next.enable = true;
 }
diff --git a/hosts/hummingbird/hardware-configuration.nix b/hosts/hummingbird/hardware-configuration.nix
index f1c346e..c6f4585 100644
--- a/hosts/hummingbird/hardware-configuration.nix
+++ b/hosts/hummingbird/hardware-configuration.nix
@@ -4,7 +4,6 @@
 {
   config,
   lib,
-  pkgs,
   modulesPath,
   ...
 }: {