diff --git a/home/config/nvim/lua/plugins.lua b/home/config/nvim/lua/plugins.lua
index 7ef38b1..453b78c 100644
--- a/home/config/nvim/lua/plugins.lua
+++ b/home/config/nvim/lua/plugins.lua
@@ -1,7 +1,6 @@
 vim.cmd([[autocmd BufWritePost plugins.lua PackerCompile]])
 
 return function(use)
-  use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' })
   use({'SirVer/ultisnips'})
   use({'honza/vim-snippets'})
   
@@ -69,8 +68,6 @@ return function(use)
   -- require'telescope'.load_extension('project')
 
   use({'puremourning/vimspector'})
- 	use({'nvim-treesitter/nvim-treesitter-refactor'})
-	use({'RRethy/nvim-treesitter-textsubjects'})
   use({'airblade/vim-rooter'})
 
   -- Debugging
@@ -100,4 +97,13 @@ return function(use)
     commits = 32,             -- max number of commits to read
   })
 
+  use({'nvim-treesitter/nvim-treesitter', run = ':TSUpdate' })
+ 	use({'nvim-treesitter/nvim-treesitter-refactor'})
+	use({'RRethy/nvim-treesitter-textsubjects'})
+  require("nvim-treesitter.configs").setup({
+    highlight = { enable = true, disable = { "lua" } },
+    indent = { enable = true },
+    refactor = { highlight_definitions = { enable = true } },
+    matchup = { enable = true },
+  })
 end
diff --git a/hosts/_common/home.nix b/hosts/_common/home.nix
index 71eeacf..be8d3dc 100644
--- a/hosts/_common/home.nix
+++ b/hosts/_common/home.nix
@@ -1,44 +1,4 @@
 { pkgs, ... }:
 {
     home.stateVersion = "22.05";
-    home.sessionVariables = {
-      PAGER = "less -R";
-      EDITOR = "nvim";
-    };
-    home.packages = with pkgs; [
-      # Terminals
-      bat
-      ctags
-      dosbox
-      exa
-      fzf
-      fd
-      go
-      p7zip
-      ripgrep
-      tree-sitter
-      silver-searcher
-      wget
-    ];
-
-    home.file = {
-      ".tmux.conf" = {
-        source = ../../home/tmux.conf;
-      };
-      ".gitconfig" = {
-        source = ../../home/gitconfig;
-      };
-      ".gitignore" = {
-        source = ../../home/gitignore;
-      };
-      "bin" = {
-        source = ../../home/bin;
-        recursive = true;
-
-      };
-    };
-    nixpkgs.config = {
-      allowUnfree = true;
-    };
-
 }
diff --git a/hosts/_common/programs.nix b/hosts/_common/programs.nix
index 162f24d..a812c0e 100644
--- a/hosts/_common/programs.nix
+++ b/hosts/_common/programs.nix
@@ -1,45 +1,4 @@
 { pkgs, ... }:
 {
     programs.home-manager.enable = true;
-    programs.tmux = {
-      enable = true;
-    };
-    programs.zsh.prezto = {
-      enable = true;
-    };
-
-    programs.git = {
-      enable = true;
-      includes = [
-        { path = "~/code/tyrel.dev/dotfiles/home/gitconfig"; }
-      ];
-      aliases = {
-        ap = "add -p";
-      };
-      extraConfig = {
-        pull.ff = "only";
-      };
-    };
-
-    programs.neovim = {
-      enable = true;
-      #plugins = with pkgs.vimPlugins; [
-      #  # Inject tree-sitters, since they're annoying to maintain with sideloading
-      #  (nvim-treesitter.withPlugins (plugins: pkgs.tree-sitter.allGrammars))
-      #];
-      plugins = [
-         pkgs.vimPlugins.nvim-treesitter.withAllGrammars
-      ];
-      # We used to manage our own init.lua but now we want the home-manager
-      # managed init.vim to load our init.lua which makes this a little dirty.
-      extraConfig = ''
-      lua << EOF
-       ${builtins.readFile ../../home/config/nvim/init.lua}
-      EOF
-      '';
-    };
-
-    programs.htop = {
-      enable = true;
-    };
 }
diff --git a/hosts/_common/xdg.nix b/hosts/_common/xdg.nix
index 9a9ea95..2b4de67 100644
--- a/hosts/_common/xdg.nix
+++ b/hosts/_common/xdg.nix
@@ -1,19 +1,6 @@
 { pkgs, config, ... }:
 {
     xdg.configFile = {
-      "nvim" = {
-        source = ../../home/config/nvim;
-        recursive = true;
-      };
-      "nvim/lua" = {
-          source = config.lib.file.mkOutOfStoreSymlink ../config/nvim/lua;
-          recursive = true;
-      };
-      "nvim/legacy.vim".source = config.lib.file.mkOutOfStoreSymlink ../../home/config/nvim/legacy.vim;
-      "htop" = {
-        source = ../../home/config/htop;
-        recursive = true;
-      };
     };
 
 }
diff --git a/hosts/blackbox-jr/default.nix b/hosts/blackbox-jr/default.nix
index 8c55841..3a2e20a 100644
--- a/hosts/blackbox-jr/default.nix
+++ b/hosts/blackbox-jr/default.nix
@@ -1,4 +1,4 @@
 { pkgs, config, lib, ... }:
 {
-  programs.zsh.enable = true;
+  #programs.zsh.enable = true;
 }
diff --git a/hosts/x1carbon-ubuntu/default.nix b/hosts/x1carbon-ubuntu/default.nix
index 8c55841..3a2e20a 100644
--- a/hosts/x1carbon-ubuntu/default.nix
+++ b/hosts/x1carbon-ubuntu/default.nix
@@ -1,4 +1,4 @@
 { pkgs, config, lib, ... }:
 {
-  programs.zsh.enable = true;
+  #programs.zsh.enable = true;
 }