diff --git a/configs/htop.nix b/configs/htop.nix
deleted file mode 100644
index 8c5e43e..0000000
--- a/configs/htop.nix
+++ /dev/null
@@ -1,30 +0,0 @@
-{ configs, pkgs, ... }:
-{
-  environment.etc.htoprc.text = ''
-    fields=0 48 17 18 38 39 40 2 46 47 49 1
-    sort_key=46
-    sort_direction=1
-    hide_threads=0
-    hide_kernel_threads=1
-    hide_userland_threads=0
-    shadow_other_users=1
-    show_thread_names=1
-    show_program_path=1
-    highlight_base_name=1
-    highlight_megabytes=1
-    highlight_threads=1
-    tree_view=1
-    header_margin=1
-    detailed_cpu_time=0
-    cpu_count_from_zero=0
-    update_process_names=0
-    account_guest_in_cpu_meter=1
-    color_scheme=0
-    delay=15
-    left_meters=LeftCPUs2 RightCPUs2 Memory Swap
-    left_meter_modes=1 1 1 1
-    right_meters=Uptime Tasks LoadAverage Battery
-    right_meter_modes=2 2 2 2
-  '';
-  environment.systemPackages = [ pkgs.htop ];
-}
diff --git a/configs/users.nix b/configs/users.nix
deleted file mode 100644
index 98b909a..0000000
--- a/configs/users.nix
+++ /dev/null
@@ -1,15 +0,0 @@
-{ config, pkgs, ... }:
-{
-  users.mutableUsers = false;
-
-  users.users.kfm = {
-    name = "kfm";
-    description = config.constants.user.name;
-    home = "/home/kfm";
-    createHome = true;
-    group = "users";
-    extraGroups = [ "wheel" "audio" "docker" ];
-    hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
-    shell = pkgs.zsh;
-  };
-}
diff --git a/dot/htop.nix b/dot/htop.nix
new file mode 100644
index 0000000..864c76d
--- /dev/null
+++ b/dot/htop.nix
@@ -0,0 +1,26 @@
+''
+  fields=0 48 17 18 38 39 40 2 46 47 49 1
+  sort_key=46
+  sort_direction=1
+  hide_threads=0
+  hide_kernel_threads=1
+  hide_userland_threads=0
+  shadow_other_users=1
+  show_thread_names=1
+  show_program_path=1
+  highlight_base_name=1
+  highlight_megabytes=1
+  highlight_threads=1
+  tree_view=1
+  header_margin=1
+  detailed_cpu_time=0
+  cpu_count_from_zero=0
+  update_process_names=0
+  account_guest_in_cpu_meter=1
+  color_scheme=0
+  delay=15
+  left_meters=LeftCPUs2 RightCPUs2 Memory Swap
+  left_meter_modes=1 1 1 1
+  right_meters=Uptime Tasks LoadAverage Battery
+  right_meter_modes=2 2 2 2
+''
diff --git a/main.nix b/main.nix
index e35f277..e12ed3a 100644
--- a/main.nix
+++ b/main.nix
@@ -6,7 +6,6 @@ in {
     "${builtins.fetchTarball https://github.com/rycee/home-manager/archive/master.tar.gz}/nixos"
     ./options.nix
     configs/hu-berlin.nix
-    configs/users.nix
     configs/shells.nix
     configs/editors.nix
     configs/graphics.nix
@@ -15,6 +14,8 @@ in {
     configs/retiolum.nix
   ];
 
+  boot.cleanTmpDir = true;
+
   time.timeZone = "Europe/Berlin";
 
   sound.enable = true;
@@ -64,6 +65,19 @@ in {
     terminal = "screen-256color";
   };
 
+  users.mutableUsers = false;
+
+  users.users.kfm = {
+    name = "kfm";
+    description = config.constants.user.name;
+    home = "/home/kfm";
+    createHome = true;
+    group = "users";
+    extraGroups = [ "wheel" "audio" "docker" ];
+    hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
+    shell = pkgs.zsh;
+  };
+
   home-manager.users.kfm = {
     programs.git = {
       enable = true;
@@ -86,6 +100,7 @@ in {
     home.file = {
       ".config/mpv/input.conf".text = import dot/mpv.nix;
       ".config/Typora/themes/base.user.css".text = import dot/typora.nix;
+      ".config/htop/htoprc".text = import dot/htop.nix;
       ".ghc/ghci.conf".text = import dot/ghci.nix { inherit pkgs; };
       ".stack/config.yaml".text = import dot/stack.nix { user = config.constants.user; };
       ".zshrc".text = "# nothing to see here";
diff --git a/systems/catullus/config.nix b/systems/catullus/config.nix
index d4bee85..9064470 100644
--- a/systems/catullus/config.nix
+++ b/systems/catullus/config.nix
@@ -3,7 +3,6 @@ let vimConfig = import ../../dot/vim.nix { inherit config pkgs; };
 in {
   imports = [
     ../../configs/users.nix
-    ../../configs/htop.nix
     ../../configs/shells.nix
     ../../options.nix
   ];
@@ -20,9 +19,13 @@ in {
 
   services.openssh.enable = true;
 
+  environment.variables.EDITOR = "vim";
+  environment.variables.HTOPRC = ../../dot/htop.nix;
+
   programs.tmux.enable = true;
   environment.systemPackages = with pkgs; [
     git
+    htop
     (vim_configurable.customize {
       name = "kvim";
       vimrcConfig = {
@@ -31,4 +34,15 @@ in {
       };
     })
   ];
+
+  users.users.kfm = {
+    name = "kfm";
+    description = "Kierán Meinhardt";
+    home = "/home/kfm";
+    createHome = true;
+    group = "users";
+    extraGroups = [ "wheel" ];
+    hashedPassword = "$6$w9hXyGFl/.IZBXk$5OiWzS1G.5hImhh1YQmZiCXYNAJhi3X6Y3uSLupJNYYXPLMsQpx2fwF4Xr2uYzGMV8Foqh8TgUavx1APD9rcb/";
+    shell = pkgs.zsh;
+  };
 }