From b8c9fe888f79db735b148d600f387c0d26ac8cc0 Mon Sep 17 00:00:00 2001 From: Sean Buckley Date: Mon, 27 Mar 2023 11:17:08 -0400 Subject: [PATCH] merge server things into baseline --- modules/baseline.nix | 10 ++++++++++ modules/profiles/default.nix | 4 ++-- modules/profiles/server.nix | 13 ------------- 3 files changed, 12 insertions(+), 15 deletions(-) delete mode 100644 modules/profiles/server.nix diff --git a/modules/baseline.nix b/modules/baseline.nix index 361b817..925d529 100644 --- a/modules/baseline.nix +++ b/modules/baseline.nix @@ -5,6 +5,9 @@ # the default is all languages. this just shrinks the install size i18n.supportedLocales = [ "en_US.UTF-8/UTF-8" ]; + # makes system evaluation much faster + documentation.nixos.enable = false; + boot = { zfs.forceImportRoot = false; initrd.availableKernelModules = [ "nvme" ]; # is this still needed? @@ -33,9 +36,16 @@ extraOptions = '' experimental-features = nix-command flakes ''; + gc = { + automatic = true; + persistent = false; + randomizedDelaySec = "40min"; + options = "--delete-older-than 30d"; + }; }; services = { + logind.lidSwitch = "ignore"; openssh.enable = true; xserver = { libinput.mouse.middleEmulation = false; diff --git a/modules/profiles/default.nix b/modules/profiles/default.nix index 9ff6207..3561114 100644 --- a/modules/profiles/default.nix +++ b/modules/profiles/default.nix @@ -2,7 +2,7 @@ with lib; { options.sconfig.profile = mkOption { - type = types.enum [ "server" "desktop" ]; + type = types.enum [ "desktop" ]; }; - imports = [ ./server.nix ./desktop.nix ]; + imports = [ ./desktop.nix ]; } diff --git a/modules/profiles/server.nix b/modules/profiles/server.nix deleted file mode 100644 index 040f696..0000000 --- a/modules/profiles/server.nix +++ /dev/null @@ -1,13 +0,0 @@ -{ config, pkgs, lib, ... }: -with lib; -{ - config = mkIf (config.sconfig.profile == "server") { - services.logind.lidSwitch = "ignore"; - documentation.nixos.enable = false; - nix.gc = { - automatic = true; - options = "--delete-older-than 30d"; - randomizedDelaySec = "40min"; - }; - }; -}