diff --git a/echidna.nix b/echidna.nix
index ed8923b..f259e8b 100644
--- a/echidna.nix
+++ b/echidna.nix
@@ -8,6 +8,8 @@ in {
     experimental-features = nix-command flakes
   '';
 
+  # nixpkgs.config.permittedInsecurePackages = [ "python-2.7.18.6" ];
+
   # List packages installed in system profile. To search by name, run:
   # $ nix-env -qaP | grep wget
   # environment.systemPackages = [ ];
@@ -47,17 +49,18 @@ in {
     pkgs.ncmpcpp
     pkgs.neofetch
     pkgs.neomutt
-    # pkgs.neovim
     pkgs.newsboat
     pkgs.nixfmt
     pkgs.nodePackages.pyright
+    pkgs.python310Packages.python-lsp-server
+    # pkgs.python310Packages.pylsp-mypy
     pkgs.openssh
     pkgs.pinentry_mac
     pkgs.pipenv
     pkgs.python310Full
     pkgs.python310Packages.pip
     pkgs.python310Packages.virtualenvwrapper
-    pkgs.pythonFull
+    # pkgs.pythonFull
     pkgs.ripgrep
     pkgs.shellcheck
     pkgs.shfmt
@@ -118,13 +121,10 @@ in {
       "vitetris"
       "yabai"
       "skhd"
-      "neovim"
       "spacebar"
       "gnu-getopt"
       "coreutils"
       "pinentry-mac"
-      # "qmk"
-      "dbt-bigquery"
     ];
     taps = [
       "homebrew/bundle"
@@ -133,8 +133,6 @@ in {
       "homebrew/services"
       "koekeishiya/formulae"
       "cmacrae/formulae"
-      # "qmk/qmk"
-      "dbt-labs/dbt"
     ];
   };
 
@@ -153,15 +151,7 @@ in {
     home = "/Users/rilla";
   };
 
-  home-manager = {
-    users.rilla = {
-      programs.direnv = {
-        enable = true;
-        nix-direnv.enable = true;
-      };
-      home.stateVersion = "22.11";
-    };
-  };
+  home-manager = { users.rilla.imports = [ home/echidna.nix ]; };
 
   system.stateVersion = 4;
 }
diff --git a/home/echidna.nix b/home/echidna.nix
new file mode 100644
index 0000000..f4a13a2
--- /dev/null
+++ b/home/echidna.nix
@@ -0,0 +1,10 @@
+{ config, pkgs, ... }:
+
+{
+  programs.direnv = {
+    enable = true;
+    nix-direnv.enable = true;
+  };
+  imports = [ ./neovim ];
+  home.stateVersion = "22.11";
+}