From 7b4febe0ab9d7dd3cf7efd720861a540a01c3cba Mon Sep 17 00:00:00 2001 From: Luke Granger-Brown Date: Sun, 10 Apr 2022 02:20:41 +0000 Subject: [PATCH] ops/nixos/blade: honey I shrunk the closure --- ops/nixos/lib/blade.nix | 22 +++++++++++++++++++--- ops/nixos/lib/home-manager/blade.nix | 7 +++++++ ops/nixos/lib/home-manager/common.nix | 3 +++ 3 files changed, 29 insertions(+), 3 deletions(-) create mode 100644 ops/nixos/lib/home-manager/blade.nix diff --git a/ops/nixos/lib/blade.nix b/ops/nixos/lib/blade.nix index d31dc93703..e8208b67d9 100644 --- a/ops/nixos/lib/blade.nix +++ b/ops/nixos/lib/blade.nix @@ -49,6 +49,7 @@ in { ]; my.rundeck.tags = [ "blade" ]; + my.home-manager.imports = lib.mkAfter [ ./home-manager/blade.nix ]; fileSystems = let zfs = device: { @@ -143,8 +144,6 @@ in { ATTR{address}=="${config.my.blade.macAddress.public}", NAME="en-public" ''); - virtualisation.podman.enable = true; - environment.systemPackages = with pkgs; [ ceph xfsprogs @@ -185,7 +184,18 @@ in { enable = true; qemu = { runAsRoot = true; - package = pkgs.qemu_full; + package = pkgs.qemu.override { + gtkSupport = false; + sdlSupport = false; + spiceSupport = false; + cephSupport = true; + smartcardSupport = false; + pulseSupport = false; + alsaSupport = false; + libiscsiSupport = false; + + hostCpuOnly = true; + }; }; package = pkgs.libvirt.override { enableCeph = true; @@ -204,6 +214,12 @@ in { ProcessSizeMax=0 ''; + fonts.fontconfig.enable = false; + programs.ssh.setXAuthLocation = false; + security.pam.services.su.forwardXAuth = lib.mkForce false; + services.fwupd.enable = lib.mkForce false; + xdg.sounds.enable = false; + system.stateVersion = "21.05"; }; } diff --git a/ops/nixos/lib/home-manager/blade.nix b/ops/nixos/lib/home-manager/blade.nix new file mode 100644 index 0000000000..6dff34042c --- /dev/null +++ b/ops/nixos/lib/home-manager/blade.nix @@ -0,0 +1,7 @@ +{ depot, lib, pkgs, ... }: +{ + imports = [ ./common.nix ]; + + programs.bash.enableVteIntegration = lib.mkForce false; + programs.ntfy.enable = lib.mkForce false; +} diff --git a/ops/nixos/lib/home-manager/common.nix b/ops/nixos/lib/home-manager/common.nix index b1768de426..95f75dda15 100644 --- a/ops/nixos/lib/home-manager/common.nix +++ b/ops/nixos/lib/home-manager/common.nix @@ -111,6 +111,9 @@ in ''; }; programs.vim.enable = true; + programs.vim.packageConfigurable = pkgs.vim_configurable.override { + guiSupport = false; + }; home.packages = (with pkgs; ([ ripgrep