diff options
| author | Franck Cuny <franck@fcuny.net> | 2025-12-31 09:20:39 -0800 |
|---|---|---|
| committer | Franck Cuny <franck@fcuny.net> | 2025-12-31 09:20:39 -0800 |
| commit | ddde2f8904bec0b33bf479d40d591071a538c36e (patch) | |
| tree | 8d8d8c2f2fba8a9372459d1ba8346117fcbb3bff /machines | |
| parent | simplify a bit more minimal profile (diff) | |
| download | infra-ddde2f8904bec0b33bf479d40d591071a538c36e.tar.gz | |
cgroups is included in all nixos
No need to have a separate profile for makemkv, include it directly in
the host' configuration.
Diffstat (limited to '')
| -rw-r--r-- | machines/argonath.nix | 1 | ||||
| -rw-r--r-- | machines/bree.nix | 1 | ||||
| -rw-r--r-- | machines/rivendell.nix | 13 |
3 files changed, 11 insertions, 4 deletions
diff --git a/machines/argonath.nix b/machines/argonath.nix index 78738a0..b35915d 100644 --- a/machines/argonath.nix +++ b/machines/argonath.nix @@ -3,7 +3,6 @@ imports = [ ../profiles/acme.nix ../profiles/core-metrics.nix - ../profiles/cgroups.nix ../profiles/defaults.nix ../profiles/disk/basic-vm.nix ../profiles/hardware/do-droplet.nix diff --git a/machines/bree.nix b/machines/bree.nix index d5e52d0..a76252f 100644 --- a/machines/bree.nix +++ b/machines/bree.nix @@ -6,7 +6,6 @@ }: { imports = [ - ../profiles/cgroups.nix ../profiles/core-metrics.nix ../profiles/defaults.nix ../profiles/disk/basic-vm.nix diff --git a/machines/rivendell.nix b/machines/rivendell.nix index 8d27f87..f3cadc6 100644 --- a/machines/rivendell.nix +++ b/machines/rivendell.nix @@ -1,5 +1,6 @@ { adminUser, + pkgs, lib, config, ... @@ -7,14 +8,12 @@ { imports = [ ../profiles/authelia.nix - ../profiles/cgroups.nix ../profiles/core-metrics.nix ../profiles/defaults.nix ../profiles/disk/btrfs-on-luks.nix ../profiles/git-server.nix ../profiles/hardware/framework-desktop.nix ../profiles/home-manager.nix - ../profiles/makemkv.nix ../profiles/miniflux.nix ../profiles/monitoring.nix ../profiles/remote-unlock.nix @@ -27,6 +26,8 @@ ../profiles/wireguard.nix ]; + boot.kernelModules = [ "sg" ]; + networking.hostName = "rivendell"; networking.networkmanager.enable = true; networking.useDHCP = lib.mkDefault true; @@ -80,6 +81,14 @@ }; }; + environment.systemPackages = with pkgs; [ + ffmpeg + imagemagick + makemkv + ]; + + users.users.${adminUser.name}.extraGroups = [ "cdrom" ]; + system.stateVersion = "23.11"; home-manager.users.${adminUser.name} = { |