diff --git a/.github/workflows/docker.yml b/.github/workflows/docker.yml
index a8e17ea16..259397bee 100644
--- a/.github/workflows/docker.yml
+++ b/.github/workflows/docker.yml
@@ -37,12 +37,6 @@ jobs:
         uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
       - name: Set up Docker Buildx
         uses: docker/setup-buildx-action@v3
       - name: Login to GHCR
diff --git a/.github/workflows/e2e.yml b/.github/workflows/e2e.yml
index cf32c4a2c..b9d94af72 100644
--- a/.github/workflows/e2e.yml
+++ b/.github/workflows/e2e.yml
@@ -31,12 +31,6 @@ jobs:
         uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
       - name: KVM Linux Virtualization
         if: runner.os == 'Linux'
         run: |
diff --git a/.github/workflows/nix.yml b/.github/workflows/nix.yml
index 95f7322ec..39e1a544a 100644
--- a/.github/workflows/nix.yml
+++ b/.github/workflows/nix.yml
@@ -56,6 +56,10 @@ jobs:
     steps:
       - name: Checkout
         uses: actions/checkout@v5
+      - name: Free Disk Space (Ubuntu)
+        uses: jlumbroso/free-disk-space@v1.3.1
+        with:
+          tool-cache: false
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
@@ -74,12 +78,6 @@ jobs:
         uses: jlumbroso/free-disk-space@v1.3.1
         with:
           tool-cache: false
-          android: true
-          dotnet: true
-          haskell: true
-          large-packages: true
-          docker-images: true
-          swap-storage: true
       - name: Install Nix
         uses: cachix/install-nix-action@v31
         with:
diff --git a/home-manager/packages/default.nix b/home-manager/packages/default.nix
index 7ba85d33e..c5550059a 100644
--- a/home-manager/packages/default.nix
+++ b/home-manager/packages/default.nix
@@ -2,6 +2,9 @@
   pkgs,
   inputs,
 }:
+let
+  isCI = builtins.getEnv "CI" != "";
+in
 with pkgs;
 [
   inputs.agenix.packages.${stdenv.hostPlatform.system}.default
@@ -13,8 +16,8 @@ with pkgs;
   argocd
   ast-grep
   bat
-  btop
   bun
+  clipse
   cloudflared
   curl
   curlie
@@ -31,6 +34,7 @@ with pkgs;
   fzf-make
   gh
   git
+  gnumake
   goose-cli
   grc
   htop
@@ -69,12 +73,21 @@ with pkgs;
 ++ lib.optionals stdenv.isLinux [
   atop
   below
-  claude-code
-  codex
   collectd
   docker
   docker-compose
+  ffmpeg
   gemini-cli
   kubernetes-helm
+  powertop
+]
+++ lib.optionals (stdenv.isLinux && !isCI) [
+  blueberry
+  chromium
+  claude-code
+  codex
+  github-desktop
   opencode
+  signal-desktop
+  vlc
 ]
diff --git a/home-manager/programs/btop/default.nix b/home-manager/programs/btop/default.nix
new file mode 100644
index 000000000..f69dceba9
--- /dev/null
+++ b/home-manager/programs/btop/default.nix
@@ -0,0 +1,69 @@
+{
+  # From: https://github.com/henrysipp/omarchy-nix/blob/308e0f85a0deb820c01cfbe1b4faee1daab4da12/modules/home-manager/btop.nix
+  programs.btop = {
+    enable = true;
+    settings = {
+      theme_background = false;
+      truecolor = true;
+      force_tty = false;
+      vim_keys = true;
+      rounded_corners = true;
+      graph_symbol = "braille";
+      graph_symbol_cpu = "default";
+      graph_symbol_mem = "default";
+      graph_symbol_net = "default";
+      graph_symbol_proc = "default";
+      shown_boxes = "cpu mem net proc";
+      update_ms = 2000;
+      proc_sorting = "cpu lazy";
+      proc_reversed = false;
+      proc_tree = false;
+      proc_colors = true;
+      proc_gradient = false;
+      proc_per_core = false;
+      proc_mem_bytes = true;
+      proc_cpu_graphs = true;
+      proc_info_smaps = false;
+      proc_left = false;
+      cpu_graph_upper = "total";
+      cpu_graph_lower = "total";
+      cpu_invert_lower = true;
+      cpu_single_graph = false;
+      cpu_bottom = false;
+      show_uptime = true;
+      check_temp = true;
+      cpu_sensor = "Auto";
+      show_coretemp = true;
+      cpu_core_map = "";
+      temp_scale = "celsius";
+      base_10_sizes = false;
+      show_cpu_freq = true;
+      clock_format = "%X";
+      background_update = true;
+      custom_cpu_name = ";
+      disks_filter = ";
+      mem_graphs = true;
+      mem_below_net = false;
+      zfs_arc_cached = true;
+      show_swap = true;
+      swap_disk = true;
+      show_disks = true;
+      only_physical = true;
+      use_fstab = true;
+      zfs_hide_datasets = false;
+      disk_free_priv = false;
+      show_io_stat = true;
+      io_mode = false;
+      io_graph_combined = false;
+      io_graph_speeds = ";
+      net_download = 100;
+      net_upload = 100;
+      net_auto = true;
+      net_sync = true;
+      net_iface = ";
+      show_battery = true;
+      selected_battery = "Auto";
+      log_level = "WARNING";
+    };
+  };
+}
diff --git a/home-manager/programs/default.nix b/home-manager/programs/default.nix
index 3cfd2afea..19c689464 100644
--- a/home-manager/programs/default.nix
+++ b/home-manager/programs/default.nix
@@ -7,6 +7,7 @@ let
   atuin = import ./atuin;
   bash = import ./bash { inherit lib pkgs; };
   bat = import ./bat;
+  btop = import ./btop;
   delta = import ./delta;
   direnv = import ./direnv;
   fd = import ./fd;
@@ -35,6 +36,7 @@ in
   atuin
   bash
   bat
+  btop
   delta
   direnv
   fd
diff --git a/home-manager/programs/direnv/default.nix b/home-manager/programs/direnv/default.nix
index 6d3bf9d63..0c46185e5 100644
--- a/home-manager/programs/direnv/default.nix
+++ b/home-manager/programs/direnv/default.nix
@@ -1,5 +1,9 @@
 {
   programs.direnv = {
     enable = true;
+    enableBashIntegration = true;
+    # enableFishIntegration = true;
+    enableZshIntegration = true;
+    nix-direnv.enable = true;
   };
 }
diff --git a/home-manager/programs/zsh/default.nix b/home-manager/programs/zsh/default.nix
index 1f36da725..3fac3982b 100644
--- a/home-manager/programs/zsh/default.nix
+++ b/home-manager/programs/zsh/default.nix
@@ -2,7 +2,7 @@
 { lib, pkgs, ... }:
 {
   programs.zsh = {
-    enable = false;
+    enable = true;
     enableCompletion = true;
     autosuggestion.enable = true;
     syntaxHighlighting.enable = true;
@@ -17,7 +17,7 @@
       extended = true;
     };
 
-    initExtra = ''
+    initContent = ''
       # Initialize Starship
       eval "$(starship init zsh)"