nix
/
nixos-config
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merged with upstream

This commit is contained in:
root 2021-04-12 14:41:21 -07:00
parent 6f070a9963 9d3808fe2d
commit fe27e45bdd
4 changed files with 13 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
config/hosts/limina.nix
View File

@ -13,4 +13,5 @@
profile = "server"; profile = "server";
ssh-pubkey = ssh-pubkey =
"ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqymGZ5dI6ChI1Qx1QfjBo/h0+xFwpRx/wQSDxWQprI"; "ssh-ed25519 AAAAC3NzaC1lZDI1NTE5AAAAIMqymGZ5dI6ChI1Qx1QfjBo/h0+xFwpRx/wQSDxWQprI";
tmp-on-tmpfs = false;
} }

1
config/hosts/plato.nix
View File

@ -16,4 +16,5 @@
build-pubkeys = [ build-pubkeys = [
"ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMPjwpcktL0Rhjc/D3ZmzwkSRqSJX5TGjMXVstpg8nNqQQrj9DxPq7gV4a+1LxMtQGPUv4gYx7De1a5LMVk8u6qJJnaLlt3TB1e1SUCBxxeh5sWIY5BMx8Q0/aRTkyTchyczX6FX0LXM7FP6yvxZVZSn2WHRp7REr8G1PUAwuIGy2a4bKOUSh5Uj4riXFXnROW2mp1vUfe5oH4X5HP3ACCXWRVUFdqDt1ldcrqqi+7/8x2G1eOHJcQ7B5FdL3uuq0nBrUzFQTt6KCHy0C2Jc3DFwOS1+ZdGKZpao+/arh/fH+LQfMUePx/AQOkYrJwvuRwbxg8XmlZ89u2gyDuqapzjBmsu+wyd5pF2QglyTRZW9Ijy1NTuzduPm6wgqN0Q09evFJvM9ZjShcIY3xTcCGDxpwTeYgMVXMF79sV9u+JwCSBpaIyteIJ7M/J/NWmaKoUF6Ia9mNts889Ba9TKzQFek19KYetOB2hfXV+7bvXrH+OBppzpdrztJFavBceQTs=" "ssh-rsa AAAAB3NzaC1yc2EAAAADAQABAAABgQDMPjwpcktL0Rhjc/D3ZmzwkSRqSJX5TGjMXVstpg8nNqQQrj9DxPq7gV4a+1LxMtQGPUv4gYx7De1a5LMVk8u6qJJnaLlt3TB1e1SUCBxxeh5sWIY5BMx8Q0/aRTkyTchyczX6FX0LXM7FP6yvxZVZSn2WHRp7REr8G1PUAwuIGy2a4bKOUSh5Uj4riXFXnROW2mp1vUfe5oH4X5HP3ACCXWRVUFdqDt1ldcrqqi+7/8x2G1eOHJcQ7B5FdL3uuq0nBrUzFQTt6KCHy0C2Jc3DFwOS1+ZdGKZpao+/arh/fH+LQfMUePx/AQOkYrJwvuRwbxg8XmlZ89u2gyDuqapzjBmsu+wyd5pF2QglyTRZW9Ijy1NTuzduPm6wgqN0Q09evFJvM9ZjShcIY3xTcCGDxpwTeYgMVXMF79sV9u+JwCSBpaIyteIJ7M/J/NWmaKoUF6Ia9mNts889Ba9TKzQFek19KYetOB2hfXV+7bvXrH+OBppzpdrztJFavBceQTs="
]; ];
tmp-on-tmpfs = false;
} }

12
config/profile-config/server.nix
View File

@ -2,11 +2,7 @@
with lib; with lib;
let let
serverPackages = with pkgs; [ serverPackages = with pkgs; [ emacs-nox reboot-if-necessary test-config ];
emacs-nox
reboot-if-necessary
test-config
];
reboot-if-necessary = pkgs.writeShellScriptBin "reboot-if-necessary" '' reboot-if-necessary = pkgs.writeShellScriptBin "reboot-if-necessary" ''
if [ $# -ne 1 ]; then if [ $# -ne 1 ]; then
@ -50,9 +46,7 @@ in {
imports = [ ./common.nix ]; imports = [ ./common.nix ];
config = { config = {
environment = { environment = { systemPackages = serverPackages; };
systemPackages = serverPackages;
};
system.autoUpgrade.enable = false; system.autoUpgrade.enable = false;
@ -60,8 +54,6 @@ in {
networking.networkmanager.enable = mkForce false; networking.networkmanager.enable = mkForce false;
boot.tmpOnTmpfs = true;
services = { services = {
xserver.enable = false; xserver.enable = false;

9
lib/fudo/hosts.nix
View File

@ -89,6 +89,13 @@ let
default = null; 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."; enable-gui = mkEnableOption "Install desktop GUI software.";
docker-server = mkEnableOption "Enable Docker on the current host."; docker-server = mkEnableOption "Enable Docker on the current host.";
@ -188,6 +195,8 @@ in {
autoPrune.enable = true; autoPrune.enable = true;
}; };
boot.tmpOnTmpfs = host-cfg.tmp-on-tmpfs;
programs.ssh.knownHosts = let programs.ssh.knownHosts = let
keyed-hosts = keyed-hosts =
filterAttrs (host: opts: opts.ssh-pubkey != null) config.fudo.hosts; filterAttrs (host: opts: opts.ssh-pubkey != null) config.fudo.hosts;