add htop

2 files changed, 25 insertions, 21 deletions

diff --git a/flake.nix b/flake.nix
index cd44ed5..09968e1 100644
--- a/flake.nix
+++ b/flake.nix
@@ -53,7 +53,7 @@
             pkgs.rubyPackages.tty-command
           ]);
 
-          nixos-update = pkgs.writeShellApplication  {
+          nixos-update = pkgs.writeShellApplication {
             name = "nixos-update";
             runtimeInputs = [
               pkgs.sops
diff --git a/kj-laptop01/configuration.nix b/kj-laptop01/configuration.nix
index d491da7..47daaa8 100644
--- a/kj-laptop01/configuration.nix
+++ b/kj-laptop01/configuration.nix
@@ -10,6 +10,22 @@
   imports = [
     ./disk-config.nix
   ];
+
+  nix = {
+    extraOptions = ''
+      experimental-features = ca-derivations nix-command flakes
+    '';
+    settings = {
+      substituters = [
+        "https://cache.nixos.org"
+        "https://cache.ngi0.nixos.org/"
+      ];
+      trusted-public-keys = [
+        "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
+      ];
+    };
+  };
+
   sops = {
     defaultSopsFile = ./secrets.yaml;
     age.sshKeyPaths = [ "/etc/ssh/ssh_host_ed25519_key" ];
@@ -27,6 +43,12 @@
 
   boot.loader.systemd-boot.enable = true;
   system.stateVersion = "25.05";
+  swapDevices = [
+    {
+      device = "/swap/swapfile";
+      size = 32768;
+    }
+  ];
 
   security.sudo.enable = true;
   users.mutableUsers = false;
@@ -81,25 +103,7 @@
     ];
   };
 
-  nix = {
-    extraOptions = ''
-      experimental-features = ca-derivations nix-command flakes
-    '';
-    settings = {
-      substituters = [
-        "https://cache.nixos.org"
-        "https://cache.ngi0.nixos.org/"
-      ];
-      trusted-public-keys = [
-        "cache.ngi0.nixos.org-1:KqH5CBLNSyX184S9BKZJo1LxrxJ9ltnY2uAs5c/f1MA="
-      ];
-    };
-  };
-
-  swapDevices = [
-    {
-      device = "/swap/swapfile";
-      size = 32768;
-    }
+  environment.systemPackages = with pkgs; [
+    htop
   ];
 }