diff --git a/home/btop.nix b/home/btop.nix
new file mode 100644
index 0000000..6d4f49b
--- /dev/null
+++ b/home/btop.nix
@@ -0,0 +1,5 @@
+{ config, lib, pkgs, ... }:
+
+{
+  programs.btop.enable = true;
+}
diff --git a/home/cli.nix b/home/cli.nix
new file mode 100644
index 0000000..b23d81f
--- /dev/null
+++ b/home/cli.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home.packages = with pkgs; [
+    tree # like `ls -R` but nicer
+
+    # Extremely important
+    fortune
+    cowsay
+    lolcat
+  ];
+}
diff --git a/hosts/tohru/home.nix b/hosts/tohru/home.nix
index f3b9d0f..3067b81 100644
--- a/hosts/tohru/home.nix
+++ b/hosts/tohru/home.nix
@@ -3,15 +3,13 @@
 {
   home-manager.users.qenya = { pkgs, ... }: {
     imports = [
+      ../../home/btop.nix
+      ../../home/cli.nix
       ../../home/gnome
       ../../home/vscode.nix
     ];
 
     home.packages = with pkgs; [
-      fortune
-      htop
-      tree
-
       bitwarden
       tor-browser-bundle-bin
     ];
diff --git a/hosts/yevaud/configuration.nix b/hosts/yevaud/configuration.nix
index e8c073f..bd49606 100644
--- a/hosts/yevaud/configuration.nix
+++ b/hosts/yevaud/configuration.nix
@@ -4,6 +4,7 @@
   imports =
     [
       ./hardware-configuration.nix
+      ./home.nix
       ../../services/nginx.nix
       ../../services/openssh.nix
     ];
diff --git a/hosts/yevaud/home.nix b/hosts/yevaud/home.nix
new file mode 100644
index 0000000..d5bb904
--- /dev/null
+++ b/hosts/yevaud/home.nix
@@ -0,0 +1,12 @@
+{ config, lib, pkgs, ... }:
+
+{
+  home-manager.users.qenya = { pkgs, ... }: {
+    imports = [
+      ../../home/btop.nix
+      ../../home/cli.nix
+    ];
+
+    home.stateVersion = "23.11";
+  };
+}