diff --git a/home/hosts/vps.nix b/home/hosts/vps.nix
index d601bc3..2774ef8 100644
--- a/home/hosts/vps.nix
+++ b/home/hosts/vps.nix
@@ -8,7 +8,7 @@
     ../modules/cli/ripgrep.nix
     ../modules/cli/sops.nix
     ../modules/cli/yazi.nix
-    ../modules/cli/btop.nix
+    ../modules/cli/zsh.nix
   ];
 
   home = {
diff --git a/home/hosts/y2q.nix b/home/hosts/y2q.nix
index fa93732..509621d 100644
--- a/home/hosts/y2q.nix
+++ b/home/hosts/y2q.nix
@@ -3,13 +3,14 @@
 {
   imports = [
     inputs.nixvim.homeModules.nixvim
-
-    ../modules/cli/git.nix
-    ../modules/cli/ripgrep.nix
-    ../modules/cli/btop.nix
-    ../modules/cli/yazi.nix
-    ../modules/cli/nixvim
-  ];
+    inputs.sops-nix.homeManagerModules.sops
+  ] ++ (
+    let
+      modulesPath = ../modules;
+      cliModules = builtins.attrNames (builtins.readDir (modulesPath + "/cli/"));
+    in
+      map (module: modulesPath + "/cli/${module}") cliModules
+  );
 
   home = {
     username = "android";
diff --git a/home/modules/cli/btop.nix b/home/modules/graphical/btop.nix
similarity index 100%
rename from home/modules/cli/btop.nix
rename to home/modules/graphical/btop.nix
diff --git a/hosts/nixos/modules/services/greetd.nix b/hosts/nixos/modules/services/greetd.nix
index 4650595..795f7ef 100644
--- a/hosts/nixos/modules/services/greetd.nix
+++ b/hosts/nixos/modules/services/greetd.nix
@@ -5,7 +5,7 @@
     enable = true;
     settings = {
       default_session = {
-        command = "${pkgs.tuigreet}/bin/tuigreet --time --remember --remember-session";
+        command = "${pkgs.greetd.tuigreet}/bin/tuigreet --time --remember --remember-session";
        user = "greeter";
       }; 
     };