greg/nixos
1
0
Fork 1
Code Issues Pull Requests 2 Actions Packages Projects Releases Wiki Activity

Create jellyfin VM

Browse Source 
Update DNS for new Jellyfin box
Update DHCP for new Jellyfin box
Modify Isaiah to work better with VMs
Update pinned packages becaue I derped hard on creating a cyclic
dependency
This commit is contained in:
Greg Hellings
2024-11-21 23:13:21 -06:00
parent a0b2b0043e
commit a78cc50db9
10 changed files with 83 additions and 42 deletions
Download Patch File Download Diff File Expand all files Collapse all files
flake.lock
Generated
+9 -9
View File
@@ -737,11 +737,11 @@
]
},
"locked": {
"lastModified": 1731892054,
"narHash": "sha256-BJtD9NGUWaBe4OZ1JO77w8qBP9yHDJJUjsxkG/milFc=",
"lastModified": 1732151224,
"narHash": "sha256-5IgpueM8SGLOadzUJK6Gk37zEBXGd56BkNOtoWmnZos=",
"owner": "nix-community",
"repo": "nixos-generators",
"rev": "15a87ccb45e06d24a9fd5f99a49782efe11b23f0",
"rev": "3280fdde8c8f0276c9f5286ad5c0f433dfa5d56c",
"type": "github"
},
"original": {
@@ -876,11 +876,11 @@
},
"nixstable": {
"locked": {
"lastModified": 1727672256,
"narHash": "sha256-9/79hjQc9+xyH+QxeMcRsA6hDyw6Z9Eo1/oxjvwirLk=",
"lastModified": 1731797254,
"narHash": "sha256-df3dJApLPhd11AlueuoN0Q4fHo/hagP75LlM5K1sz9g=",
"owner": "nixos",
"repo": "nixpkgs",
"rev": "1719f27dd95fd4206afb9cec9f415b539978827e",
"rev": "e8c38b73aeb218e27163376a2d617e61a2ad9b59",
"type": "github"
},
"original": {
@@ -918,11 +918,11 @@
"treefmt-nix": "treefmt-nix"
},
"locked": {
"lastModified": 1730550779,
"narHash": "sha256-2stntmqw/GBOVEoPV4oCLHZljpeSBfZn8wkcJpei+ng=",
"lastModified": 1731959181,
"narHash": "sha256-RryrMTaCvmXzhl0lYm/jAG8bAxsAhEcNq1JRtkCL4wI=",
"owner": "nix-community",
"repo": "nixvim",
"rev": "91c06026075f08a3c865fdc46cc6db8e2af35a1e",
"rev": "8d29728abfcc2e4207afb3fd8606feff17c15cec",
"type": "github"
},
"original": {
flake.nix
+1 -1
View File
@@ -108,7 +108,7 @@
pkgs = import top.nixstable { inherit system overlays; };
};
packages = import ./pkgs { inherit pkgs top; };
packages = (import ./pkgs { inherit pkgs top; }) // (import ./vms { inherit top; });
checks = import ./checks.nix {
inherit system;
hosts/default.nix
+1
View File
@@ -63,6 +63,7 @@ in
jeremiah = unstable { name = "jeremiah"; };
isaiah = unstable { name = "isaiah"; };
vm-jellyfin = vm { name = "vm-jellyfin"; };
vm-matrix = vm { name = "vm-matrix"; };
iso = machine { name = "iso"; };
hosts/genesis/networking.nix
-20
View File
@@ -60,8 +60,6 @@ in
allowedUDPPorts = [
dhcpPort
dnsPort
1900 # Jellyfin auto-discovery
7359 # Jellyfin auto-discovery
];
allowedTCPPorts = [
dnsPort
@@ -74,21 +72,7 @@ in
environment.etc."hosts.d/local".text = extraHosts;
fileSystems = {
"/media" = {
device = "10.42.1.4:/volume1/video/";
fsType = "nfs";
options = [ "ro" ];
};
};
services = {
# Video services
jellyfin = {
enable = true;
openFirewall = true;
};
#########
# Blind service proxy behind the walls of the VPN
########
@@ -146,10 +130,6 @@ in
};
}; # End of services configuration
greg.proxies = {
"jellyfin.home".target = "http://localhost:8096/";
};
environment.systemPackages = with pkgs; [
bind
curl # Used by dnsmasq fetching
hosts/genesis/networking/dhcp.nix
+13 -5
View File
@@ -108,18 +108,26 @@
# hw-address = ""; # hosea
# ip-address = "10.42.1.7";
#}
#{
# hw-address = ""; # jeremiah
# ip-address = "10.42.1.8";
#}
{
hw-address = "b4:2e:99:aa:22:3c"; # jeremiah
ip-address = "10.42.1.8";
}
{
hw-address = "c8:5e:a9:54:9e:c6"; # IVR laptop Wi-Fi
ip-address = "10.42.1.9";
}
########################################
# VM servers #
########################################
{
hw-address = "52:54:00:2a:74:2f";
ip-address = "10.43.4.1";
ip-address = "10.43.4.1"; # Dendrite
}
{
hw-address = "52:54:00:6e:eb:83";
ip-address = "10.43.4.2"; # Jellyfin
}
########################################
hosts/isaiah/default.nix
+9 -3
View File
@@ -12,7 +12,10 @@
virtualisation.libvirtd = {
enable = true;
allowedBridges = [ "virbr0" ];
allowedBridges = [
"br0"
"virbr0"
];
onBoot = "ignore"; # only restart VMs labeled 'autostart'
qemu.ovmf.enable = true;
};
@@ -26,12 +29,15 @@
networking = {
hostName = "isaiah";
useDHCP = false;
bridges.br0 = {
interfaces = [ "enp38s0" ];
};
defaultGateway = {
address = " 10.42.1.1";
interface = "enp38s0";
interface = "br0";
};
interfaces = {
enp38s0 = {
br0 = {
ipv4.addresses = [
{
address = "10.42.1.6";
hosts/vm-jellyfin/default.nix
+41
View File
@@ -0,0 +1,41 @@
{ ... }:
{
imports = [ ];
#boot.loader.grub.devices = [ "/dev/vda" ];
greg = {
proxies."jellyfin.home".target = "http://localhost:8096/";
tailscale.enable = true;
};
fileSystems = {
"/music" = {
device = "10.42.1.4:/volume1/music";
fsType = "nfs";
options = [ "ro" ];
};
"/photo" = {
device = "10.42.1.4:/volume1/photo";
fsType = "nfs";
options = [ "ro" ];
};
"/video" = {
device = "10.42.1.4:/volume1/video/";
fsType = "nfs";
options = [ "ro" ];
};
};
networking = {
hostName = "vm-jellyfin";
domain = "thehellings.lan";
};
services.jellyfin = {
enable = true;
openFirewall = true;
};
virtualisation.diskSize = 100 * 1024;
}
modules/nixos/default.nix
+2 -1
View File
@@ -41,7 +41,7 @@ in
xfsprogs
];
system.stateVersion = "24.05";
system.stateVersion = "24.11";
nix = {
gc.dates = "weekly";
@@ -93,6 +93,7 @@ in
"networkmanager"
]; # Enable ‘sudo’ for the user.
shell = config.programs.xonsh.package;
initialPassword = "password";
openssh.authorizedKeys.keys = lib.strings.splitString "\n" (
builtins.readFile ../../home/ssh/authorized_keys
);
pkgs/default.nix
+1 -3
View File
@@ -1,4 +1,4 @@
{ pkgs, top, ... }:
{ pkgs, ... }:
let
c = pkgs.callPackage;
@@ -16,6 +16,4 @@ in
setup-ssh = c ./setup-ssh { };
upgrade-pg-cluster = c ./upgrade-pg-cluster.nix { };
zim = c ./zim.nix { };
matrix = top.nixosConfigurations.vm-matrix.config.formats.qcow;
}
vms/default.nix
+6
View File
@@ -0,0 +1,6 @@
{ top, ... }:
with top.self.nixosConfigurations;
{
jellyfin = vm-jellyfin.config.formats.qcow;
matrix = vm-matrix.config.formats.qcow;
}