@@ -7,7 +7,6 @@ {
   imports = [
     "${modulesPath}/installer/cd-dvd/installation-cd-minimal.nix"
 
-    ../settings/programs/base.nix
     ../settings/hardware/nvidia-gpu.nix
     ../settings/hardware/keyboard.nix
     ../settings/hardware/keyboard-lofree.nix

@@ -81,16 +81,6 @@ Hostname git.${domain}
       User gitolite
   '';
 
-  programs.htop = {
-    enable = true;
-    settings = {
-      header_margin = 0;
-      tree_view = true;
-      hide_userland_threads = true;
-      hide_kernel_threads = true;
-    };
-  };
-
   nix = {
     settings = {
       max-jobs = 2;

@@ -20,7 +20,6 @@ ../settings/hardware/keyboard-lofree.nix
     ../settings/hardware/trezor.nix
     ../settings/services/syncthing.nix
     ../settings/user-interface.nix
-    ../settings/programs/base.nix
     ../settings/programs/kde.nix
     ../settings/programs/shell.nix
     ../settings/programs/docker.nix

@@ -28,16 +28,6 @@ nixpkgs-review
     nix-output-monitor
   ];
 
-  programs.htop = {
-    enable = true;
-    settings = {
-      header_margin = 0;
-      tree_view = true;
-      hide_userland_threads = true;
-      hide_kernel_threads = true;
-    };
-  };
-
   networking = {
     hostName = hostname;
     domain = domain;

@@ -2,5 +2,6 @@ { ... }:
 {
   imports = [
     ../settings/programs/neovim.nix
+    ../settings/programs/base.nix
   ];
 }

@@ -11,4 +11,15 @@ ]
     ++ (lib.optionals (stdenv.isLinux) [
       psmisc
     ]);
+
+  programs.htop = {
+    enable = true;
+    settings = {
+      header_margin = 0;
+      tree_view = true;
+      hide_userland_threads = true;
+      hide_kernel_threads = true;
+    };
+  };
+
 }