diff --git a/.envrc b/.envrc
deleted file mode 100644
index 4a4726a..0000000
--- a/.envrc
+++ /dev/null
@@ -1 +0,0 @@
-use_nix
diff --git a/flake.lock b/flake.lock
index fcd48dc..05f0477 100644
--- a/flake.lock
+++ b/flake.lock
@@ -7,11 +7,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1738814288,
-        "narHash": "sha256-4WqR/ligsEvxcFOjui1dwquR8U327uGoBjdI5p0ey4A=",
+        "lastModified": 1736289976,
+        "narHash": "sha256-odJdL+x5vsCnehZ8U+wONBWX3x0QP+H6edsd026qXpc=",
         "ref": "main",
-        "rev": "f64adb78f15981d60af97e7aa691d2ebdf48ceaa",
-        "revCount": 21,
+        "rev": "8d04125d902637c54a6278cf8d10954b2ed95d61",
+        "revCount": 20,
         "type": "git",
         "url": "https://git.xeno.science/xenofem/actual-nix"
       },
@@ -46,11 +46,11 @@
     },
     "birdsong": {
       "locked": {
-        "lastModified": 1738782723,
-        "narHash": "sha256-tQ8DZrB9pucCl0qOEzvqRBrrYS0f72Sxhf+jYJQV1eE=",
+        "lastModified": 1738699106,
+        "narHash": "sha256-pAe4pHn9OmVWBHdZOMQBO21mHnshOxQOaLu/mKycM6Q=",
         "ref": "main",
-        "rev": "a40220a4b977bc04cbe9e13ff5c667ed6f252677",
-        "revCount": 22,
+        "rev": "007130e869f1223713d588ba0f125c586ca13623",
+        "revCount": 20,
         "type": "git",
         "url": "https://git.qenya.tel/qenya/birdsong"
       },
@@ -71,11 +71,11 @@
         "stable": []
       },
       "locked": {
-        "lastModified": 1739900653,
-        "narHash": "sha256-hPSLvw6AZQYrZyGI6Uq4XgST7benF/0zcCpugn/P0yM=",
+        "lastModified": 1734897875,
+        "narHash": "sha256-LLpiqfOGBippRax9F33kSJ/Imt8gJXb6o0JwSBiNHCk=",
         "owner": "zhaofengli",
         "repo": "colmena",
-        "rev": "2370d4336eda2a9ef29fce10fa7076ae011983ab",
+        "rev": "a6b51f5feae9bfb145daa37fd0220595acb7871e",
         "type": "github"
       },
       "original": {
@@ -93,11 +93,11 @@
       },
       "locked": {
         "dir": "pkgs/firefox-addons",
-        "lastModified": 1740212040,
-        "narHash": "sha256-Gpvn9Z+ZgKPyb6qaAbahLbo6ZVj7VuLzSCmHZRvsACA=",
+        "lastModified": 1738641794,
+        "narHash": "sha256-MNnDZJuxMTXT1vGHQFSPJx9sJ56JjpjKulNsy01Cu8A=",
         "owner": "rycee",
         "repo": "nur-expressions",
-        "rev": "9a8a0914000e4453c99a4c12e9862a0a40075851",
+        "rev": "727fbb76627296cdeab0f2367930fb1f663b2113",
         "type": "gitlab"
       },
       "original": {
@@ -178,11 +178,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739757849,
-        "narHash": "sha256-Gs076ot1YuAAsYVcyidLKUMIc4ooOaRGO0PqTY7sBzA=",
+        "lastModified": 1736373539,
+        "narHash": "sha256-dinzAqCjenWDxuy+MqUQq0I4zUSfaCvN9rzuCmgMZJY=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "9d3d080aec2a35e05a15cedd281c2384767c2cfe",
+        "rev": "bd65bc3cde04c16755955630b344bc9e35272c56",
         "type": "github"
       },
       "original": {
@@ -199,11 +199,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1740494361,
-        "narHash": "sha256-Dd/GhJ9qKmUwuhgt/PAROG8J6YdU2ZjtJI9SQX5sVQI=",
+        "lastModified": 1738667255,
+        "narHash": "sha256-sMMQb9NydZqQ/MvvtPp+Ny0W9P0Jk0moU7SrTBlO5Vo=",
         "owner": "nix-community",
         "repo": "home-manager",
-        "rev": "74f0a8546e3f2458c870cf90fc4b38ac1f498b17",
+        "rev": "7abcf59a365430b36f84eaa452a466b11e469e33",
         "type": "github"
       },
       "original": {
@@ -252,11 +252,11 @@
     },
     "nixpkgs": {
       "locked": {
-        "lastModified": 1740339700,
-        "narHash": "sha256-cbrw7EgQhcdFnu6iS3vane53bEagZQy/xyIkDWpCgVE=",
+        "lastModified": 1738574474,
+        "narHash": "sha256-rvyfF49e/k6vkrRTV4ILrWd92W+nmBDfRYZgctOyolQ=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "04ef94c4c1582fd485bbfdb8c4a8ba250e359195",
+        "rev": "fecfeb86328381268e29e998ddd3ebc70bbd7f7c",
         "type": "github"
       },
       "original": {
@@ -268,11 +268,11 @@
     },
     "nixpkgs-small": {
       "locked": {
-        "lastModified": 1740430871,
-        "narHash": "sha256-1uwOyQJdF2v1XR2JvNdGSLgxSt9zkNL298yGwiOimoc=",
+        "lastModified": 1738663689,
+        "narHash": "sha256-L9CwNfoGcvAUpPu6DSkhpdT4tczeWREJWj7ah0Q/qTE=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "3133e42e3ef45fd6ae93da6e8ac337f6f3317b5a",
+        "rev": "11e2214d91f0d06ea8575087e3cd8e246c550bd8",
         "type": "github"
       },
       "original": {
@@ -284,11 +284,11 @@
     },
     "nixpkgs-unstable": {
       "locked": {
-        "lastModified": 1740367490,
-        "narHash": "sha256-WGaHVAjcrv+Cun7zPlI41SerRtfknGQap281+AakSAw=",
+        "lastModified": 1738546358,
+        "narHash": "sha256-nLivjIygCiqLp5QcL7l56Tca/elVqM9FG1hGd9ZSsrg=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "0196c0175e9191c474c26ab5548db27ef5d34b05",
+        "rev": "c6e957d81b96751a3d5967a0fd73694f303cc914",
         "type": "github"
       },
       "original": {
@@ -300,11 +300,11 @@
     },
     "nixpkgs-unstable-small": {
       "locked": {
-        "lastModified": 1740500346,
-        "narHash": "sha256-4fO8s2ptZODefFbdyCuxR3MaqZs7U9A+Q1wak0SkJ4o=",
+        "lastModified": 1738667108,
+        "narHash": "sha256-dX80jcKirVDmu0vdX+ZD/eHJldqFGTfsuDYlHRT/wxM=",
         "owner": "NixOS",
         "repo": "nixpkgs",
-        "rev": "d4d7eaf04bb369b178ad6eab68e356056aeaa952",
+        "rev": "a1e849ff441fa1315afa27e1fd18c791f61de06b",
         "type": "github"
       },
       "original": {
@@ -324,11 +324,11 @@
         ]
       },
       "locked": {
-        "lastModified": 1739557722,
-        "narHash": "sha256-XikzLpPUDYiNyJ4w2SfRShdbSkIgE3btYdxCGInmtc4=",
+        "lastModified": 1736549395,
+        "narHash": "sha256-XzwkB62Tt5UYoL1jXiHzgk/qz2fUpGHExcSIbyGTtI0=",
         "owner": "nix-community",
         "repo": "plasma-manager",
-        "rev": "1f3e1f38dedbbb8aad77e184fb54ec518e2d9522",
+        "rev": "a53af7f1514ef4cce8620a9d6a50f238cdedec8b",
         "type": "github"
       },
       "original": {
@@ -340,11 +340,11 @@
     "randomcat": {
       "flake": false,
       "locked": {
-        "lastModified": 1740530339,
-        "narHash": "sha256-dg2gAojfTMEdnCV7umOU8QtK7Yo8ioeZdGQ+LpkUzTA=",
+        "lastModified": 1738629463,
+        "narHash": "sha256-9/5tMBd0+V1z5dLf9TzNnodeCuKKh1qELhubcgzhTp8=",
         "owner": "randomnetcat",
         "repo": "nix-configs",
-        "rev": "f6a2aa7f496bf225c8e5434382619a93b7c1cb20",
+        "rev": "efff66f0e1b27a4f0894d1cfde02d0892a9bfe9d",
         "type": "github"
       },
       "original": {
diff --git a/home/qenya/vscode.nix b/home/qenya/vscode.nix
index ac27f60..91e7897 100644
--- a/home/qenya/vscode.nix
+++ b/home/qenya/vscode.nix
@@ -11,14 +11,11 @@ in
     enableUpdateCheck = false;
     package = pkgs.vscodium;
     extensions = with pkgs.vscode-extensions; [
-      charliermarsh.ruff
       dbaeumer.vscode-eslint
       eamodio.gitlens
       golang.go
       jdinhlife.gruvbox
       jnoortheen.nix-ide
-      matangover.mypy
-      ms-python.black-formatter
       ms-python.python
     ];
     mutableExtensionsDir = false;
@@ -59,18 +56,6 @@ in
         "formatting.gofumpt" = true;
         "ui.semanticTokens" = true;
       };
-
-      "[python]" = {
-        "editor.defaultFormatter" = "ms-python.black-formatter";
-        "editor.formatOnSave" = true;
-        "editor.codeActionsOnSave" = {
-          "source.fixAll" = "explicit";
-          "source.organizeImports" = "explicit";
-        };
-      };
-      "ruff.nativeServer" = "on";
-      "ruff.path" = "${pkgs.ruff}/bin/ruff";
-      "mypy.dmypyExecutable" = "${pkgs.mypy}/bin/dmypy";
     };
   };
 }
diff --git a/home/qenya/zsh.nix b/home/qenya/zsh.nix
index b3c0465..0d8ecc2 100644
--- a/home/qenya/zsh.nix
+++ b/home/qenya/zsh.nix
@@ -1,7 +1,6 @@
 { config, lib, pkgs, ... }:
 
 {
-  home.packages = with pkgs; [ direnv ];
   programs.zsh = {
     enable = true;
     enableCompletion = true;
@@ -27,10 +26,19 @@
 
     oh-my-zsh = {
       enable = true;
-      plugins = [ "git" "sudo" "direnv" ];
+      plugins = [ "git" "sudo" ];
       theme = "agnoster";
     };
 
+    initExtra = ''
+      # If a shell is started in a directory with a shell.nix, automatically run nix-shell
+      if [ -f ./shell.nix ]; then
+        if [ -z "$IN_NIX_SHELL" ]; then
+          nix-shell --command "zsh"
+        fi
+      fi
+    '';
+
     envExtra = ''
       DEFAULT_USER=qenya
     '';