diff --git a/flake.nix b/flake.nix
index 23c64cd..a5c8aa3 100644
--- a/flake.nix
+++ b/flake.nix
@@ -28,7 +28,7 @@
     };
   };
 
-  outputs = { self, nixpkgs, home-manager, ... } @ inputs:
+  outputs = { self, nixpkgs, home-manager, ... } @inputs:
     let
       inherit (self) outputs;
       lib = nixpkgs.lib // home-manager.lib;
diff --git a/nix/home/features/cli/default.nix b/nix/home/features/cli/default.nix
index e10f7c7..9995f72 100644
--- a/nix/home/features/cli/default.nix
+++ b/nix/home/features/cli/default.nix
@@ -1,9 +1,7 @@
 { pkgs, ... }: {
-  # Common CLI apps
+  # Core CLI apps
 
   imports = [
-    ./direnv.nix
-    ./go.nix
     ./git.nix
     ./fish.nix
     ./tmux.nix
@@ -14,16 +12,8 @@
     babelfish # Lets fish speak bash
     bottom # Better top
     httpie # Better curl
-    hugo # Static site generator
     jq # JSON pretty printer and manipulator
-    nil # Nix LSP
-    # nix-inspect # See which pkgs are in your Path
-    nixfmt # Nix formatter
-    packer # Hashicorp packer
     powershell # Powershell
-    terraform # Hashicorp terraform
     tldr # TLDR pages
-    trekscii # Cute startrek cli printer
-    vault # Hashicorp vault
   ];
 }
\ No newline at end of file
diff --git a/nix/home/features/cli/extras/default.nix b/nix/home/features/cli/extras/default.nix
new file mode 100644
index 0000000..16d66a1
--- /dev/null
+++ b/nix/home/features/cli/extras/default.nix
@@ -0,0 +1,20 @@
+{ pkgs, ... }: {
+  # Extra CLI apps
+
+  imports = [
+    ../default.nix
+    ./direnv.nix
+    ./go.nix
+  ];
+
+  home.packages = with pkgs; [
+    hugo # Static site generator
+    nil # Nix LSP
+    # nix-inspect # See which pkgs are in your Path
+    nixfmt # Nix formatter
+    packer # Hashicorp packer
+    terraform # Hashicorp terraform
+    trekscii # Cute startrek cli printer
+    vault # Hashicorp vault
+  ];
+}
\ No newline at end of file
diff --git a/nix/home/features/cli/direnv.nix b/nix/home/features/cli/extras/direnv.nix
similarity index 100%
rename from nix/home/features/cli/direnv.nix
rename to nix/home/features/cli/extras/direnv.nix
diff --git a/nix/home/features/cli/go.nix b/nix/home/features/cli/extras/go.nix
similarity index 100%
rename from nix/home/features/cli/go.nix
rename to nix/home/features/cli/extras/go.nix
diff --git a/nix/home/jammy-wsl.nix b/nix/home/jammy-wsl.nix
index 7e382d4..5a9d85a 100644
--- a/nix/home/jammy-wsl.nix
+++ b/nix/home/jammy-wsl.nix
@@ -7,9 +7,12 @@
     # username override
     username = "jbowdre";
     packages = with pkgs; [
+      packer
+      terraform
       vagrant
-      wslu
+      vault
       wsl-open
+      wslu
     ];
   };
 }
diff --git a/nix/home/penguin-duet.nix b/nix/home/penguin-duet.nix
index b032e5e..b14fea7 100644
--- a/nix/home/penguin-duet.nix
+++ b/nix/home/penguin-duet.nix
@@ -1,8 +1,9 @@
 { pkgs, lib, config, ... }: {
   imports = [
     ./global
-    ./lib/chromeos.nix
+    ./features/cli/extras
     ./features/desktop/vscode.nix
+    ./lib/chromeos.nix
   ];
 
   # packages
diff --git a/nix/home/penguin-fw.nix b/nix/home/penguin-fw.nix
index c1458d2..79f88a6 100644
--- a/nix/home/penguin-fw.nix
+++ b/nix/home/penguin-fw.nix
@@ -1,6 +1,7 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
     ./global
+    ./features/cli/extras
     ./features/desktop
     ./lib/chromeos.nix
   ];
diff --git a/nix/home/pixnix.nix b/nix/home/pixnix.nix
index 93bda1f..3bf7d3f 100644
--- a/nix/home/pixnix.nix
+++ b/nix/home/pixnix.nix
@@ -1,6 +1,7 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
     ./global
+    ./features/cli/extras
     ./features/desktop
   ];