aboutsummaryrefslogtreecommitdiff
path: root/machines
diff options
context:
space:
mode:
Diffstat (limited to 'machines')
-rw-r--r--machines/argonath.nix1
-rw-r--r--machines/bree.nix1
-rw-r--r--machines/rivendell.nix13
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} = {