From 6ee8509d990bd0672ec06074d6ccfbfacb2897f3 Mon Sep 17 00:00:00 2001 From: Root Date: Mon, 12 Apr 2021 13:41:00 -0700 Subject: [PATCH] Don't use tmpfs for small-mem hosts --- config/hosts/limina.nix | 1 + config/hosts/plato.nix | 1 + config/profile-config/server.nix | 12 ++---------- lib/fudo/hosts.nix | 9 +++++++++ 4 files changed, 13 insertions(+), 10 deletions(-) diff --git a/config/hosts/limina.nix b/config/hosts/limina.nix index 04fb8f6..a85eb41 100644 --- a/config/hosts/limina.nix +++ b/config/hosts/limina.nix @@ -13,4 +13,5 @@ profile = "server"; ssh-pubkey = "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqymGZ5dI6ChI1Qx1QfjBo/h0+xFwpRx/wQSDxWQprI"; + tmp-on-tmpfs = false; } diff --git a/config/hosts/plato.nix b/config/hosts/plato.nix index 8fa9a6c..16187c2 100644 --- a/config/hosts/plato.nix +++ b/config/hosts/plato.nix @@ -16,4 +16,5 @@ build-pubkeys = [ "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMPjwpcktL0Rhjc/D3ZmzwkSRqSJX5TGjMXVstpg8nNqQQrj9DxPq7gV4a+1LxMtQGPUv4gYx7De1a5LMVk8u6qJJnaLlt3TB1e1SUCBxxeh5sWIY5BMx8Q0/aRTkyTchyczX6FX0LXM7FP6yvxZVZSn2WHRp7REr8G1PUAwuIGy2a4bKOUSh5Uj4riXFXnROW2mp1vUfe5oH4X5HP3ACCXWRVUFdqDt1ldcrqqi+7/8x2G1eOHJcQ7B5FdL3uuq0nBrUzFQTt6KCHy0C2Jc3DFwOS1+ZdGKZpao+/arh/fH+LQfMUePx/AQOkYrJwvuRwbxg8XmlZ89u2gyDuqapzjBmsu+wyd5pF2QglyTRZW9Ijy1NTuzduPm6wgqN0Q09evFJvM9ZjShcIY3xTcCGDxpwTeYgMVXMF79sV9u+JwCSBpaIyteIJ7M/J/NWmaKoUF6Ia9mNts889Ba9TKzQFek19KYetOB2hfXV+7bvXrH+OBppzpdrztJFavBceQTs=" ]; + tmp-on-tmpfs = false; } diff --git a/config/profile-config/server.nix b/config/profile-config/server.nix index 1b0b130..9cc8bf0 100644 --- a/config/profile-config/server.nix +++ b/config/profile-config/server.nix @@ -2,11 +2,7 @@ with lib; let - serverPackages = with pkgs; [ - emacs-nox - reboot-if-necessary - test-config - ]; + serverPackages = with pkgs; [ emacs-nox reboot-if-necessary test-config ]; reboot-if-necessary = pkgs.writeShellScriptBin "reboot-if-necessary" '' if [ $# -ne 1 ]; then @@ -50,9 +46,7 @@ in { imports = [ ./common.nix ]; config = { - environment = { - systemPackages = serverPackages; - }; + environment = { systemPackages = serverPackages; }; system.autoUpgrade.enable = false; @@ -60,8 +54,6 @@ in { networking.networkmanager.enable = mkForce false; - boot.tmpOnTmpfs = true; - services = { xserver.enable = false; diff --git a/lib/fudo/hosts.nix b/lib/fudo/hosts.nix index b0993c8..b772b68 100644 --- a/lib/fudo/hosts.nix +++ b/lib/fudo/hosts.nix @@ -89,6 +89,13 @@ let default = null; }; + tmp-on-tmpfs = mkOption { + type = bool; + description = + "Use tmpfs for /tmp. Great if you've got enough (>16G) RAM."; + default = true; + }; + enable-gui = mkEnableOption "Install desktop GUI software."; docker-server = mkEnableOption "Enable Docker on the current host."; @@ -172,6 +179,8 @@ in { autoPrune.enable = true; }; + boot.tmpOnTmpfs = host-cfg.tmp-on-tmpfs; + programs.ssh.knownHosts = let keyed-hosts = filterAttrs (host: opts: opts.ssh-pubkey != null) config.fudo.hosts;