From abdf5bb6de98ff25e5f9d216d2074892bfae5162 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Kier=C3=A1n=20Meinhardt?= <kieran.meinhardt@gmail.com>
Date: Tue, 12 Feb 2019 20:11:24 +0100
Subject: [PATCH] ~ google-drive oneshot; catullus: + htop

---
 main.nix                           | 4 ++--
 systems/catullus/configuration.nix | 2 ++
 systems/krops.nix                  | 1 +
 3 files changed, 5 insertions(+), 2 deletions(-)

diff --git a/main.nix b/main.nix
index baf38e2..3db40dd 100644
--- a/main.nix
+++ b/main.nix
@@ -54,8 +54,8 @@ in {
     '';
     startAt = "*:0/5";
     serviceConfig = {
-      Restart = "on-failure";
-      User = "kfm";
+      Type = "oneshot";
+      User = config.users.users.kfm.name;
     };
   };
 
diff --git a/systems/catullus/configuration.nix b/systems/catullus/configuration.nix
index d7771db..94e3717 100644
--- a/systems/catullus/configuration.nix
+++ b/systems/catullus/configuration.nix
@@ -24,6 +24,7 @@ in {
   };
 
   environment.variables.TERM = "linux";
+  environment.variables.HTOPRC = toString <htoprc>;
 
   documentation.enable = false;
   documentation.doc.enable = false;
@@ -35,6 +36,7 @@ in {
   environment.systemPackages = with pkgs; [
     git
     vim
+    htop
   ];
 
   users.mutableUsers = false;
diff --git a/systems/krops.nix b/systems/krops.nix
index 5e886f5..879dca5 100644
--- a/systems/krops.nix
+++ b/systems/krops.nix
@@ -13,6 +13,7 @@ let
     };
     system.file = toString path;
     modules.file = toString ../modules;
+    htoprc.file = toString ../dot/htoprc;
     packages.file = toString ../packages;
     nixos-config.symlink = "system/configuration.nix";
     secrets.pass = {