diff --git a/hosts/nixos/nfss/system.nix b/hosts/nixos/nfss/system.nix
index 00a1aae..e8bebac 100644
--- a/hosts/nixos/nfss/system.nix
+++ b/hosts/nixos/nfss/system.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }: 
+
+{
   imports = [
     ./hardware-configuration.nix
     ./containers.nix
@@ -6,9 +8,7 @@
     ../../../modules/tailscale.nix
     ../../../modules/podman.nix
     ../../../modules/borg/client.nix
-    ../../../modules/login-display.nix
     ../../../modules/media-server.nix
-    ../../../modules/samba.nix
   ];
 
   # GRUB bootloader with ZFS support
@@ -116,20 +116,6 @@
     };
   };
 
-  # Login display with SMART disk health status
-  services.login-display = {
-    enable = true;
-    showSystemInfo = true;
-    showSmartStatus = true;
-    smartDrives = {
-      "/dev/disk/by-id/ata-ZHITAI_SC001_XT_1000GB_ZTB401TAB244431J4R" = "ZFS_Mirror_1";
-      "/dev/disk/by-id/ata-ZHITAI_SC001_XT_1000GB_ZTB401TAB244431KEG" = "ZFS_Mirror_2";
-    };
-    showDiskUsage = true;
-    diskUsagePaths = [ "/" "/home/" ];
-    showBorgStatus = true;
-  };
-
   services.tailscale-custom = {
     exitNode = true;
     subnetRoutes = [ "10.1.1.0/24" ];
diff --git a/hosts/nixos/thinkpad/system.nix b/hosts/nixos/thinkpad/system.nix
index a21f4b6..8542b7c 100644
--- a/hosts/nixos/thinkpad/system.nix
+++ b/hosts/nixos/thinkpad/system.nix
@@ -7,7 +7,6 @@
     ../system-default.nix
     ../../../modules/podman.nix
     ../../../modules/tailscale.nix
-    ../../../modules/login-display.nix
     ../../../modules/borg/client.nix
   ];
 
@@ -183,18 +182,6 @@
 
   services.tailscale-custom.exitNode = true;
 
-  # Login display with SMART disk health status
-  services.login-display = {
-    enable = true;
-    showSystemInfo = true;
-    showSmartStatus = true;
-    smartDrives = {
-      "/dev/nvme0n1" = "System_SSD";
-    };
-    showDiskUsage = true;
-    showBorgStatus = true;
-  };
-
   services.borg-client-custom = {
     enable = true;
     repositoryUrl = "ssh://borg-box/./thinkpad";
diff --git a/hosts/nixos/vps/system.nix b/hosts/nixos/vps/system.nix
index 5aedf6e..5c605fc 100644
--- a/hosts/nixos/vps/system.nix
+++ b/hosts/nixos/vps/system.nix
@@ -1,4 +1,6 @@
-{ config, pkgs, ... }: {
+{ config, pkgs, ... }: 
+
+{
   imports = [
     ./hardware-configuration.nix
     ./containers.nix
@@ -7,7 +9,6 @@
     ../../../modules/tailscale.nix
     ../../../modules/podman.nix
     ../../../modules/traefik.nix
-    ../../../modules/login-display.nix
   ];
 
   # GRUB bootloader with UEFI support
@@ -69,14 +70,6 @@
     ];
   };
 
-  services.login-display = {
-    enable = true;
-    showSystemInfo = true;
-    showSmartStatus = false;
-    showDiskUsage = true;
-    showBorgStatus = false;
-  };
-
   services.tailscale-custom.exitNode = true;
 
 }
diff --git a/modules/claude-code.nix b/modules/claude-code.nix
index baf68ce..72f116b 100644
--- a/modules/claude-code.nix
+++ b/modules/claude-code.nix
@@ -151,7 +151,10 @@ in
 {
   config = {
     # Install Claude Code package
-    home.packages = [ claudePackage ];
+    home.packages = [
+      claudePackage
+      pkgs.poppler-utils
+    ];
 
     # Create global settings file (with permissions included)
     home.file.".claude/settings.json" = {
@@ -160,7 +163,13 @@ in
 
     # Create global memory file
     home.file.".claude/CLAUDE.md" = {
-      text = "";
+      text = ''
+        ## Environment
+        - System is managed with Nix (flakes) for global development runtime
+        - Projects may use flake + direnv for project-specific runtimes
+        - Common development tools (git, gh, ripgrep, jq, fzf, etc.) are globally available via nix
+        - PDF reading is supported (poppler-utils installed)
+      '';
     };
   };
 }