From 7a8af01854271dddbd9e6e3739cc041c14019628 Mon Sep 17 00:00:00 2001
From: fleaz <mail@felixbreidenstein.de>
Date: Fri, 28 Jan 2022 15:43:37 +0100
Subject: [PATCH] Add earlyoom and actually load modules for jimbo

---
 machines/cray/configuration.nix  |  1 +
 machines/jimbo/configuration.nix | 13 ++++++-------
 modules/earlyoom.nix             |  3 +++
 users/fleaz.nix                  |  2 +-
 4 files changed, 11 insertions(+), 8 deletions(-)
 create mode 100644 modules/earlyoom.nix

diff --git a/machines/cray/configuration.nix b/machines/cray/configuration.nix
index 44eaf8c..eac340a 100644
--- a/machines/cray/configuration.nix
+++ b/machines/cray/configuration.nix
@@ -14,6 +14,7 @@
     ../../modules/opengl.nix
     ../../modules/ssh.nix
     ../../modules/remote-builder.nix
+    ../../modules/earlyoom.nix
     ../../users/fleaz.nix
     ../../home-manager/default.nix
   ];
diff --git a/machines/jimbo/configuration.nix b/machines/jimbo/configuration.nix
index b054997..cb1f9b6 100644
--- a/machines/jimbo/configuration.nix
+++ b/machines/jimbo/configuration.nix
@@ -12,6 +12,12 @@ in {
     # Include the results of the hardware scan.
     ./hardware-configuration.nix
     ../../home-manager/default.nix
+    ../../modules/earlyoom.nix
+    ../../modules/opengl.nix
+    ../../modules/remote-builder.nix
+    ../../modules/sound.nix
+    ../../modules/ssh.nix
+    ../../users/fleaz.nix
   ];
 
   # Use the systemd-boot EFI boot loader.
@@ -86,13 +92,6 @@ in {
   # Enable touchpad support (enabled default in most desktopManager).
   # services.xserver.libinput.enable = true;
 
-  # Define a user account. Don't forget to set a password with ‘passwd’.
-  users.users.fleaz = {
-    isNormalUser = true;
-    shell = pkgs.zsh;
-    extraGroups = [ "wheel" "docker" ]; # Enable ‘sudo’ for the user.
-  };
-
   # List packages installed in system profile. To search, run:
   environment.systemPackages = with pkgs; [ vim wget curl git 
 ];
diff --git a/modules/earlyoom.nix b/modules/earlyoom.nix
new file mode 100644
index 0000000..d264726
--- /dev/null
+++ b/modules/earlyoom.nix
@@ -0,0 +1,3 @@
+{
+  services.earlyoom.enable = true;
+}
diff --git a/users/fleaz.nix b/users/fleaz.nix
index 307bf4c..2e4c8ed 100644
--- a/users/fleaz.nix
+++ b/users/fleaz.nix
@@ -1,4 +1,4 @@
-{ ... }: {
+{ pkgs, ... }: {
   users.users.fleaz = {
     isNormalUser = true;
     extraGroups = [ "wheel" ]; # Enable ‘sudo’ for the user.