diff options
Diffstat (limited to '')
| -rw-r--r-- | machines/argonath.nix | 1 | ||||
| -rw-r--r-- | machines/bree.nix | 1 | ||||
| -rw-r--r-- | machines/rivendell.nix | 13 | ||||
| -rw-r--r-- | profiles/defaults.nix | 4 | ||||
| -rw-r--r-- | profiles/makemkv.nix | 12 |
5 files changed, 15 insertions, 16 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} = { diff --git a/profiles/defaults.nix b/profiles/defaults.nix index 1cc92e1..776047e 100644 --- a/profiles/defaults.nix +++ b/profiles/defaults.nix @@ -5,6 +5,10 @@ ... }: { + imports = [ + ./cgroups.nix + ]; + boot = { kernelPackages = pkgs.linuxPackages_latest; plymouth.enable = true; diff --git a/profiles/makemkv.nix b/profiles/makemkv.nix deleted file mode 100644 index 6bbc243..0000000 --- a/profiles/makemkv.nix +++ /dev/null @@ -1,12 +0,0 @@ -{ adminUser, pkgs, ... }: -{ - environment.systemPackages = with pkgs; [ - ffmpeg - imagemagick - makemkv - ]; - - boot.kernelModules = [ "sg" ]; - - users.users.${adminUser.name}.extraGroups = [ "cdrom" ]; -} |