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;
@@ -73,6 +73,11 @@
           pkgs = pkgsFor.x86_64-linux;
           extraSpecialArgs = { inherit inputs outputs; };
         };
+        "jbowdre@jammy-wsl" = lib.homeManagerConfiguration {
+          modules = [ ./nix/home/jammy-wsl.nix ];
+          pkgs = pkgsFor.x86_64-linux;
+          extraSpecialArgs = { inherit inputs outputs; };
+        };
       };
     };
 }

nix/home/features/cli/default.nix

@@ -1,7 +1,9 @@
 { pkgs, ... }: {
-  # Core CLI apps
+  # Common CLI apps
 
   imports = [
+    ./direnv.nix
+    ./go.nix
     ./git.nix
     ./fish.nix
     ./tmux.nix
@@ -12,8 +14,16 @@
     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
   ];
 }

nix/home/features/cli/extras/default.nix

@@ -1,20 +0,0 @@
-{ 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
-  ];
-}

nix/home/jammy-wsl.nix

@@ -0,0 +1,15 @@
+{ inputs, outputs, lib, config, pkgs, ... }: {
+  imports = [
+    ./global
+  ];
+
+  home = {
+    # username override
+    username = "jbowdre";
+    packages = with pkgs; [
+      vagrant
+      wslu
+      wsl-open
+    ];
+  };
+}

nix/home/penguin-duet.nix

@@ -1,9 +1,8 @@
 { pkgs, lib, config, ... }: {
   imports = [
     ./global
-    ./features/cli/extras
-    ./features/desktop/vscode.nix
     ./lib/chromeos.nix
+    ./features/desktop/vscode.nix
   ];
 
   # packages

nix/home/penguin-fw.nix

@@ -1,7 +1,6 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
     ./global
-    ./features/cli/extras
     ./features/desktop
     ./lib/chromeos.nix
   ];

nix/home/pixnix.nix

@@ -1,7 +1,6 @@
 { inputs, outputs, lib, config, pkgs, ... }: {
   imports = [
     ./global
-    ./features/cli/extras
     ./features/desktop
   ];