1

Compare commits

...

5 Commits

8 changed files with 31 additions and 23 deletions

View File

@ -51,6 +51,7 @@ in {
"fetchart" # pickup local cover art or search online "fetchart" # pickup local cover art or search online
"fish" # beet fish generates ~/.config/fish/completions file "fish" # beet fish generates ~/.config/fish/completions file
"lyrics" # fetch song lyrics "lyrics" # fetch song lyrics
"musicbrainz" # auto tagger data source
"replaygain" # write replaygain tags for automatic loudness adjustments "replaygain" # write replaygain tags for automatic loudness adjustments
]; ];

View File

@ -143,7 +143,7 @@ with mylib.networking; {
# Bootloader/Kernel stuff # Bootloader/Kernel stuff
boot = { boot = {
kernelPackages = lib.mkDefault pkgs.linuxPackages_latest; kernelPackages = lib.mkDefault pkgs.linuxPackages;
kernelParams = ["mitigations=off"]; # I don't care kernelParams = ["mitigations=off"]; # I don't care
# Make /tmp volatile # Make /tmp volatile

View File

@ -104,7 +104,8 @@
}; };
boot = { boot = {
# kernelPackages = pkgs.linuxPackages_zen; kernelPackages = pkgs.linuxPackages_zen;
# kernelPackages = lib.mkDefault pkgs.linuxPackages_latest;
# kernelParams = [ "quiet" ]; # kernelParams = [ "quiet" ];
# plymouth.enable = true; # plymouth.enable = true;

View File

@ -35,6 +35,10 @@
"vfat" "vfat"
]; ];
supportedFilesystems = [
# "zfs" # Probably requires LTS kernel + networking.hostId
];
kernelModules = [ kernelModules = [
"kvm-amd" "kvm-amd"
"sg" # Blu-Ray drive "sg" # Blu-Ray drive
@ -60,6 +64,9 @@
]; ];
}; };
# Required for supportedFilesystems = ["zfs"];, so pools don't get imported on the wrong machine
# networking.hostId = "611e6afb";
fileSystems = { fileSystems = {
# NOTE: Some filesystems are managed by disko (see ./disks.nix) # NOTE: Some filesystems are managed by disko (see ./disks.nix)
@ -82,23 +89,22 @@
# Using NFS over TCP or increasing the value of the retrans option may mitigate # Using NFS over TCP or increasing the value of the retrans option may mitigate
# some of the risks of using the soft option. # some of the risks of using the soft option.
"/home/${username}/Movies" = { # TODO: New HDDs
device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie"; # "/home/${username}/Movies" = {
fsType = "nfs"; # device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Movie";
options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"]; # fsType = "nfs";
}; # options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
# };
"/home/${username}/Shows" = { # "/home/${username}/Shows" = {
device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show"; # device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Show";
fsType = "nfs"; # fsType = "nfs";
options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"]; # options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
}; # };
# "/home/${username}/Music" = {
"/home/${username}/Music" = { # device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music";
device = "192.168.86.20:/mnt/SG Exos Mirror 18TB/Music"; # fsType = "nfs";
fsType = "nfs"; # options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"];
options = ["defaults" "rw" "noatime" "_netdev" "bg" "soft"]; # };
};
"/home/${username}/Restic" = { "/home/${username}/Restic" = {
device = "192.168.86.15:/volume1/NixinatorPersistence"; device = "192.168.86.15:/volume1/NixinatorPersistence";

View File

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
jellyfinVersion = "10.10.7"; jellyfinVersion = "10.11.2";
in { in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
jellyfin = { jellyfin = {

View File

@ -4,7 +4,7 @@
pkgs, pkgs,
... ...
}: let }: let
nginxVersion = "2.12.6"; nginxVersion = "2.13.1";
in { in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
nginx-proxy-manager = { nginx-proxy-manager = {

View File

@ -5,7 +5,7 @@
... ...
}: let }: let
# Match this with the portainer-ce version # Match this with the portainer-ce version
portainerVersion = "2.31.3"; portainerVersion = "2.33.3";
in { in {
# Use the agent to connect clients to a main portainer instance # Use the agent to connect clients to a main portainer instance
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {

View File

@ -5,7 +5,7 @@
... ...
}: let }: let
# Match this with the portainer agent version # Match this with the portainer agent version
portainerVersion = "2.31.3"; portainerVersion = "2.33.3";
in { in {
virtualisation.oci-containers.containers = { virtualisation.oci-containers.containers = {
portainer = { portainer = {