diff --git a/home-mods/common/default.nix b/home-mods/common/default.nix
index 39dec3a..744672d 100644
--- a/home-mods/common/default.nix
+++ b/home-mods/common/default.nix
@@ -3,6 +3,5 @@
 , pkgs
 , ...
 }: {
-  home.homeDirectory = "/home/${config.home.username}";
   xdg.enable = true;
 }
diff --git a/home-mods/desktop/default.nix b/home-mods/desktop/default.nix
index 99d88b7..257dd6b 100644
--- a/home-mods/desktop/default.nix
+++ b/home-mods/desktop/default.nix
@@ -38,7 +38,6 @@ in
       libsForQt5.kdeconnect-kde
       libsForQt5.plasma-vault
       libsForQt5.plasma-browser-integration
-      neofetch
       nextcloud-client
       onlyoffice-bin
       protonup-qt
diff --git a/home-mods/shell/default.nix b/home-mods/shell/default.nix
index 853b6b5..07b2b60 100644
--- a/home-mods/shell/default.nix
+++ b/home-mods/shell/default.nix
@@ -203,9 +203,10 @@ in
       gcc
       imagemagick
       libtool
-      nodejs_20
+      neofetch
       nil
       nixpkgs-fmt
+      nodejs_20
       pandoc
       python311Full
       rcm
diff --git a/os-mods/netdata/default.nix b/os-mods/netdata/default.nix
index 4ba8595..74fbeaa 100644
--- a/os-mods/netdata/default.nix
+++ b/os-mods/netdata/default.nix
@@ -9,6 +9,16 @@
   # TODO allow primary/node config option to listen/send metrics to central location
   services.netdata = {
     enable = true;
+    package = pkgs.unstable-os.netdata;
+    python = {
+      enable = true;
+
+      extraPackages = ps: [
+        ps.psycopg2
+        ps.docker
+        ps.dnspython
+      ];
+    };
 
     config = {
       global = {
@@ -26,6 +36,9 @@
         "dbengine tier 2 multihost disk space MB" = 512;
         "cleanup obsolete charts after secs" = 600;
       };
+      plugins = {
+        "go.d" = "yes";
+      };
       ml = {
         # enable machine learning
         "enabled" = "yes";
diff --git a/systems/nixos-karl-kvm-guest/default.nix b/systems/nixos-karl-kvm-guest/default.nix
index 0eb0d8a..7b71d7d 100644
--- a/systems/nixos-karl-kvm-guest/default.nix
+++ b/systems/nixos-karl-kvm-guest/default.nix
@@ -2,6 +2,8 @@
 , pkgs
 , modulesPath
 , lib
+, inputs
+, system
 , ...
 }: {
   imports = [
@@ -31,8 +33,6 @@
     extraModulePackages = [ ];
   };
 
-  # List packages installed in system profile. To search, run:
-  # $ nix search wget
   environment.systemPackages = with pkgs; [
     netmaker
   ];
@@ -72,12 +72,6 @@
     isNormalUser = true;
     description = "reopen5194";
     extraGroups = [ "docker" "networkmanager" "wheel" ];
-    packages = with pkgs; [
-      firefox
-      kate
-      emacs
-      #  thunderbird
-    ];
     openssh.authorizedKeys.keys = [
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIO4fBDj1/He/uimO97RgjGWZLAimTrLmIlYS2ekD73GC tristan@arch-pulse"
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIDP8ztBIgQsYh7LefSKtuDRYDWNheZWbmIr51T/Np/jc tristand@nixos-pulse"
@@ -85,6 +79,19 @@
       "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMuH8L7mQDg86uJME6jndOu4niwLMASuJKpdbJU8Hfet tristan+desktop@vault81.de"
     ];
   };
+  home-manager = {
+    useUserPackages = true;
+    useGlobalPkgs = true;
+    users.reopen5194 = import ../../users/admin-thin.nix {
+      username = "reopen5194";
+
+      inherit pkgs;
+      inherit config;
+      inherit inputs;
+      inherit system;
+      inherit lib;
+    };
+  };
 
   # Some programs need SUID wrappers, can be configured further or are
   # started in user sessions.
diff --git a/users/tristand.nix b/users/admin-fat.nix
similarity index 62%
rename from users/tristand.nix
rename to users/admin-fat.nix
index 7827d5c..903806f 100644
--- a/users/tristand.nix
+++ b/users/admin-fat.nix
@@ -2,6 +2,7 @@
 , config
 , inputs
 , system
+, username
 , ...
 }: {
   imports = [
@@ -14,9 +15,12 @@
     ../home-mods/virt
   ];
 
-  config.home = {
-    username = "tristand";
+  config = {
+    home = {
+      username = username;
+      homeDirectory = "/home/${username}";
 
-    stateVersion = "23.05";
+      stateVersion = "23.05";
+    };
   };
 }
diff --git a/users/tester.nix b/users/admin-thin.nix
similarity index 75%
rename from users/tester.nix
rename to users/admin-thin.nix
index 1d7ceb1..f913ee5 100644
--- a/users/tester.nix
+++ b/users/admin-thin.nix
@@ -2,20 +2,20 @@
 , config
 , inputs
 , system
+, username
 , ...
 }: {
   imports = [
     ../home-mods/audio
     ../home-mods/common
-    ../home-mods/desktop
     ../home-mods/firefox
     ../home-mods/plasma
     ../home-mods/shell
-    ../home-mods/virt
   ];
 
   config.home = {
-    username = "tester";
+    username = username;
+    homeDirectory = "/home/${username}";
 
     stateVersion = "23.05";
   };
diff --git a/users/default.nix b/users/default.nix
index 09fd9af..0ba8ff5 100644
--- a/users/default.nix
+++ b/users/default.nix
@@ -25,14 +25,18 @@
   home-manager = {
     useUserPackages = true;
     useGlobalPkgs = true;
-    users.tester = import ./tester.nix {
+    users.tester = import ./admin-thin.nix {
+      username = "tester";
+
       inherit pkgs;
       inherit config;
       inherit inputs;
       inherit system;
       inherit lib;
     };
-    users.tristand = import ./tristand.nix {
+    users.tristand = import ./admin-fat.nix {
+      username = "tristand";
+
       inherit pkgs;
       inherit config;
       inherit inputs;