From 0f7d64a373f64e32da6689bd75c22204db7ca23b Mon Sep 17 00:00:00 2001
From: Profpatsch <mail@profpatsch.de>
Date: Sun, 26 Jun 2022 19:37:26 +0200
Subject: machines/Profpatsch: Move some stuff to base.nix

I use all of that on a regular basis.

Earlyoom makes sense for any kind of machine without swap, which is
all of my machines.
---
 machines/profpatsch/base-workstation.nix | 16 ----------------
 machines/profpatsch/base.nix             | 17 ++++++++++++++++-
 2 files changed, 16 insertions(+), 17 deletions(-)

(limited to 'machines')

diff --git a/machines/profpatsch/base-workstation.nix b/machines/profpatsch/base-workstation.nix
index 300e7650..6d375d77 100644
--- a/machines/profpatsch/base-workstation.nix
+++ b/machines/profpatsch/base-workstation.nix
@@ -31,14 +31,6 @@ in {
       keyMap = "neo";
     };
 
-    # the kernel OOM is not good enough without swap,
-    # and I don’t like swap. This kills the most hoggy
-    # processes when the system goes under a free space limit
-    services.earlyoom = {
-      enable = true;
-      freeMemThreshold = 5; # <5% free
-    };
-
     vuizvui.services.upower = {
       enable = true;
       settings = {
@@ -124,18 +116,10 @@ in {
     let
       # of utmost necessity for me to function
       basePkgs = [
-        ripgrep           # file content searcher, > ag > ack > grep
-        lr                # list recursively, ls & find replacement
-        dos2unix          # text file conversion
-        man-pages          # system manpages (not included by default)
-        mkpasswd          # UNIX password creator
-        ncdu              # disk size checker
         smartmontools     # check disk state
         stow              # dotfile management
-        traceroute        # trace ip routes
         wirelesstools     # iwlist (wifi scan)
         gitFull           # git with send-email
-        binutils          # debugging binary files
       ];
       # minimal set of gui applications
       guiPkgs = [
diff --git a/machines/profpatsch/base.nix b/machines/profpatsch/base.nix
index 4232e4d5..9abb0a3c 100644
--- a/machines/profpatsch/base.nix
+++ b/machines/profpatsch/base.nix
@@ -17,6 +17,14 @@ in
     # /tmp should never be depended on
     boot.cleanTmpDir = true;
 
+    # the kernel OOM is not good enough without swap,
+    # and I don’t like swap. This kills the most hoggy
+    # processes when the system goes under a free space limit
+    services.earlyoom = {
+      enable = true;
+      freeMemThreshold = 5; # <5% free
+    };
+
     # bounded journal size
     services.journald.extraConfig = "SystemMaxUse=500M";
 
@@ -39,15 +47,22 @@ in
 
     environment.systemPackages = with pkgs; [
       curl              # transfer data to/from a URL
+      binutils          # debugging binary files
+      dos2unix          # text file conversion
       file              # file information
       htop              # top replacement
+      ncdu              # disk size checker
       nmap              # stats about clients in the network
+      man-pages          # system manpages (not included by default)
+      mkpasswd          # UNIX password creator
+      lr                # list recursively, ls & find replacement
+      ripgrep           # file content searcher, > ag > ack > grep
       rsync             # file syncing tool
       strace            # tracing syscalls
       tmux              # detachable terminal multiplexer
+      traceroute        # trace ip routes
       wget              # the other URL file fetcher
       myPkgs.vim        # slight improvement over vi
-      lr                # list recursively, ls & find replacement
       xe                # xargs with a modern interface
     ];
 
-- 
cgit 1.4.1