diff --git a/.config/nix/modules/host-users-personal.nix b/.config/nix/modules/host-users-personal.nix
new file mode 100644
index 0000000..e277761
--- /dev/null
+++ b/.config/nix/modules/host-users-personal.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+let
+  hostname = "TobAir";
+  username = "tobi";
+in
+{
+  networking.hostName = hostname;
+  networking.computerName = hostname;
+  system.defaults.smb.NetBIOSName = hostname;
+
+  users.users."${username}" = {
+    home = "/Users/${username}";
+    description = "Tobias Ostner";
+    shell = pkgs.zshInteractive;
+  };
+
+  nix.settings.trusted-users = [ username ];
+}
diff --git a/.config/nix/modules/host-users-work.nix b/.config/nix/modules/host-users-work.nix
new file mode 100644
index 0000000..4e8a05e
--- /dev/null
+++ b/.config/nix/modules/host-users-work.nix
@@ -0,0 +1,18 @@
+{ pkgs, ... }:
+let
+  hostname = "TobWorkJambit";
+  username = "tobi";
+in
+{
+  networking.hostName = hostname;
+  networking.computerName = hostname;
+  system.defaults.smb.NetBIOSName = hostname;
+
+  users.users."${username}" = {
+    home = "/Users/${username}";
+    description = "Tobias Ostner";
+    shell = pkgs.zshInteractive;
+  };
+
+  nix.settings.trusted-users = [ username ];
+}
diff --git a/.emacs.d/init.el b/.emacs.d/init.el
index e9764d0..84abce3 100644
--- a/.emacs.d/init.el
+++ b/.emacs.d/init.el
@@ -263,21 +263,6 @@
   (set-selection-coding-system 'utf-8)
   (prefer-coding-system 'utf-8)
 
-  (setq treesit-language-source-alist
-    '((bash "https://github.com/tree-sitter/tree-sitter-bash")
-      (cmake "https://github.com/uyha/tree-sitter-cmake")
-      (css "https://github.com/tree-sitter/tree-sitter-css")
-      (elisp "https://github.com/Wilfred/tree-sitter-elisp")
-      (go "https://github.com/tree-sitter/tree-sitter-go")
-      (html "https://github.com/tree-sitter/tree-sitter-html")
-      (javascript "https://github.com/tree-sitter/tree-sitter-javascript" "master" "src")
-      (json "https://github.com/tree-sitter/tree-sitter-json")
-      (make "https://github.com/alemuller/tree-sitter-make")
-      (markdown "https://github.com/ikatyang/tree-sitter-markdown")
-      (python "https://github.com/tree-sitter/tree-sitter-python")
-      (toml "https://github.com/tree-sitter/tree-sitter-toml")
-      (yaml "https://github.com/ikatyang/tree-sitter-yaml")))
-
   (require 'epg)
   (setq epg-pinentry-mode 'loopback)
 
@@ -651,6 +636,13 @@
 
 (use-package terraform-mode)
 
+(use-package treesit-auto
+  :custom
+  (treesit-auto-install 'prompt)
+  :config
+  (treesit-auto-add-to-auto-mode-alist 'all)
+  (global-treesit-auto-mode))
+
 (use-package yaml-mode)
 
 (use-package vertico