@@ -58,11 +58,13 @@ in
 [
   git-new-push-remote
   git-new-repo
-  jp
-  webcam
-  xurls
-  nvidia-offload
-  cputil
-  pw
-  kctx
+  pkgs.lib.optional pkgs.stdenv.isLinux [
+    jp
+    xurls
+    nvidia-offload
+    cputil
+    kctx
+    pw
+    webcam
+  ]
 ]

@@ -2111,6 +2111,8 @@ <key>TerminalVMargin</key>
 	<integer>20</integer>
 	<key>TmuxUsesDedicatedProfile</key>
 	<false/>
+	<key>URLHandlersByGuid</key>
+	<dict/>
 	<key>UseBorder</key>
 	<false/>
 	<key>VisualIndicatorForEsc</key>

@@ -21,5 +21,5 @@ fzy
     ripgrep
     pass
     fd
-  ];
+  ]; #++ (import ../bin { inherit pkgs host; });
 }

@@ -22,24 +22,6 @@ enableBashIntegration = true;
       nix-direnv = {
         enable = true;
       };
-      stdlib = ''
-        layout_poetry() {
-          if [[ ! -f pyproject.toml ]]; then
-            log_error 'No pyproject.toml found. Use `poetry new` or `poetry init` to create one first.'
-            exit 2
-          fi
-
-          local VENV=$(poetry env list --full-path | cut -d' ' -f1)
-          if [[ -z $VENV || ! -d $VENV/bin ]]; then
-            log_error 'No poetry virtual environment found. Use `poetry install` to create one first.'
-            exit 2
-          fi
-
-          export VIRTUAL_ENV=$VENV
-          export POETRY_ACTIVE=1
-          PATH_add "$VENV/bin"
-        }
-      '';
     };
     zoxide = {
       enable = true;

@@ -12,6 +12,7 @@ withNodeJs = false;
     vimAlias = true;
     withPython3 = true;
     extraPackages = with pkgs; [
+      nixpkgs-fmt
       gotools
       gopls
       go
@@ -19,7 +20,6 @@ nodePackages.vscode-langservers-extracted
       nodePackages.typescript-language-server
       nodePackages.typescript
       nodePackages.eslint
-      nodePackages.pyright
       sumneko-lua-language-server
     ];
     extraConfig = ''