commented out my-neovim because it's in jsl-zsh

modules/features/shell-tools.nix

@@ -1,6 +1,9 @@
 # This module provides all the shell options
-{ self, inputs, ... }: {
+{ self, inputs, ... }:
-  flake.modules.homeManager.shell-tools = { config, pkgs, ... }: {
+{
+  flake.modules.homeManager.shell-tools =
+    { config, pkgs, ... }:
+    {
       imports = with inputs.self.modules.homeManager; [
         # bash
         zsh
@@ -17,11 +20,19 @@
       home.shell.enableShellIntegration = true;
     };
 
-  perSystem = { system, pkgs, self', ... }: {
+  perSystem =
+    {
+      system,
+      pkgs,
+      self',
+      ...
+    }:
+    {
       packages.shell-tools = inputs.wrappers.lib.wrapPackage {
         inherit pkgs;
         # binName = "show-tools";
-      package = (pkgs.symlinkJoin {
+        package = (
+          pkgs.symlinkJoin {
             name = "show-tools";
             meta.mainProgram = "show-tools";
             paths = with pkgs; [
@@ -32,8 +43,10 @@
               wget
               curl
               dig
+              bat
               self'.packages.gdu
               self'.packages.my-eza
+              self'.packages.yazi
               hostname
               iproute2
               direnv
@@ -51,13 +64,20 @@
                 '';
               })
             ];
-      });
+          }
+        );
       };
 
       packages.gdu = inputs.wrappers.lib.wrapPackage {
         inherit pkgs;
         package = pkgs.gdu;
-      args = [ "-x" "--si" "--collapse-path" "--mouse" "$@" ];
+        args = [
+          "-x"
+          "--si"
+          "--collapse-path"
+          "--mouse"
+          "$@"
+        ];
       };
     };
 }

modules/hosts/john-pc/default.nix

@@ -39,7 +39,7 @@ in
     home.homeDirectory = "/home/${username}";
     home.packages = with pkgs; [
       selfPkgs.jsl-zsh
-      selfPkgs.my-neovim
+      # selfPkgs.my-neovim
       selfPkgs.ssh-certs
       # selfPkgs.step-bootstrap
       # selfPkgs.wg-platform
@@ -91,17 +91,17 @@ in
         "/home/john/john-nas"
       ];
     };
-    mtls = {
+    # mtls = {
-      enable = true;
+    #   enable = true;
-      subject = hostname;
+    #   subject = hostname;
-      san = [
+    #   san = [
-        "${hostname}"
+    #     "${hostname}"
-        "192.168.1.85"
+    #     "192.168.1.85"
-        "spiffe://john-stream.com/ubuntu"
+    #     "spiffe://john-stream.com/ubuntu"
-      ];
+    #   ];
-      lifetime = "1h";
+    #   lifetime = "1h";
-      renew.onCalendar = "*:1/10";
+    #   renew.onCalendar = "*:1/10";
-    };
+    # };
   };
 
   flake.homeConfigurations."john@john-pc-ubuntu" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:

modules/programs/yazi.nix

@@ -0,0 +1,11 @@
+{ self, inputs, ... }: {
+  # https://github.com/Lassulus/wrappers/blob/main/modules/yazi/module.nix
+  perSystem = { system, pkgs, lib, ... }: {
+    packages.yazi = (inputs.wrappers.wrapperModules.yazi.apply {
+      inherit pkgs;
+      settings = {
+        mgr.ratio = [ 1 4 3 ];
+      };
+    }).wrapper;
+  };
+}

modules/programs/zed-editor.nix

@@ -1,33 +1,39 @@
-{ self, inputs, ... }:
+{ self, ... }:
 let
   packageName = "zed-editor";
-
+  vulkanIcd = "/usr/share/vulkan/icd.d/nvidia_icd.json";
-  zedWrapper = inputs.wrappers.lib.wrapModule ({ config, lib, wlib, ... }: { 
+  eglVendor = "/usr/share/glvnd/egl_vendor.d/10_nvidia.json";
-    options = { 
-      text-to-say = lib.mkOption {
-        type = lib.types.str;
-        description = "Text for the ascii cow to say.";
-      };
-    };
-
-    config = {
-      binName = "my-pkg"; 
-      package = config.pkgs.cowsay; 
-      args = [ config.text-to-say ]; 
-    };
-  });
 in
 {
-  perSystem = { system, pkgs, lib, ... }: {
+  perSystem = { pkgs, ... }: {
-    packages."${packageName}" = (zedWrapper.apply { 
+    packages."${packageName}" = pkgs.symlinkJoin {
-      inherit pkgs; 
+      name = "zed-editor-host-gpu";
-      text-to-say = "Hello from wrapped module!"; 
+      paths = [ pkgs.zed-editor ];
-    }).wrapper;
+      nativeBuildInputs = [ pkgs.makeWrapper ];
+      meta = pkgs.zed-editor.meta // {
+        mainProgram = "zeditor";
+      };
+      postBuild = ''
+        for exe in $out/bin/*; do
+          wrapProgram "$exe" \
+            --unset WAYLAND_DISPLAY \
+            --unset GDK_BACKEND \
+            --set VK_DRIVER_FILES ${vulkanIcd} \
+            --set VK_ICD_FILENAMES ${vulkanIcd} \
+            --set __EGL_VENDOR_LIBRARY_FILENAMES ${eglVendor} \
+            --set __GLX_VENDOR_LIBRARY_NAME nvidia
+        done
+      '';
+    };
   };
 
-  flake.modules.homeManager."${packageName}" = { config, pkgs, lib, ... }: { 
+  flake.modules.homeManager.zed-editor = { pkgs, ... }: {
-    home.packages = [
+    home.packages = [ pkgs.vulkan-tools ];
-      inputs.self.packages.${pkgs.stdenv.hostPlatform.system}."${packageName}" 
+
-    ];
+    programs.zed-editor = {
+      enable = true;
+      package = self.packages.${pkgs.stdenv.hostPlatform.system}."${packageName}";
+      installRemoteServer = true;
+    };
   };
 }

modules/programs/zsh.nix

@@ -140,9 +140,9 @@ in
         extraPackages = with pkgs; [
           lazygit
           lazydocker
+          devenv
           self'.packages.shell-tools
           self'.packages.neovim-min
-          devenv
         ];
       }).wrapper;
   };