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

modules/features/gnome.nix

@@ -4,7 +4,6 @@
       desktopManager.gnome.enable = true;
       displayManager.gdm = {
         enable = true;
-        wayland = true;
         banner = "Welcome to John's NixOS implementation";
       };
       udev.packages = [

modules/features/mtls.nix

@@ -125,7 +125,6 @@ in
         inherit (cfg) certDir keyFile certFile bundleFile;
         inherit (cfg.renew) user group reloadUnits postCommands;
         systemd = {
-          description = "Renew the mTLS certificate when Smallstep marks it ready";
           after = [ "network-online.target" ];
           wants = [ "network-online.target" ];
           serviceConfig = {
@@ -233,7 +232,7 @@ in
         ];
 
         # Create the systemd service files for the user.
-        xdg.dataFile = lib.mkIf cfg.renew.enable {
+        xdg.configFile = lib.mkIf cfg.renew.enable {
           "systemd/user/mtls-renew.service".source =
             "${mtlsRenewWrapper.outputs.systemd-user}/systemd/user/mtls-renew.service";
           "systemd/user/mtls-renew.timer".source =
@@ -251,7 +250,11 @@ in
           if [ -n "$XDG_RUNTIME_DIR" ] && [ -S "$XDG_RUNTIME_DIR/systemd/private" ]; then
             if [ "${lib.boolToString (cfg.enable && cfg.renew.enable)}" = "true" ]; then
               run ${pkgs.systemd}/bin/systemctl --user daemon-reload
+              if ${pkgs.systemd}/bin/systemctl --user cat mtls-renew.timer >/dev/null 2>&1; then
                 run ${pkgs.systemd}/bin/systemctl --user enable --now mtls-renew.timer
+              else
+                verboseEcho "mtls-renew.timer unit file is not available; skipping enable"
+              fi
             else
               run ${pkgs.systemd}/bin/systemctl --user disable --now mtls-renew.timer || true
               run ${pkgs.systemd}/bin/systemctl --user daemon-reload || true
@@ -426,7 +429,7 @@ in
           config.pkgs.step-cli
         ];
         systemd = {
-          description = "Automatic mTLS renewal service";
+          description = "Renew the mTLS certificate when Smallstep marks it ready";
           documentation = [
             "https://smallstep.com/docs/step-ca/certificate-authority-server-production"
           ];

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-kde/default.nix

@@ -0,0 +1,70 @@
+{ withSystem, self, inputs, ... }:
+let
+  username = "john";
+  hostname = "omen";
+in
+{
+  flake.modules.homeManager."${hostname}" = { config, pkgs, lib, ... }:
+  let
+    selfPkgs = inputs.self.packages.${pkgs.stdenv.hostPlatform.system};
+    flakeDir = "${config.xdg.configHome}/home-manager";
+  in
+  {
+    imports = with inputs.self.modules.homeManager; [
+      rebuild
+      john
+      # mtls
+      # restic
+      docker
+      desktop
+      step-client
+      # mysops
+      # myPackage
+      # myStepClient
+    ];
+    # TODO: make this more restrictive, rather than allowing all unfree packages
+    nixpkgs.config.allowUnfree = true;
+    nixpkgs.config.permittedInsecurePackages = [ "openssl-1.1.1w" ];
+
+    targets.genericLinux.enable = true;
+
+    home.username = "${username}";
+    home.homeDirectory = "/home/${username}";
+    home.packages = with pkgs; [
+      selfPkgs.jsl-zsh
+      selfPkgs.my-neovim
+      selfPkgs.ssh-certs
+      # selfPkgs.step-bootstrap
+      # selfPkgs.wg-platform
+      # self'.packages.myWrappedPackage
+      # (inputs.self.wrappers.test-push.apply {
+      #   inherit pkgs flakeDir;
+      #   host = testHost;
+      #   target = testTarget;
+      # }).wrapper
+    ];
+
+    homeManagerFlakeDir = flakeDir;
+    docker.enable = true;
+
+    ssh = {
+      certificates.enable = true;
+      knownHosts = [
+        "fded:fb16:653e:25da:be24:11ff:fea0:753f ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIJ9ZqiWPrCwHjxFCiu0lT4rlQs7KyMapxKJQQ5PJP1eh"
+      ];
+      matchSets = {
+        certs = true;
+        appdaemon = true;
+        homelab = true;
+        dev = true;
+        tailscale = true;
+      };
+    };
+  };
+
+  flake.homeConfigurations."john@omen" = withSystem "x86_64-linux" (ctx@{ system, inputs', ... }:
+    inputs.home-manager.lib.homeManagerConfiguration {
+      pkgs = inputs'.nixpkgs.legacyPackages;
+      modules = [ inputs.self.modules.homeManager."${hostname}" ]; # Uses the module defined above
+  });
+}

modules/hosts/john-p14s/configuration.nix

@@ -123,7 +123,6 @@
           my-vscode.enable = true;
           mysops.hostSecretFile = "${flakeDir}/modules/hosts/john-p14s/secrets.yaml";
           homeManagerFlakeDir = "${flakeDir}";
-          shell.program = "zsh";
           home.packages = with pkgs; [
             bash
             discord

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/onepassword.nix

@@ -5,6 +5,5 @@
       [[ssh-keys]]
       vault = "Private"
     '';
-    programs.ssh.matchBlocks."*".identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
   };
 }

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;
   };

modules/services/ssh.nix

@@ -135,6 +135,7 @@ in
             "*" = lib.mkMerge [
               {
                 user = "john";
+                identityAgent = "${config.home.homeDirectory}/.1password/agent.sock";
 
                 compression = false;
                 serverAliveInterval = 0;